I've back to hacking on the Hurd build stuff. Automake 1.7.1 requires
Autoconf 2.54. Also, this allows the same autoconf to work on both
glibc and hurd.
This is my bare-minimum patch for upgrading. I will follow with more
patches to remove obsolete macros after this one is applied.
2002-10-23 Jeff Bailey <[EMAIL PROTECTED]>
* configure.in: Update for Autoconf 2.54
- Use new syntax for AC_INIT, AC_CONFIG_SRCDIR
- Replace AC_FD_CC with AS_MESSAGE_LOG_FD
- Use new syntax for AC_CONFIG_FILES, AC_OUTPUT
- Replace AC_CHECK_TOOL, hurd_PROG_CC with AC_PROG_CC
This provides all the functionality we want.
* aclocal.m4: Update for Autoconf 2.54
- Remove definitions for hurd_PROG_CC, hurd_PROG_CC_WORKS.
- Replace AC_FD_CC with AS_MESSAGE_LOG_FD
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/hurd/hurd/aclocal.m4,v
retrieving revision 1.4
diff -u -p -r1.4 aclocal.m4
--- aclocal.m4 22 Aug 2002 21:25:03 -0000 1.4
+++ aclocal.m4 23 Oct 2002 21:39:22 -0000
@@ -3,75 +3,6 @@ dnl In the situation that cross-linking
dnl `cross_linkable' will be substituted with "yes".
dnl
-AC_DEFUN(hurd_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
- AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
- test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-hurd_PROG_CC_WORKS
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
-dnl AC_PROG_CC_G
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
-dnl # This doesn't work on Linux (libc-4.5.26): Because of differences between
-dnl # the shared and the static libraries there are less symbols available
-dnl # without -g than with -g. It is therefore better to run the configuration
-dnl # without -g and to add -g afterwards than the contrary. So don't add
-dnl # -g to the CFLAGS now.
-dnl elif test $ac_cv_prog_cc_g = yes; then
-dnl CFLAGS="-g -O"
- else
-dnl CFLAGS="-O"
- # Add "-O" to both the CC and CPP commands, to eliminate possible confusion
- # that results from __OPTIMIZE__ being defined for CC but not CPP.
-changequote(, )dnl
- if echo "$CC " | grep ' -O[1-9 ]' > /dev/null 2>&1; then
-changequote([, ])dnl
- : # already optimizing
- else
- CC="$CC -O"
- ac_cv_prog_CC="$CC"
- fi
- fi
-else
- GCC=
-dnl # See above.
-dnl test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(hurd_PROG_CC_WORKS,
-[AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
-AC_LANG_SAVE
-AC_LANG_C
-AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross)
-AC_LANG_RESTORE
-AC_MSG_RESULT($ac_cv_prog_cc_works)
-if test $ac_cv_prog_cc_works = no; then
- cross_linkable=no
- ac_cv_prog_cc_cross=yes
- # AC_MSG_ERROR([installation or configuration problem: C compiler cannot create
executables.])
-else
- cross_linkable=yes
-fi
-AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler])
-AC_MSG_RESULT($ac_cv_prog_cc_cross)
-AC_SUBST(cross_linkable)
-cross_compiling=$ac_cv_prog_cc_cross
-])
-
AC_DEFUN([hurd_MIG_RETCODE], [dnl
# See if mig groks `retcode'.
AC_CACHE_CHECK(whether $MIG supports the retcode keyword, hurd_cv_mig_retcode,
@@ -85,7 +16,7 @@ simpleroutine foobar_reply (
reply_port: reply_port_t;
err: kern_return_t, RetCode);
EOF
-if AC_TRY_COMMAND([CC="${CC}" ${MIG-false} -n conftest.defs 1>&AC_FD_CC]); then
+if AC_TRY_COMMAND([CC="${CC}" ${MIG-false} -n conftest.defs 1>&AS_MESSAGE_LOG_FD()]);
+then
hurd_cv_mig_retcode=yes
else
hurd_cv_mig_retcode=no
Index: configure.in
===================================================================
RCS file: /cvsroot/hurd/hurd/configure.in,v
retrieving revision 1.34
diff -u -p -r1.34 configure.in
--- configure.in 30 Aug 2002 00:27:32 -0000 1.34
+++ configure.in 23 Oct 2002 21:39:22 -0000
@@ -1,7 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
AC_REVISION([$Id: configure.in,v 1.34 2002/08/30 00:27:32 roland Exp $])
-AC_PREREQ(2.12) dnl Minimum Autoconf version required.
-AC_INIT(hurd/hurd_types.h) dnl A distinctive file to look for in srcdir.
+AC_PREREQ(2.54) dnl Minimum Autoconf version required.
+AC_INIT
+AC_CONFIG_SRCDIR([hurd/hurd_types.h]) dnl A distinctive file to look for in srcdir.
AC_PREFIX_DEFAULT() dnl Default to empty prefix, not /usr/local.
@@ -75,10 +76,7 @@ AC_SUBST(enable_static_progs)
AC_PROG_INSTALL
AC_PROG_AWK
-AC_CHECK_TOOL(CC, gcc)
-# That check handles cross-compilation well, but AC_PROG_CC tests for GCC
-# and sets default CFLAGS nicely for us, so do that too.
-hurd_PROG_CC
+AC_PROG_CC
# Require GCC.
if test x$GCC != xyes; then
AC_MSG_ERROR([this code uses GNU C extensions, you must compile with GCC])
@@ -114,11 +112,11 @@ VERS_2 {
} VERS_1;
EOF
-if AC_TRY_COMMAND([eval $ac_compile 1>&AC_FD_CC]) &&
+if AC_TRY_COMMAND([eval $ac_compile 1>&AS_MESSAGE_LOG_FD()]) &&
AC_TRY_COMMAND([${CC-cc} $CFLAGS -shared -o conftest.so conftest.o
-nostartfiles -nostdlib
-Wl,--version-script,conftest.map
- 1>&AC_FD_CC]); then
+ 1>&AS_MESSAGE_LOG_FD()]); then
hurd_cv_ld_version_script_option=yes
else
hurd_cv_ld_version_script_option=no
@@ -193,7 +191,8 @@ else
echo ${file}:build.mk.in; done`"
fi
-AC_OUTPUT(config.make ${makefiles})
+AC_CONFIG_FILES([config.make ${makefiles}])
+AC_OUTPUT
dnl Local Variables:
dnl comment-start: "dnl "
