summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-14 07:20:34 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-03-14 07:20:34 +0000
commit606214fe521d86fa187069f2676eb89fff967cdf (patch)
tree5f8b59f697cf0a76f5ee9dcc2e0bef1d86a902c2
parent5e853e44c2a63eb82f3928d3b53e75fcde796030 (diff)
downloadruby-606214fe521d86fa187069f2676eb89fff967cdf.tar.gz
ruby-606214fe521d86fa187069f2676eb89fff967cdf.tar.xz
ruby-606214fe521d86fa187069f2676eb89fff967cdf.zip
* configure.in: autoconf 2.53 support. use AC_LIBOBJ.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in12
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d41a8342..0eb1218c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 14 16:18:12 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in: autoconf 2.53 support. use AC_LIBOBJ.
+
Thu Mar 14 00:29:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_match): should clear $~ if operand is nil.
diff --git a/configure.in b/configure.in
index 3785b65f4..d7c6c290d 100644
--- a/configure.in
+++ b/configure.in
@@ -289,9 +289,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_UID_T
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
-save_LIBOJBS="$LIBOBJS"
AC_STRUCT_ST_BLOCKS
-LIBOBJS="$save_LIBOBJS"
AC_STRUCT_ST_RDEV
dnl Checks for library functions.
@@ -429,7 +427,7 @@ main()
exit(0);
}
], rb_cv_func_strtod=yes, rb_cv_func_strtod=no, rb_cv_func_strtod=no)])
-test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+test $rb_cv_func_strtod = no && AC_LIBOBJ([strtod])
AC_C_BIGENDIAN
AC_C_CONST
@@ -817,7 +815,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
if test "$rb_cv_missing_fconvert" = yes; then
AC_DEFINE(MISSING_FCONVERT)
fi
- LIBOBJS="$LIBOBJS x68.o"
+ AC_LIBOBJ([x68.o])
CFLAGS="$CFLAGS -fansi-only -cc1-stack=262144 -cpp-stack=2694144"
EXEEXT=.x
OBJEXT=o
@@ -825,7 +823,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
;;
dnl OS/2 environment w/ Autoconf 2.1x for EMX
os2_emx)
- LIBOBJS="$LIBOBJS os2.$OBJEXT"
+ AC_LIBOBJ([os2])
setup=Setup.emx
;;
*djgpp*)
@@ -1018,10 +1016,10 @@ case "$target_os" in
SOLIBS='$(LIBS)'
case "$target_os" in
cygwin*)
- LIBOBJS="$LIBOBJS strftime.o"
+ AC_LIBOBJ([strftime])
CCDLFLAGS=-DUSEIMPORTLIB ;;
mingw*)
- LIBOBJS="$LIBOBJS win32.o"
+ AC_LIBOBJ([win32])
CFLAGS="-DNT -D__MSVCRT__ $CFLAGS"
CCDLFLAGS=-DIMPORT ;;
esac