Imported Debian patch 1.3.5-10

[gzip] / configure.in

diff --git a/configure.in b/configure.in
index dd0f48a0509782cad96b05899e3f8d3be2ac04e2..956d992b09227aa2ca3b5c70edf8a624b969aea1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 # Configure template for gzip.
 
-# Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 # Copyright (C) 1992-1993 Jean-loup Gailly
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,59 +18,64 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_INIT(gzip.c)
-AM_INIT_AUTOMAKE(gzip, 1.3.2)
+AC_PREREQ(2.54)
+AC_INIT(gzip, 1.3.5, bug-gzip@gnu.org)
+AC_CONFIG_SRCDIR(gzip.c)
+AM_INIT_AUTOMAKE
+
 AM_CONFIG_HEADER(config.h)
-AC_PREREQ(2.52)
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_LN_S
 AC_PROG_SHELL
-AC_OBJEXT
 AC_AIX
+AC_GNU_SOURCE
 AC_MINIX
 AC_SYS_LARGEFILE
 
-dnl
-dnl Try to assemble match.S with and without leading underline.
-dnl cc -E produces incorrect asm files on SVR4, we must use /lib/cpp.
-dnl Also, "gcc -E match.s" ignores -E, so we must use match.S.
-echo checking for underline in external names
-test -z "$ASCPP" -a -f /lib/cpp && ASCPP=/lib/cpp
-test -z "$ASCPP" && ASCPP="$CC -E"
-cat > conftest.c <<EOF
-int foo() {return 0;}
-EOF
-eval "$CC -c conftest.c > /dev/null 2>&1"
-if nm conftest.$OBJEXT | grep _foo > /dev/null 2>&1 ; then
-  :
-else
+# cc -E produces incorrect asm files on SVR4, we must use /lib/cpp.
+test -z "$ASCPP" && test -f /lib/cpp && ASCPP=/lib/cpp
+test -z "$ASCPP" && ASCPP="$CPP"
+
+AC_CACHE_CHECK([for underline in external names], [gzip_cv_underline],
+  [gzip_cv_underline=yes
+   AC_TRY_COMPILE([int foo() {return 0;}], [],
+     [nm conftest.$OBJEXT | grep _foo >/dev/null 2>&1 ||
+       gzip_cv_underline=no])])
+if test $gzip_cv_underline = no; then
   ASCPP="${ASCPP} -DNO_UNDERLINE"
 fi
-rm -f _match.$OBJEXT conftest.c conftest.$OBJEXT
-if echo "$DEFS" | grep NO_ASM >/dev/null; then
-  :
-else
-  echo checking for assembler
-  if eval "$ASCPP $srcdir/match.S > _match.s 2>/dev/null"; then
-    if test ! -s _match.s || grep error < _match.s > /dev/null; then
-      :
-    elif eval "$CC -c _match.s >/dev/null 2>&1" && test -f _match.$OBJEXT; then
-      AC_DEFINE(ASMV, ,
-       [Define if an assembler version of longest_match is available.])
-      LIBOBJS="$LIBOBJS match.$OBJEXT"
-      # Work around automake 1.4 bug
-      : LIBOBJS="$LIBOBJS match.o"
-    fi
-  fi
-  rm -f _match.s _match.$OBJEXT
+AC_OBJEXT
+
+# Try to assemble match.S.
+# "gcc -E match.s" ignores -E, so we must use match.S.
+AC_CACHE_CHECK([for assembler], [gzip_cv_assembler],
+  [gzip_cv_assembler=no
+   case " $DEFS " in
+   *' NO_ASM '*) ;;
+   *)
+     if cp $srcdir/match.c _match.S &&
+        eval "$ASCPP _match.S > _match.s 2>/dev/null"; then
+       if test ! -s _match.s || grep error < _match.s > /dev/null; then
+        :
+       elif eval "$CC -c _match.s >/dev/null 2>&1" &&
+           test -f _match.$OBJEXT; then
+        gzip_cv_assembler=yes
+       fi
+     fi
+     rm -f _match.S _match.s _match.$OBJEXT;;
+   esac])
+if test $gzip_cv_assembler = yes; then
+  AC_DEFINE(ASMV, ,
+    [Define if an assembler version of longest_match is available.])
+  AC_LIBOBJ(match)
 fi
-dnl
-AC_EXEEXT
+
 AC_ISC_POSIX
 AC_C_CONST
-AC_STDC_HEADERS
+AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h limits.h memory.h \
-  stdlib.h string.h sys/utime.h time.h unistd.h utime.h)
+  sys/utime.h time.h utime.h)
 AC_CHECK_FUNCS(lstat utime)
 AC_REPLACE_FUNCS(rpmatch)
 AC_HEADER_DIRENT
@@ -84,8 +89,7 @@ yes) SEDCMD='1d';;
 esac
 
 AC_PREFIX_PROGRAM(gzip)
-AC_SUBST(LIBOBJS)dnl
-AC_SUBST(CFLAGS)dnl
 AC_SUBST(ASCPP)dnl
 AC_SUBST(SEDCMD)dnl
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT