diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 05:04:24 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 05:04:24 +0000 |
| commit | a48fd5df213e076084757a5333d7b4767eff1cfc (patch) | |
| tree | ddc1325a5b5a7d8804ef0a27cc9431c52649337c /configure.in | |
| parent | 8110d523333c48d8a2fd7018d98e193a4f00dbcc (diff) | |
* configure.in (MINIDLNOBJS): removed.
(MINIOBJS): set to dln.o if dmydln.o is not used.
* Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 5d8689cb14..8c9c143189 100644 --- a/configure.in +++ b/configure.in @@ -1410,7 +1410,7 @@ AC_SUBST(RDOCTARGET) if test "$rb_with_pthread" = "yes"; then THREAD_MODEL=pthread fi -MINIDLNOBJS=dln.o +MINIDLNOBJ=dln.o case "$target_os" in linux*) XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1" @@ -1434,8 +1434,7 @@ case "$target_os" in ;; darwin*) CFLAGS="$CFLAGS -pipe -fno-common" - MINIDLNOBJS=dmydln.o - MINIOBJS=dmydln.o + MINIDLNOBJ=dmydln.o ;; os2-emx) CFLAGS="$CFLAGS -DOS2 -Zmts" @@ -1498,8 +1497,7 @@ case "$target_os" in LIBRUBY='lib$(RUBY_SO_NAME).a' LIBRUBYARG='-l$(RUBY_SO_NAME)' fi - MINIDLNOBJS=dmydln.o - MINIOBJS=dmydln.o + MINIDLNOBJ=dmydln.o ;; hpux*) case "$YACC" in @@ -1508,12 +1506,12 @@ case "$target_os" in YACC="$YACC -Nl40000 -Nm40000" ;; esac - MINIDLNOBJS=dmydln.o - MINIOBJS=dmydln.o + MINIDLNOBJ=dmydln.o ;; *) ;; esac +MINIOBJS="$MINIDLNOBJ" case "$build_os" in *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;; @@ -1543,7 +1541,6 @@ AC_SUBST(COMMON_LIBS) AC_SUBST(COMMON_MACROS) AC_SUBST(COMMON_HEADERS) AC_SUBST(EXPORT_PREFIX) -AC_SUBST(MINIDLNOBJS) AC_SUBST(MINIOBJS) AC_SUBST(THREAD_MODEL) |