---- rpm-4.2/rpmio/Makefile.am.wiget Wed Mar 12 15:10:27 2003
-+++ rpm-4.2/rpmio/Makefile.am Wed Mar 12 15:10:27 2003
-@@ -67,34 +67,34 @@
- lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
+--- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -65,34 +65,34 @@
+ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
tdigest_SOURCES = tdigest.c
--tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD = librpmio.la -lpopt
+-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
++tdigest_LDADD = librpmio.la -lpopt -lgcrypt
tdir_SOURCES = tdir.c
tdir_LDFLAGS = -all-static
-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+trpmio_LDADD = librpmio.la -lpopt
- dumpasn1_SOURCES = dumpasn1.c
-
---- rpm-4.2/python/Makefile.am.wiget Wed Oct 9 21:09:43 2002
-+++ rpm-4.2/python/Makefile.am Wed Mar 12 15:10:27 2003
-@@ -25,7 +25,7 @@
- $(top_builddir)/lib/.libs/librpm.so \
- $(top_builddir)/rpmdb/.libs/librpmdb.so \
- $(top_builddir)/rpmio/.libs/librpmio.so \
-- $(top_builddir)/popt/.libs/libpopt.so
-+ -lpopt
-
- LDADD =
-
---- rpm-4.2/tools/Makefile.am.wiget Thu Oct 24 21:23:46 2002
-+++ rpm-4.2/tools/Makefile.am Wed Mar 12 15:10:27 2003
-@@ -24,7 +24,7 @@
- $(top_builddir)/lib/librpm.la \
- $(top_builddir)/rpmdb/librpmdb.la \
+ tsw_SOURCES = tsw.c
+ tsw_LDFLAGS = librpmio.la
+--- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200
++++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -49,7 +49,7 @@
+ tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
$(top_builddir)/rpmio/librpmio.la \
- $(top_builddir)/popt/libpopt.la \
-+ -lpopt \
++ @WITH_POPT_LIB@ \
@WITH_LIBELF_LIB@ \
- @INTLLIBS@
+ @libdb3@
+ librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
+--- rpm-4.3/lib/Makefile.am.wiget 2003-05-23 16:59:36.000000000 +0200
++++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
+ librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la
++ @WITH_POPT_LIB@
+
+ getdate.c: getdate.y
+ @echo expect 10 shift/reduce conflicts
+--- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200
++++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
+
+ debugedit_SOURCES = debugedit.c hashtab.c
+ debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
+- $(top_builddir)/popt/libpopt.la
++ -lpopt
---- rpm-4.2/configure.ac.wiget Wed Mar 12 15:10:26 2003
-+++ rpm-4.2/configure.ac Wed Mar 12 15:10:27 2003
-@@ -1206,7 +1206,7 @@
+ javadeps_SOURCES = javadeps.c
+
+--- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200
+@@ -431,6 +431,17 @@
+ AC_SUBST(WITH_BEECRYPT_INCLUDE)
+ AC_SUBST(WITH_BEECRYPT_LIB)
+
++WITH_POPT_SUBDIR=
++WITH_POPT_LIB=
++AC_CHECK_HEADERS([popt.h])
++AC_CHECK_LIB(popt, poptGetContext, [
++ AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
++ WITH_POPT_LIB="-lpopt"
++ ],[WITH_POPT_SUBDIR="popt"
++ WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
++
++AC_SUBST(WITH_POPT_SUBDIR)
++AC_SUBST(WITH_POPT_LIB)
+ AC_CHECK_FUNC(setreuid, [], [
+ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
+ ])
+@@ -491,6 +502,7 @@
+
+ dnl Check for Berkeley db3 API.
+ AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
++ AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
+ AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
+ AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
+ AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
+@@ -499,6 +511,7 @@
+ )
+ )
+ )
++ )
+ )
+
+ if test X"$DBLIBSRCS" = X; then
+@@ -1257,7 +1270,7 @@
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
-AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
-+AC_CONFIG_SUBDIRS(beecrypt)
++AC_CONFIG_SUBDIRS(beecrypt file)
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- macros.perl scripts/perl.req scripts/perl.prov
---- rpm-4.2/Makefile.am.wiget Thu Oct 24 22:11:18 2002
-+++ rpm-4.2/Makefile.am Wed Mar 12 15:10:27 2003
-@@ -12,7 +12,7 @@
+ scripts/perl.req scripts/perl.prov
+@@ -1281,7 +1294,7 @@
+ python/rpmdb/test/Makefile
+ python/mpw/Makefile
+ python/mpw/test/Makefile
+- ], [ echo timestamp > popt/stamp-h.in
++ ], [
+ echo timestamp > beecrypt/stamp-h.in
+ echo timestamp > stamp-h.in
+ ]
+--- rpm-4.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200
++++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +0200
+@@ -14,7 +14,7 @@
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ elfutils file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
INCLUDES = \
-I$(top_srcdir)/build \
-@@ -35,7 +35,7 @@
+@@ -34,7 +34,7 @@
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
- $(top_builddir)/popt/libpopt.la \
+ -lpopt \
- @WITH_LIBELF_LIB@ \
@WITH_ZLIB_LIB@ \
@INTLLIBS@ \
-@@ -111,7 +111,6 @@
+ @LIBMISC@
+@@ -105,7 +105,6 @@
-load lib/rpmlib.lcd \
-load rpmdb/rpmdb.lcd \
-load rpmio/rpmio.lcd \
- -load popt/popt.lcd \
$(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
- .PHONY: lclint
-@@ -121,8 +120,7 @@
- `make -s sources -C lib` \
- `make -s sources -C rpmdb` \
- `make -s sources -C rpmio` \
-- `make -s sources -C beecrypt` \
-- `make -s sources -C popt`
-+ `make -s sources -C beecrypt`
-
- CVSTAG = r$(subst .,-,$(VERSION))
-
+ .PHONY: lint