Attachment "conf.patch" to
ticket [529884ffff]
added by
mdejong
2002-04-19 05:50:02.
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/configure.in,v
retrieving revision 1.83
diff -u -r1.83 configure.in
--- unix/configure.in 6 Mar 2002 15:20:23 -0000 1.83
+++ unix/configure.in 13 Mar 2002 01:09:44 -0000
@@ -156,7 +156,7 @@
#--------------------------------------------------------------------
# Some system have no memcmp or it does not work with 8 bit
-# data, this checks it and add memcmp.o to LIBOBJS if needed
+# data, this checks it and add memcmp.o to AC_LIBOBJ if needed
#--------------------------------------------------------------------
AC_FUNC_MEMCMP
@@ -181,10 +181,10 @@
}
], tcl_ok=yes, tcl_ok=no, tcl_ok=no)
if test $tcl_ok = yes; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([broken, using substitute])
- LIBOBJS="$LIBOBJS strstr.o"
+ AC_LIBOBJ([strstr])
fi
#--------------------------------------------------------------------
@@ -209,7 +209,7 @@
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo " Adding strtoul.o."
- LIBOBJS="$LIBOBJS strtoul.o"
+ AC_LIBOBJ([strtoul])
fi
#--------------------------------------------------------------------
@@ -233,7 +233,7 @@
}], , tcl_ok=0, tcl_ok=0)
if test "$tcl_ok" = 0; then
test -n "$verbose" && echo " Adding strtod.o."
- LIBOBJS="$LIBOBJS strtod.o"
+ AC_LIBOBJ([strtod])
fi
#--------------------------------------------------------------------
@@ -316,7 +316,7 @@
AC_CHECK_LIB(inet, strncasecmp, tcl_ok=1, tcl_ok=0)
fi
if test "$tcl_ok" = 0; then
- LIBOBJS="$LIBOBJS strncasecmp.o"
+ AC_LIBOBJ([strncasecmp])
fi
#--------------------------------------------------------------------
@@ -580,4 +580,5 @@
AC_SUBST(BUILD_DLTEST)
AC_SUBST(TCL_PACKAGE_PATH)
-AC_OUTPUT(Makefile dltest/Makefile tclConfig.sh)
+AC_CONFIG_FILES([Makefile dltest/Makefile tclConfig.sh])
+AC_OUTPUT
Index: unix/tcl.m4
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tcl.m4,v
retrieving revision 1.62
diff -u -r1.62 tcl.m4
--- unix/tcl.m4 26 Feb 2002 20:03:29 -0000 1.62
+++ unix/tcl.m4 13 Mar 2002 01:09:55 -0000
@@ -727,7 +727,7 @@
# AIX v<=4.1 has some different flags than 4.2+
if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then
- LIBOBJS="$LIBOBJS tclLoadAix.o"
+ AC_LIBOBJ([tclLoadAix])
DL_LIBS="-lld"
fi
@@ -922,7 +922,7 @@
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
- if test x"${LIBOBJS}" != x ; then
+ if test x"${LIB@&t@OBJS}" != x ; then
EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
fi
@@ -1919,7 +1919,7 @@
AC_MSG_RESULT(ok)
else
AC_MSG_RESULT(buggy)
- LIBOBJS="$LIBOBJS fixstrtod.o"
+ AC_LIBOBJ([fixstrtod])
AC_DEFINE(strtod, fixstrtod)
fi
fi
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/configure.in,v
retrieving revision 1.71
diff -u -r1.71 configure.in
--- unix/configure.in 6 Mar 2002 15:36:17 -0000 1.71
+++ unix/configure.in 13 Mar 2002 01:11:41 -0000
@@ -479,4 +479,5 @@
AC_SUBST(TK_SHARED_BUILD)
AC_SUBST(LOCALES)
-AC_OUTPUT(Makefile tkConfig.sh)
+AC_CONFIG_FILES([Makefile tkConfig.sh])
+AC_OUTPUT
