[committed] Convert zlib to autoconf 2.5x

[Nathanael Nerode]

Bootstrapped i686-pc-linux-gnu, committed.

+2004-04-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* 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 with autoconf 2.59.
+

Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/zlib/acinclude.m4,v
retrieving revision 1.4
diff -u -r1.4 acinclude.m4
--- acinclude.m4	11 Mar 2002 21:49:12 -0000	1.4
+++ acinclude.m4	9 Apr 2004 08:22:49 -0000
@@ -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
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/zlib/configure.in,v
retrieving revision 1.21
diff -u -r1.21 configure.in
--- configure.in	15 Jan 2004 03:41:47 -0000	1.21
+++ configure.in	9 Apr 2004 08:22:54 -0000
@@ -1,7 +1,8 @@
 dnl Process this with autoconf to create configure
 
-AC_PREREQ(2.13)
-AC_INIT(zlib.h)
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR([zlib.h])
 
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
@@ -44,6 +45,14 @@
 AC_ARG_WITH(target-subdir,
 [  --with-target-subdir=SUBDIR
                           configuring in a subdirectory])
+
+if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
+   COMPPATH=.
+else
+   COMPPATH=..
+fi
+AC_SUBST(COMPPATH)
+
 AC_ARG_WITH(cross-host,
 [  --with-cross-host=HOST  configuring with a cross compiler])
 
@@ -59,29 +68,12 @@
 AC_ARG_WITH(system-zlib,
 [  --with-system-zlib      use installed libz])
 
-LIB_AC_PROG_CC
-# We need AC_EXEEXT to keep automake happy in cygnus mode.  However,
-# at least currently, we never actually build a program, so we never
-# need to use $(EXEEXT).  Moreover, the test for EXEEXT normally
-# fails, because we are probably configuring with a cross compiler
-# which cant create executables.  So we include AC_EXEEXT to keep
-# automake happy, but we dont execute it, since we dont care about
-# the result.
-if false; then
-  # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
-  # to nothing, so nothing would remain between `then' and `fi' if it
-  # were not for the `:' below.
-  :
-  AC_EXEEXT
-fi
-AM_PROG_LIBTOOL
+# Make sure we don't test executables when making cross-tools.
+GCC_NO_EXECUTABLES
 
-if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
-   COMPPATH=.
-else
-   COMPPATH=..
-fi
-AC_SUBST(COMPPATH)
+AC_PROG_CC
+
+AM_PROG_LIBTOOL
 
 # Find CPP now so that any conditional tests below won't do it and
 # thereby make the resulting definitions conditional.
@@ -142,12 +134,14 @@
   multilib_arg=
 fi
 
-AC_OUTPUT(Makefile,
-[if test -n "$CONFIG_FILES"; then
+AC_CONFIG_FILES([Makefile])
+
+AC_CONFIG_COMMANDS([default],
+[[if test -n "$CONFIG_FILES"; then
   LD="${ORIGINAL_LD_FOR_MULTILIBS}"
   ac_file=Makefile . ${zlib_basedir}/../config-ml.in
-fi],
-srcdir=${srcdir}
+fi]],
+[[srcdir=${srcdir}
 host=${host}
 target=${target}
 with_multisubdir=${with_multisubdir}
@@ -157,4 +151,6 @@
 CC="${CC}"
 CXX="${CXX}"
 ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
-)
+]])
+
+AC_OUTPUT

-- 
Make sure your vote will count.
http://www.verifiedvoting.org/