Sanity.

CVS patchset: 5326
CVS date: 2002/02/20 22:09:28

configure.in

@@ -315,7 +315,7 @@ do
 	esac
 
 	AC_MSG_CHECKING(for $dir/lib in LIBS)
-	if test -d $dir/lib ; then
+	if test -d $dir/lib 2> /dev/null ; then
 		addlib $dir/lib
 		AC_MSG_RESULT(yes)
 	else

lib/Makefile.am

@@ -21,10 +21,10 @@ noinst_HEADERS = \
 	rpmal.h rpmds.h rpmfi.h rpmlead.h rpmte.h signature.h
 
 mylibpaths = \
-	-L$(top_builddir)/lib/.libs \
-	-L$(top_builddir)/rpmdb/.libs \
-	-L$(top_builddir)/rpmio/.libs \
-	-L$(top_builddir)/popt/.libs
+	-L$(top_builddir)/lib \
+	-L$(top_builddir)/rpmdb \
+	-L$(top_builddir)/rpmio \
+	-L$(top_builddir)/popt
 
 mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
@@ -92,7 +92,7 @@ trb: trb.o librpm.la
 	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trb.o $(mylibs) $(LIBS)
 
 ts: ts.o librpm.la
-	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ ts.o $(mylibs) $(LIBS)
+	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ ts.o $(mylibpaths) $(mylibs) $(LIBS)
 
 trhn: trhn.o librpm.la
 	$(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ trhn.o $(mylibs) $(LIBS)

rpm.spec

@@ -646,3 +646,4 @@ fi
 - rpm-4.0.4 release candidate.
 - add cpanflute2, another perl.req fiddle.
 - make peace with gcc-3.1, remove compiler cruft.
+- make peace with automake et al in 8.0, ugh.