---- rpm-4.3/rpmio/Makefile.am.wiget Fri May 16 00:16:34 2003
-+++ rpm-4.3/rpmio/Makefile.am Fri May 16 00:18:17 2003
-@@ -70,34 +70,34 @@
+diff -urN rpm.org/configure.ac rpm/configure.ac
+--- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200
++++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200
+@@ -428,6 +428,18 @@
+ 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])
+ ])
+@@ -1203,7 +1215,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(file)
+
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+ scripts/perl.req scripts/perl.prov
+@@ -1227,7 +1239,7 @@
+ python/rpmdb/test/Makefile
+ lua/Makefile
+ ])
+-AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in
++AC_CONFIG_COMMANDS([default],[[
+ echo timestamp > stamp-h.in
+
+ ]],[[]])
+diff -urN rpm.org/lib/Makefile.am rpm/lib/Makefile.am
+--- rpm.org/lib/Makefile.am 2004-06-14 11:46:08.925289496 +0200
++++ rpm/lib/Makefile.am 2004-06-14 11:47:13.502472272 +0200
+@@ -40,7 +40,7 @@
+ librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la \
++ -lpopt \
+ @WITH_SELINUX_LIB@
+
+ getdate.c: getdate.y
+diff -urN rpm.org/Makefile.am rpm/Makefile.am
+--- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200
++++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +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@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ lua 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_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+
+ INCLUDES = \
+ -I$(top_srcdir)/build \
+@@ -22,7 +22,6 @@
+ -I$(top_srcdir)/rpmdb \
+ -I$(top_srcdir)/rpmio \
+ @WITH_BEECRYPT_INCLUDE@ \
+- -I$(top_srcdir)/popt \
+ @WITH_LIBELF_INCLUDE@ \
+ @INCPATH@
+
+@@ -34,7 +33,7 @@
+ $(top_builddir)/lib/librpm.la \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la \
++ -lpopt \
+ @WITH_ZLIB_LIB@ \
+ @INTLLIBS@ \
+ @LIBMISC@
+@@ -107,7 +106,6 @@
+ -load lib/rpmlib.lcd \
+ -load rpmdb/rpmdb.lcd \
+ -load rpmio/rpmio.lcd \
+- -load popt/popt.lcd \
+ $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
+
+ .PHONY: lint
+@@ -117,9 +115,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 file/src` \
+- `make -s sources -C popt`
++ `make -s sources -C file/src`
+
+ CVSTAG = r$(subst .,-,$(VERSION))
+
+diff -urN rpm.org/rpmdb/Makefile.am rpm/rpmdb/Makefile.am
+--- rpm.org/rpmdb/Makefile.am 2004-06-14 11:46:09.726167744 +0200
++++ rpm/rpmdb/Makefile.am 2004-06-14 11:47:13.524468928 +0200
+@@ -9,7 +9,6 @@
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/rpmio \
+ @WITH_BEECRYPT_INCLUDE@ \
+- -I$(top_srcdir)/popt \
+ @WITH_LIBELF_INCLUDE@ \
+ @INCPATH@
+
+@@ -51,7 +50,7 @@
+ tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -release 4.3 \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la \
++ @WITH_POPT_LIB@ \
+ @WITH_LIBELF_LIB@
+ librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
+ librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
+diff -urN rpm.org/rpmio/Makefile.am rpm/rpmio/Makefile.am
+--- rpm.org/rpmio/Makefile.am 2004-06-14 11:46:09.817153912 +0200
++++ rpm/rpmio/Makefile.am 2004-06-14 11:48:20.584274288 +0200
+@@ -11,7 +11,6 @@
+ INCLUDES = -I. \
+ -I$(top_srcdir) \
+ @WITH_BEECRYPT_INCLUDE@ \
+- -I$(top_srcdir)/popt \
+ -I$(top_srcdir)/lua/include \
+ -I$(top_srcdir)/lua/local \
+ @INCPATH@
+@@ -69,34 +68,34 @@
$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
tdigest_SOURCES = tdigest.c
tsw_SOURCES = tsw.c
tsw_LDFLAGS = librpmio.la
---- rpm-4.3/rpmdb/Makefile.am.wiget Tue Mar 25 13:49:44 2003
-+++ rpm-4.3/rpmdb/Makefile.am Fri May 16 00:16:34 2003
-@@ -49,7 +49,7 @@
- tagname.c tagtbl.c
- librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
- $(top_builddir)/rpmio/librpmio.la \
-- $(top_builddir)/popt/libpopt.la \
-+ @WITH_POPT_LIB@ \
- @WITH_LIBELF_LIB@ \
- @libdb3@
- librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
---- rpm-4.3/lib/Makefile.am.wiget Tue Apr 8 18:38:08 2003
-+++ rpm-4.3/lib/Makefile.am Fri May 16 00:16:34 2003
-@@ -39,7 +39,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 Thu Apr 17 18:45:19 2003
-+++ rpm-4.3/tools/Makefile.am Fri May 16 00:16:34 2003
-@@ -39,7 +39,7 @@
+diff -urN rpm.org/tools/Makefile.am rpm/tools/Makefile.am
+--- rpm.org/tools/Makefile.am 2004-06-14 11:46:09.906140384 +0200
++++ rpm/tools/Makefile.am 2004-06-14 11:47:13.532467712 +0200
+@@ -9,7 +9,6 @@
+ -I$(top_srcdir)/rpmdb \
+ -I$(top_srcdir)/rpmio \
+ @WITH_BEECRYPT_INCLUDE@ \
+- -I$(top_srcdir)/popt \
+ @WITH_LIBELF_INCLUDE@ \
+ @WITH_LIBDWARF_INCLUDE@ \
+ -I$(top_srcdir)/file/src \
+@@ -37,7 +36,7 @@
debugedit_SOURCES = debugedit.c hashtab.c
debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
javadeps_SOURCES = javadeps.c
---- rpm-4.3/configure.ac.wiget Fri May 16 00:16:34 2003
-+++ rpm-4.3/configure.ac Fri May 16 00:16:44 2003
-@@ -410,6 +410,17 @@
- ])
- AC_SUBST(WITH_LIBDWARF_INCLUDE)
-
-+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])
- ])
-@@ -470,6 +481,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"],
-@@ -478,6 +490,7 @@
- )
- )
- )
-+ )
- )
-
- if test X"$DBLIBSRCS" = X; then
-@@ -1236,7 +1249,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 file)
-
- AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- scripts/perl.req scripts/perl.prov
-@@ -1260,7 +1273,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 Mon May 5 10:44:39 2003
-+++ rpm-4.3/Makefile.am Fri May 16 00:16:34 2003
-@@ -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@ @WITH_ELFUTILS_SUBDIR@ 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_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-
- INCLUDES = \
- -I$(top_srcdir)/build \
-@@ -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_ZLIB_LIB@ \
- @INTLLIBS@ \
- @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: lint