---- rpm-4.1/python/Makefile.am~ Fri Oct 18 08:38:02 2002
-+++ rpm-4.1/python/Makefile.am Fri Oct 18 08:55:34 2002
-@@ -25,7 +23,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.1/rpmio/Makefile.am~ Fri Oct 18 08:38:02 2002
-+++ rpm-4.1/rpmio/Makefile.am Fri Oct 18 10:43:29 2002
-@@ -67,34 +67,34 @@
- lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
+diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
+--- rpm-4.3.org/rpmdb/Makefile.am 2004-01-07 02:28:11.926180317 +0100
++++ rpm-4.3/rpmdb/Makefile.am 2004-01-07 02:29:17.087717856 +0100
+@@ -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-4.3.org/rpmio/Makefile.am rpm-4.3/rpmio/Makefile.am
+--- rpm-4.3.org/rpmio/Makefile.am 2004-01-07 02:27:43.915966813 +0100
++++ rpm-4.3/rpmio/Makefile.am 2004-01-07 02:29:17.090717237 +0100
+@@ -11,7 +11,6 @@
+ INCLUDES = -I. \
+ -I$(top_srcdir) \
+ @WITH_BEECRYPT_INCLUDE@ \
+- -I$(top_srcdir)/popt \
+ @INCPATH@
+
+ pkgincdir = $(pkgincludedir)
+@@ -65,34 +64,34 @@
+ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)