set bzip2path through configure

CVS patchset: 2129
CVS date: 1998/05/26 13:19:52

diff --git a/CHANGES b/CHANGES
index 4c5c60d..351b824 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@
        - make %doc obey --test
        - unlink before writing .rpms
        - librpm.c: added headerGzRead()/headerGzWrite()
+       - set bzip2path via lib-rpmrc/configure (Toshio Kuratomi)
 
 2.4.109 -> 2.5:
        - fixed return code bug in build code

diff --git a/CREDITS b/CREDITS
index 74814f2..b28c38f 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -19,6 +19,7 @@ Significant code, ideas, or porting help have been contributed by:
        Jeff Johnson
        Michael K. Johnson
        Eugene Kanter
+       Toshio Kuratomi
        Hermann Lauer
        Elliot Lee
        Benedict Lofstedt

diff --git a/configure.in b/configure.in
index 3d2f387..1055337 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -174,6 +174,27 @@ if test "$cross_compiling" != "yes"; then
            AC_MSG_RESULT(yes)
     fi
 
+    AC_MSG_CHECKING(for bzip2...)
+    if test -z "$BZIP2BIN"; then
+           oldifs="$IFS"
+           IFS=:
+           for n in $PATH:/opt/gnu/bin; do
+                   if test -f $n/bzip2; then
+                           BZIP2BIN="$n/bzip2";
+                           break
+                   fi
+           done
+           IFS="$oldifs"
+    fi
+
+    if test -z "$BZIP2BIN"; then
+           BZIP2BIN="bzip2"
+           AC_MSG_RESULT(no)
+           AC_MSG_WARN(RPM will not work without GNU gzip.)
+    else
+           AC_MSG_RESULT(yes)
+    fi
+
     AC_MSG_CHECKING(old version of patch)
     PATCHVERSION=`patch --version 2>&1`
 
@@ -580,6 +601,7 @@ AC_SUBST(PO)
 AC_SUBST(GETTEXTSTUB)
 AC_SUBST(RPM)
 AC_SUBST(GZIPBIN)
+AC_SUBST(BZIP2BIN)
 AC_SUBST(FIXPERMS)
 AC_SUBST(MISCDIR)
 AC_SUBST(LIBMISC)

diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index 19cef4f..f1cd820 100644 (file)
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -9,6 +9,7 @@ dbpath:         @varprefix@/lib/rpm
 topdir:                @prefix@/src/redhat
 tmppath:       @tmpdir@
 gzipbin:       @GZIPBIN@
+bzip2bin:      @BZIP2BIN@
 defaultdocdir:  @prefix@/doc
 fixperms:      @FIXPERMS@
 rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm