rationalize autoconf detection of gzip/bzip2.

CVS patchset: 2302
CVS date: 1998/09/12 20:46:24

diff --git a/CHANGES b/CHANGES
index d46f6e8..6a8c82b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@
        - add new fully recursive macro.c
 
 2.5.3 -> 2.5.4:
+       - rationalize autoconf detection of gzip/bzip2.
        - restore backward compatible rpmrc/rpmpopt symlinks.
        - update pt_BR translations (Arnaldo Carvalho de Melo).
        - permit --{buildroot,timecheck,test,sign} with -tX (Toshio Kuratomi).

diff --git a/configure.in b/configure.in
index 08dac26..880121f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -158,11 +158,12 @@ AC_PROG_RANLIB
 AC_CHECK_TOOL(AR, ar, :)
 
 if test "$cross_compiling" != "yes"; then
-    AC_MSG_CHECKING(GNU gzip)
+    MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/opt/gnu/bin"
+    AC_MSG_CHECKING(for gzip location)
     if test -z "$GZIPBIN"; then
            oldifs="$IFS"
            IFS=:
-           for n in $PATH:/opt/gnu/bin; do
+           for n in $MYPATH; do
                    if test -f $n/gzip; then
                            GZIPBIN="$n/gzip";
                            break
@@ -172,18 +173,18 @@ if test "$cross_compiling" != "yes"; then
     fi
 
     if test -z "$GZIPBIN"; then
-           GZIPBIN="gzip"
+           GZIPBIN="/bin/gzip"
            AC_MSG_RESULT(no)
-           AC_MSG_WARN(RPM will not work without GNU gzip.)
+           AC_MSG_WARN(Can't find gzip, assuming $GZIPBIN)
     else
            AC_MSG_RESULT(yes)
     fi
 
-    AC_MSG_CHECKING(for bzip2...)
+    AC_MSG_CHECKING(for bzip2 location)
     if test -z "$BZIP2BIN"; then
            oldifs="$IFS"
            IFS=:
-           for n in $PATH:/opt/gnu/bin; do
+           for n in $MYPATH; do
                    if test -f $n/bzip2; then
                            BZIP2BIN="$n/bzip2";
                            break
@@ -193,9 +194,9 @@ if test "$cross_compiling" != "yes"; then
     fi
 
     if test -z "$BZIP2BIN"; then
-           BZIP2BIN="bzip2"
+           BZIP2BIN="/usr/bin/bzip2"
            AC_MSG_RESULT(no)
-           AC_MSG_WARN(RPM will not work without GNU gzip.)
+           AC_MSG_WARN(Can't find bzip2, assuming $BZIP2BIN)
     else
            AC_MSG_RESULT(yes)
     fi
@@ -218,7 +219,7 @@ addlib() {
   l=$1
   shift
   case "$target" in 
-    *-*-solaris*)      LIBS="$LIBS -L$l -R $l $*";;
+    *-*-solaris*)      LIBS="$LIBS -L$l -R$l $*";;
     *)         LIBS="$LIBS -L$l $*";;
   esac
 }