From a8aea1764e16e132f2ce6fc0b4e1b9edbfefe4af Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 9 Apr 2004 10:18:17 +0000 Subject: configure.in: Update to autoconf 2.59; clean up slightly. 2004-04-09 Nathanael Nerode * configure.in: Update to autoconf 2.59; clean up slightly. * acinclude.m4: Update to autoconf 2.59. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure: Regenerate. From-SVN: r80544 --- zlib/acinclude.m4 | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) (limited to 'zlib/acinclude.m4') diff --git a/zlib/acinclude.m4 b/zlib/acinclude.m4 index cbbaa3008fb..9a5f5485716 100644 --- a/zlib/acinclude.m4 +++ b/zlib/acinclude.m4 @@ -1,43 +1,4 @@ -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -# are probably using a cross compiler, which will not be able to fully -# link an executable. This should really be fixed in autoconf -# itself. - -AC_DEFUN(LIB_AC_PROG_CC, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -dnl Fool anybody using AC_PROG_CC. -AC_PROVIDE([AC_PROG_CC]) -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 - -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= - AC_PROG_CC_G - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi -]) - +sinclude(../config/no-executables.m4) sinclude(../libtool.m4) dnl The lines below arrange for aclocal not to bring libtool.m4 dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake -- cgit v1.2.1