Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2003-09-12
Initial Package Version: 4.1
Origin: Gentoo Packages
Description: Uses system popt library

diff -Naur rpm-4.1.orig/Makefile.am rpm-4.1/Makefile.am
--- rpm-4.1.orig/Makefile.am	2002-09-16 21:40:53.000000000 +0000
+++ rpm-4.1/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -12,7 +12,7 @@
 	po/*.in po/*.po po/rpm.pot \
 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
 
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
 
 INCLUDES = \
 	-I$(top_srcdir)/build \
@@ -20,7 +20,6 @@
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
 	-I$(top_srcdir)/beecrypt \
-	-I$(top_srcdir)/popt \
 	@WITH_LIBELF_INCLUDE@ \
 	@WITH_ZLIB_INCLUDE@ \
 	@INCPATH@
@@ -35,7 +34,7 @@
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la \
+	/usr/lib/libpopt.la
 	@WITH_LIBELF_LIB@ \
 	@WITH_ZLIB_LIB@ \
 	@INTLLIBS@ \
@@ -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))
 
diff -Naur rpm-4.1.orig/Makefile.in rpm-4.1/Makefile.in
--- rpm-4.1.orig/Makefile.in	2002-09-16 21:41:07.000000000 +0000
+++ rpm-4.1/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -214,7 +214,7 @@
 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
 
 
-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
 
 INCLUDES = \
 	-I$(top_srcdir)/build \
@@ -238,7 +238,6 @@
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la \
 	@WITH_LIBELF_LIB@ \
 	@WITH_ZLIB_LIB@ \
 	@INTLLIBS@ \
@@ -310,43 +309,43 @@
 rpm_DEPENDENCIES = rpm.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpm2cpio_OBJECTS = rpm2cpio.$(OBJEXT)
 rpm2cpio_OBJECTS = $(am_rpm2cpio_OBJECTS)
 rpm2cpio_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpmb_OBJECTS = build.$(OBJEXT)
 rpmb_OBJECTS = $(am_rpmb_OBJECTS)
 rpmb_DEPENDENCIES = rpmb.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpmd_OBJECTS =
 rpmd_OBJECTS = $(am_rpmd_OBJECTS)
 rpmd_DEPENDENCIES = rpmd.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpmi_OBJECTS =
 rpmi_OBJECTS = $(am_rpmi_OBJECTS)
 rpmi_DEPENDENCIES = rpmi.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpmk_OBJECTS =
 rpmk_OBJECTS = $(am_rpmk_OBJECTS)
 rpmk_DEPENDENCIES = rpmk.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_rpmq_OBJECTS =
 rpmq_OBJECTS = $(am_rpmq_OBJECTS)
 rpmq_DEPENDENCIES = rpmq.o $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 SCRIPTS = $(bin_SCRIPTS) $(pkglib_SCRIPTS)
 
 
@@ -979,8 +978,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`
 
 install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
diff -Naur rpm-4.1.orig/build/Makefile.am rpm-4.1/build/Makefile.am
--- rpm-4.1.orig/build/Makefile.am	2002-07-21 22:06:19.000000000 +0000
+++ rpm-4.1/build/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -7,7 +7,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 LIBS =
diff -Naur rpm-4.1.orig/build/Makefile.in rpm-4.1/build/Makefile.in
--- rpm-4.1.orig/build/Makefile.in	2002-08-31 13:23:15.000000000 +0000
+++ rpm-4.1/build/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -207,7 +207,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 
diff -Naur rpm-4.1.orig/configure rpm-4.1/configure
--- rpm-4.1.orig/configure	2002-08-31 13:23:24.000000000 +0000
+++ rpm-4.1/configure	2003-09-12 20:59:29.000000000 +0000
@@ -455,7 +455,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all popt beecrypt zlib libelf db3"
+ac_subdirs_all="$ac_subdirs_all beecrypt zlib libelf db3"
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -21523,7 +21523,7 @@
 
 
 
-subdirs="$subdirs popt beecrypt zlib libelf db3"
+subdirs="$subdirs beecrypt zlib libelf db3"
 
 
 ac_config_files="$ac_config_files Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile scripts/Makefile scripts/brp-redhat scripts/macros.perl scripts/macros.php scripts/macros.python tools/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile python/rpmdb/Makefile python/test/Makefile"
@@ -22973,7 +22973,7 @@
         ;;
       esac
     done ;;
-    default ) 	echo timestamp > popt/stamp-h.in
+    default )
 	echo timestamp > beecrypt/stamp-h.in
 	echo timestamp > stamp-h.in
 
diff -Naur rpm-4.1.orig/configure.ac rpm-4.1/configure.ac
--- rpm-4.1.orig/configure.ac	2002-08-22 17:01:34.000000000 +0000
+++ rpm-4.1/configure.ac	2003-09-12 20:59:29.000000000 +0000
@@ -1191,7 +1191,7 @@
 dnl # XXX Propagate -lucb to popt ...
 dnl export LIBS INCPATH CONFIG_SITE
 
-AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
+AC_CONFIG_SUBDIRS(beecrypt zlib libelf db3)
 
 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
 	rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
@@ -1211,8 +1211,7 @@
 	python/Makefile
 	python/rpmdb/Makefile
 	python/test/Makefile
-  ], [	echo timestamp > popt/stamp-h.in
-	echo timestamp > beecrypt/stamp-h.in
+  ], [	echo timestamp > beecrypt/stamp-h.in
 	echo timestamp > stamp-h.in
   ]
 )
diff -Naur rpm-4.1.orig/lib/Makefile.am rpm-4.1/lib/Makefile.am
--- rpm-4.1.orig/lib/Makefile.am	2002-08-30 11:41:54.000000000 +0000
+++ rpm-4.1/lib/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -7,7 +7,6 @@
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 EXTRA_DIST = getdate.y
@@ -22,8 +21,7 @@
 mylibpaths = \
 	-L$(top_builddir)/lib \
 	-L$(top_builddir)/rpmdb \
-	-L$(top_builddir)/rpmio \
-	-L$(top_builddir)/popt
+	-L$(top_builddir)/rpmio
 
 mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
diff -Naur rpm-4.1.orig/lib/Makefile.in rpm-4.1/lib/Makefile.in
--- rpm-4.1.orig/lib/Makefile.in	2002-08-31 13:23:17.000000000 +0000
+++ rpm-4.1/lib/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -207,7 +207,6 @@
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 
@@ -225,8 +224,7 @@
 mylibpaths = \
 	-L$(top_builddir)/lib \
 	-L$(top_builddir)/rpmdb \
-	-L$(top_builddir)/rpmio \
-	-L$(top_builddir)/popt
+	-L$(top_builddir)/rpmio
 
 
 mylibs = -lrpm -lrpmdb -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
diff -Naur rpm-4.1.orig/python/Makefile.am rpm-4.1/python/Makefile.am
--- rpm-4.1.orig/python/Makefile.am	2002-08-30 11:50:13.000000000 +0000
+++ rpm-4.1/python/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -11,7 +11,6 @@
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
 	-I$(top_srcdir)/beecrypt \
-	-I$(top_srcdir)/popt \
 	-I/usr/include/python${PYVER} \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
@@ -25,7 +24,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
+	/usr/lib/libpopt.so
 
 LDADD =
 
diff -Naur rpm-4.1.orig/python/Makefile.in rpm-4.1/python/Makefile.in
--- rpm-4.1.orig/python/Makefile.in	2002-08-31 13:23:18.000000000 +0000
+++ rpm-4.1/python/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -211,7 +211,6 @@
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
 	-I$(top_srcdir)/beecrypt \
-	-I$(top_srcdir)/popt \
 	-I/usr/include/python${PYVER} \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
@@ -227,7 +226,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
+	/usr/lib/libpopt.so
 
 
 LDADD = 
diff -Naur rpm-4.1.orig/rpmdb/Makefile.am rpm-4.1/rpmdb/Makefile.am
--- rpm-4.1.orig/rpmdb/Makefile.am	2002-08-30 13:12:01.000000000 +0000
+++ rpm-4.1/rpmdb/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -7,7 +7,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmio \
 	-I$(top_srcdir)/beecrypt \
-	-I$(top_srcdir)/popt \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
 
@@ -25,8 +24,7 @@
 
 mylibpaths = \
 	-L$(top_builddir)/lib \
-	-L$(top_builddir)/rpmio \
-	-L$(top_builddir)/popt
+	-L$(top_builddir)/rpmio
 
 mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
 LIBS =
diff -Naur rpm-4.1.orig/rpmdb/Makefile.in rpm-4.1/rpmdb/Makefile.in
--- rpm-4.1.orig/rpmdb/Makefile.in	2002-08-31 13:23:19.000000000 +0000
+++ rpm-4.1/rpmdb/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -207,7 +207,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmio \
 	-I$(top_srcdir)/beecrypt \
-	-I$(top_srcdir)/popt \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
 
@@ -226,8 +225,7 @@
 
 mylibpaths = \
 	-L$(top_builddir)/lib \
-	-L$(top_builddir)/rpmio \
-	-L$(top_builddir)/popt
+	-L$(top_builddir)/rpmio
 
 
 mylibs = -lrpm -lrpmio -lpopt @LIBS@ @INTLLIBS@ @LIBMISC@
diff -Naur rpm-4.1.orig/rpmio/Makefile.am rpm-4.1/rpmio/Makefile.am
--- rpm-4.1.orig/rpmio/Makefile.am	2002-07-21 22:07:06.000000000 +0000
+++ rpm-4.1/rpmio/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -8,7 +8,6 @@
 
 INCLUDES = -I. \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 pkgincdir = $(pkgincludedir)
@@ -60,34 +59,34 @@
 	lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
 
 tdigest_SOURCES = tdigest.c
-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tdigest_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tdir_SOURCES = tdir.c
 tdir_LDFLAGS = -all-static
-tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tdir_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tfts_SOURCES = tfts.c
 tfts_LDFLAGS = -all-static
-tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tfts_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tglob_SOURCES = tglob.c
 tglob_LDFLAGS = -all-static
-tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tglob_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tinv_SOURCES = tinv.c
 tinv_LDFLAGS = -all-static
-tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tinv_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tkey_SOURCES = tkey.c
 tkey_LDFLAGS = -all-static
-tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tkey_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tring_SOURCES = tring.c
 tring_LDFLAGS = -all-static
-tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tring_LDADD = librpmio.la /usr/lib/libpopt.la
 
 trpmio_SOURCES = trpmio.c
-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+trpmio_LDADD = librpmio.la /usr/lib/libpopt.la
 
 dumpasn1_SOURCES = dumpasn1.c
 
diff -Naur rpm-4.1.orig/rpmio/Makefile.in rpm-4.1/rpmio/Makefile.in
--- rpm-4.1.orig/rpmio/Makefile.in	2002-08-31 13:23:20.000000000 +0000
+++ rpm-4.1/rpmio/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -208,7 +208,6 @@
 
 INCLUDES = -I. \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/popt \
 	@INCPATH@
 
 
@@ -232,34 +231,34 @@
 librpmio_la_DEPENDENCIES = .created
 
 tdigest_SOURCES = tdigest.c
-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tdigest_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tdir_SOURCES = tdir.c
 tdir_LDFLAGS = -all-static
-tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tdir_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tfts_SOURCES = tfts.c
 tfts_LDFLAGS = -all-static
-tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tfts_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tglob_SOURCES = tglob.c
 tglob_LDFLAGS = -all-static
-tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tglob_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tinv_SOURCES = tinv.c
 tinv_LDFLAGS = -all-static
-tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tinv_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tkey_SOURCES = tkey.c
 tkey_LDFLAGS = -all-static
-tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tkey_LDADD = librpmio.la /usr/lib/libpopt.la
 
 tring_SOURCES = tring.c
 tring_LDFLAGS = -all-static
-tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tring_LDADD = librpmio.la /usr/lib/libpopt.la
 
 trpmio_SOURCES = trpmio.c
-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+trpmio_LDADD = librpmio.la /usr/lib/libpopt.la
 
 dumpasn1_SOURCES = dumpasn1.c
 subdir = rpmio
@@ -282,29 +281,29 @@
 dumpasn1_LDFLAGS =
 am_tdigest_OBJECTS = tdigest.$(OBJEXT)
 tdigest_OBJECTS = $(am_tdigest_OBJECTS)
-tdigest_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tdigest_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 tdigest_LDFLAGS =
 am_tdir_OBJECTS = tdir.$(OBJEXT)
 tdir_OBJECTS = $(am_tdir_OBJECTS)
-tdir_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tdir_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_tfts_OBJECTS = tfts.$(OBJEXT)
 tfts_OBJECTS = $(am_tfts_OBJECTS)
-tfts_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tfts_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_tglob_OBJECTS = tglob.$(OBJEXT)
 tglob_OBJECTS = $(am_tglob_OBJECTS)
-tglob_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tglob_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_tinv_OBJECTS = tinv.$(OBJEXT)
 tinv_OBJECTS = $(am_tinv_OBJECTS)
-tinv_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tinv_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_tkey_OBJECTS = tkey.$(OBJEXT)
 tkey_OBJECTS = $(am_tkey_OBJECTS)
-tkey_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tkey_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_tring_OBJECTS = tring.$(OBJEXT)
 tring_OBJECTS = $(am_tring_OBJECTS)
-tring_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+tring_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 am_trpmio_OBJECTS = trpmio.$(OBJEXT)
 trpmio_OBJECTS = $(am_trpmio_OBJECTS)
-trpmio_DEPENDENCIES = librpmio.la $(top_builddir)/popt/libpopt.la
+trpmio_DEPENDENCIES = librpmio.la /usr/lib/libpopt.la
 trpmio_LDFLAGS =
 
 DEFS = @DEFS@
diff -Naur rpm-4.1.orig/tools/Makefile.am rpm-4.1/tools/Makefile.am
--- rpm-4.1.orig/tools/Makefile.am	2002-08-22 19:42:37.000000000 +0000
+++ rpm-4.1/tools/Makefile.am	2003-09-12 20:59:29.000000000 +0000
@@ -8,7 +8,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@WITH_LIBELF_INCLUDE@ \
 	@WITH_ZLIB_INCLUDE@ \
 	@INCPATH@ \
@@ -23,7 +22,7 @@
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la \
+	/usr/lib/libpopt.la \
 	@WITH_LIBELF_LIB@ \
 	@INTLLIBS@
 
diff -Naur rpm-4.1.orig/tools/Makefile.in rpm-4.1/tools/Makefile.in
--- rpm-4.1.orig/tools/Makefile.in	2002-08-31 13:23:21.000000000 +0000
+++ rpm-4.1/tools/Makefile.in	2003-09-12 20:59:29.000000000 +0000
@@ -208,7 +208,6 @@
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	-I$(top_srcdir)/popt \
 	@WITH_LIBELF_INCLUDE@ \
 	@WITH_ZLIB_INCLUDE@ \
 	@INCPATH@ \
@@ -224,7 +223,7 @@
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la \
+	/usr/lib/libpopt.la \
 	@WITH_LIBELF_LIB@ \
 	@INTLLIBS@
 
@@ -273,7 +272,7 @@
 dump_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 dump_LDFLAGS =
 dumpdb_SOURCES = dumpdb.c
 dumpdb_OBJECTS = dumpdb.$(OBJEXT)
@@ -281,7 +280,7 @@
 dumpdb_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 dumpdb_LDFLAGS =
 am_javadeps_OBJECTS = javadeps.$(OBJEXT)
 javadeps_OBJECTS = $(am_javadeps_OBJECTS)
@@ -289,7 +288,7 @@
 javadeps_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 javadeps_LDFLAGS =
 rpmarchive_SOURCES = rpmarchive.c
 rpmarchive_OBJECTS = rpmarchive.$(OBJEXT)
@@ -297,7 +296,7 @@
 rpmarchive_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmarchive_LDFLAGS =
 am_rpmcache_OBJECTS = rpmcache.$(OBJEXT)
 rpmcache_OBJECTS = $(am_rpmcache_OBJECTS)
@@ -305,7 +304,7 @@
 rpmcache_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmcache_LDFLAGS =
 am_rpmgraph_OBJECTS = rpmgraph.$(OBJEXT)
 rpmgraph_OBJECTS = $(am_rpmgraph_OBJECTS)
@@ -313,7 +312,7 @@
 rpmgraph_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmgraph_LDFLAGS =
 rpmheader_SOURCES = rpmheader.c
 rpmheader_OBJECTS = rpmheader.$(OBJEXT)
@@ -321,7 +320,7 @@
 rpmheader_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmheader_LDFLAGS =
 am_rpminject_OBJECTS = rpminject.$(OBJEXT)
 rpminject_OBJECTS = $(am_rpminject_OBJECTS)
@@ -329,14 +328,14 @@
 rpminject_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmlead_SOURCES = rpmlead.c
 rpmlead_OBJECTS = rpmlead.$(OBJEXT)
 rpmlead_LDADD = $(LDADD)
 rpmlead_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmlead_LDFLAGS =
 rpmsignature_SOURCES = rpmsignature.c
 rpmsignature_OBJECTS = rpmsignature.$(OBJEXT)
@@ -344,7 +343,7 @@
 rpmsignature_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 rpmsignature_LDFLAGS =
 am_rpmsort_OBJECTS = rpmsort.$(OBJEXT)
 rpmsort_OBJECTS = $(am_rpmsort_OBJECTS)
@@ -352,7 +351,7 @@
 rpmsort_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 am_striptofile_OBJECTS = striptofile.$(OBJEXT) sections.$(OBJEXT) \
 	utils.$(OBJEXT)
 striptofile_OBJECTS = $(am_striptofile_OBJECTS)
@@ -360,7 +359,7 @@
 striptofile_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 striptofile_LDFLAGS =
 am_unstripfile_OBJECTS = unstripfile.$(OBJEXT) sections.$(OBJEXT) \
 	utils.$(OBJEXT)
@@ -369,7 +368,7 @@
 unstripfile_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
-	$(top_builddir)/popt/libpopt.la
+	/usr/lib/libpopt.la
 unstripfile_LDFLAGS =
 
 DEFS = @DEFS@