Made code recognize gzipbin rpmrc entry.

CVS patchset: 1584
CVS date: 1997/05/01 21:07:46

diff --git a/Makefile.in b/Makefile.in
index 6fa36e7..5eadf9f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,8 @@ INSTSUBDIRS = lib @PO@
 OTHERSUBDIRS = docs autodeps
 OBJS = rpm.o query.o install.o verify.o checksig.o ftp.o url.o @GETTEXTSTUB@
 PROGS = @RPM@ rpm2cpio
-LOADLIBES = -lbuild $(topdir)/lib/librpm.a -lmisc @LIBS@ @LIBINTL@ @LIBDL@
+LIBS = @LIBS@ @LIBINTL@ @LIBDL@
+LOADLIBES = -lbuild $(topdir)/lib/librpm.a -lmisc 
 
 SOURCES = $(subst .o,.c,$(OBJS))
 
@@ -47,21 +48,22 @@ endif
 
 all: $(TARGET)
 
-rpm: lib/librpm.a build/libbuild.a misc/libmisc.a $(OBJS)
-       $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) \
+rpm: lib/librpm.a build/libbuild.a misc/libmisc.a $(OBJS) 
+       $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
                $(LIBEFENCE)
 
 rpm.shared: lib/librpm.a build/libbuild.a $(OBJS)
-       $(CC) -o rpm.shared $(LDFLAGS) $(OBJS) $(LOADLIBES) \
+       $(CC) -o rpm.shared $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
                $(LIBEFENCE)
 
 # we don't normally build this, so ./configure doesn't try very hard
 # to make it work
 rpmconvert: lib/librpm.a convertdb.o oldrpmdb.o
-       $(CC) -o rpmconvert $(LDFLAGS) convertdb.o oldrpmdb.o -lgdbm $(LOADLIBES) 
+       $(CC) -o rpmconvert $(LDFLAGS) convertdb.o oldrpmdb.o -lgdbm \
+               $(LOADLIBES) $(LIBS)
 
 rpm2cpio: lib/librpm.a rpm2cpio.o
-       $(CC) -o rpm2cpio $(LDFLAGS) rpm2cpio.o $(LOADLIBES) 
+       $(CC) -o rpm2cpio $(LDFLAGS) rpm2cpio.o $(LOADLIBES) $(LIBS)
 
 rpm.o: rpm.c query.h install.h lib/rpmlib.h Makefile
        $(CC) $(CFLAGS) -DRPMNLSPACKAGE=\"$(RPMNLSPACKAGE)\" \

diff --git a/Makefile.inc.in b/Makefile.inc.in
index f097406..c7927ca 100644 (file)
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -16,7 +16,7 @@ CFLAGS = @CFLAGS@ @INCPATH@ $(WARNINGS) $(OPTS) -I$(topdir) \
        -DLIBRPMRC_FILENAME="\"$(LIBRPMRC_FILENAME)"\" \
        -DLIBRPMALIAS_FILENAME="\"$(LIBRPMALIAS_FILENAME)"\" \
        -DVERSION=\"$(VERSION)\" 
-LDFLAGS = @LDFLAGS@ @LIBS@ -Llib -Lbuild -Lmisc -L$(topdir)/lib \
+LDFLAGS = @LDFLAGS@ -Llib -Lbuild -Lmisc -L$(topdir)/lib \
                -L$(topdir)/build -L$(topdir)/misc
 VERSION = 2.4
 CC = @CC@

diff --git a/configure.in b/configure.in
index 6bee8b8..7dd083c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,8 +46,6 @@ AC_PROG_RANLIB
 
 AC_CHECK_TOOL(AR, ar, :)
 
-CPIOBIN="cpio"
-GZIPBIN="gzip"
 if test "$cross_compiling" != "yes"; then
     AC_MSG_CHECKING(checking for GNU cpio...)
     if test -z "$CPIOBIN"; then
@@ -67,6 +65,7 @@ if test "$cross_compiling" != "yes"; then
     if test -z "$CPIOBIN"; then
            AC_MSG_RESULT(no)
            AC_MSG_WARN(RPM will not work without GNU cpio 2.4.2 or later.)
+           CPIOBIN="cpio"
     else
            AC_MSG_RESULT(yes)
     fi
@@ -84,6 +83,7 @@ if test "$cross_compiling" != "yes"; then
     fi
 
     if test -z "$GZIPBIN"; then
+           GZIPBIN="gzip"
            AC_MSG_RESULT(no)
            AC_MSG_WARN(RPM will not work without GNU gzip.)
     else

diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index 0746cd6..f940e1a 100644 (file)
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -5,7 +5,7 @@ dbpath:         @varprefix@/lib/rpm
 topdir:                @prefix@/src/redhat
 tmppath:       @tmpdir@
 cpiobin:       @CPIOBIN@
-gzip:          @GZIPBIN@
+gzipbin:       @GZIPBIN@
 defaultdocdir:  @prefix@/doc
 fixperms:      @FIXPERMS@
 

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 87f2a36..0403095 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -79,6 +79,7 @@ struct rpmoption optionTable[] = {
     { "fixperms",              RPMVAR_FIXPERMS,                0 },
     { "ftpport",               RPMVAR_FTPPORT,                 0 },
     { "ftpproxy",              RPMVAR_FTPPROXY,                0 },
+    { "gzipbin",               RPMVAR_GZIPBIN,                 0 },
     { "messagelevel",          RPMVAR_MESSAGELEVEL,            0 },
     { "netsharedpath",         RPMVAR_NETSHAREDPATH,           0 },
     { "optflags",              RPMVAR_OPTFLAGS,                1 },