only build misc dir and use libmisc.a if necessary

CVS patchset: 1884
CVS date: 1997/10/31 19:24:48

diff --git a/Makefile.in b/Makefile.in
index 87ede9d..3fe44bf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,13 +30,13 @@ ETCDIR=$(ROOT)/etc
 
 # -----------------------------------------------------------------------
 
-SUBDIRS = popt misc lib build tools @PO@
+SUBDIRS = popt @MISCDIR@ lib build tools @PO@
 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
 LIBS = @LIBS@ @LIBINTL@ @LIBDL@
-LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -lmisc 
+LOADLIBES = -lbuild popt/libpopt.a $(topdir)/lib/librpm.a -L $(topdir)/misc @LIBMISC@
 
 SOURCES = $(subst .o,.c,$(OBJS))
 
@@ -48,7 +48,7 @@ endif
 
 all: $(TARGET)
 
-rpm: lib/librpm.a build/libbuild.a misc/libmisc.a $(OBJS) 
+rpm: lib/librpm.a build/libbuild.a @MISCPATH@ $(OBJS) 
        $(CC) -o rpm -static $(LDFLAGS) $(OBJS) $(LOADLIBES) $(LIBS) \
                $(LIBEFENCE)
 

diff --git a/configure.in b/configure.in
index f6851fa..a421dd7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,8 @@ LIBINTL=""
 PO=""
 GETTEXTSTUB="gettextstub.o"
 
+MISCOBJS=
+
 AC_CANONICAL_SYSTEM
 
 dnl Checks for programs.
@@ -285,7 +287,7 @@ if test "$LCHOWN" = no; then
     AC_ARG_ENABLE([broken-chown],
     [  --enable-broken-chown  this system's chown follows symbolic links], 
            result=yes, result=unknown)
-    if echo "$build" | egrep "(aix)|(hpux)" > /dev/null ; then
+    if echo "$build" | egrep "(aix)|(hpux)|(linux)" > /dev/null ; then
        result=yes
     elif echo "$build" | egrep "(nextstep)" > /dev/null ; then
        result=no
@@ -382,6 +384,12 @@ else
        ln -s autodeps/none ./find-requires.sh
 fi
 
+if test -n "$MISCOBJS" ; then
+       MISCDIR=misc
+       MISCLIB=-lmisc
+       MISCPATH=misc/libmisc.a
+fi
+
 AC_SUBST(MISCOBJS)
 AC_SUBST(INCPATH)
 AC_SUBST(LIBMISC)
@@ -399,8 +407,11 @@ AC_SUBST(GETTEXTSTUB)
 AC_SUBST(RPM)
 AC_SUBST(GZIPBIN)
 AC_SUBST(FIXPERMS)
+AC_SUBST(MISCDIR)
+AC_SUBST(MISCLIB)
+AC_SUBST(MISCPATH)
 
-if [ -d newbuild ]; then
+if test -d newbuild ; then
    NBMAKEFILE=newbuild/Makefile
 else
    NBMAKEFILE=