20 files changed, 260 insertions, 202 deletions

diff --git a/CHANGES b/CHANGES
index 8b82d3f28..e3fb47bf7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,7 +29,8 @@
 	  argument (#1026,#5006).
 	- diddle some names to keep my C++ brethern happy (i.e. kpackage port).
 	- fix: add ufdSeek.
-	- duplicate popt routine so that librpm.so needs not libpopt.so.
+	- build popt (with libpopt.so*) as a sub-package of rpm.
+	- split python bindings into a separate sub-package of rpm.
 
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
diff --git a/aclocal.m4 b/aclocal.m4
index df8d205f2..56e7a82fe 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -249,7 +249,7 @@ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
@@ -281,6 +281,11 @@ AC_REQUIRE([AC_PROG_NM])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
 #
 # the following will cause an existing older ltconfig to fail, so
@@ -304,7 +309,7 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -520,7 +525,6 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
 AC_PROG_LD_GNU
 ])
 
@@ -566,14 +570,13 @@ else
 fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
 ])
 
 # AC_CHECK_LIBM - check for math library
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case "$host" in
+case "$lt_target" in
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
diff --git a/configure.in b/configure.in
index c8a724aab..55a9aca3f 100644
--- a/configure.in
+++ b/configure.in
@@ -311,12 +311,11 @@ dnl AmigaOS and IXEmul have a fork() dummy
 esac
 
 
-ZLIB=
 for zlib in z gz ; do
    AC_CHECK_LIB(${zlib}, gzread, 
 	[LIBS="$LIBS -l${zlib}"; break], 
 	[if test ${zlib} = gz; then 
-	    AC_MSG_WARN([sorry this package needs libz.a or libgz.a (from the zlib package)]) 
+	    AC_MSG_WARN([sorry rpm needs libz.a or libgz.a (from the zlib package)]) 
 	 fi]
 	       )
 done
@@ -325,7 +324,7 @@ for bz2lib in bz2 ; do
    AC_CHECK_LIB(${bz2lib}, bzread, 
 	[LIBS="$LIBS -l${bz2lib}"; break], 
 	[if test ${bz2lib} = bz2; then 
-	    AC_MSG_WARN([missing libbz2.a (from the bzip2 package)]) 
+	    AC_MSG_WARN([sorry rpm needs libbz2.a (from the bzip2 package)]) 
 	 fi]
 	       )
 done
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 28847a571..93c67efd4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,6 +31,7 @@ librpm_la_SOURCES = \
 	rebuilddb.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c \
 	rpmio.c rpmlead.c rpmmalloc.c rpmrc.c signature.c stringbuf.c stubs.c \
 	tagName.c tagtable.c transaction.c uninstall.c url.c verify.c
+librpm_la_LIBADD = -lpopt
 
 tagtable.c: rpmlib.h 
 	@echo '#include "system.h"' > tagtable.c
diff --git a/po/cs.po b/po/cs.po
index 504d3540a..9346abc8f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -3164,67 +3164,67 @@ msgstr "chyba: nelze otevøít %s\n"
 msgid "Installing %s\n"
 msgstr "Probíhá instalace %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 #, fuzzy
 msgid "Bad server response"
 msgstr "Chybná odezva serveru FTP"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 #, fuzzy
 msgid "Server IO error"
 msgstr "V/V chyba FTP"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 #, fuzzy
 msgid "Server timeout"
 msgstr "Promlka serveru FTP"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Nelze vyhledat adresu hostitelského serveru FTP"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Nelze vyhledat název hostitelského serveru FTP"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "K serveru FTP se nelze pøipojit"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Se serverem FTP nelze navázat datové spojení"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "V/V chyba na místní soubor"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pøi nastavení vzdáleného serveru na pasivní re¾im"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neznámá nebo neèekaná chyba FTP"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "probíhá pøihla¹ování na %s jako %s, h. %s\n"
diff --git a/po/de.po b/po/de.po
index e4f2a8c0f..a21506b9e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -3292,67 +3292,67 @@ msgstr "Fehler: kann %s nicht öffnen\n"
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 #, fuzzy
 msgid "Bad server response"
 msgstr "Nicht passende Antwort des FTP-Servers"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP IO-Fehler"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 #, fuzzy
 msgid "Server timeout"
 msgstr "Timeout des FTP-Servers"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Verbindung zum FTP-Server fehlgeschlagen"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "IO-Fehler bei lokaler Datei"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 0031a3d8a..2f4175adb 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -3207,67 +3207,67 @@ msgstr "virhe: en voi avata %s\n"
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 #, fuzzy
 msgid "Bad server response"
 msgstr "Virheellinen FTP-palvelijan vastaus"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP:n IO-virhe"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP-palvelimen timeout"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP-palvelimen osoitetta ei löytynyt"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP-palvelimen nimeä ei löytynyt"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "En saanut yhteyttä FTP-palvelijaan"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "En saanut data-yhteyttä FTP-palvelijaan"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "Paikallisen tiedoston IO-virhe"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP:n tuntematon tai odottamaton virhe"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 02b71f7ec..24e31bbe4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-22 16:23-0500\n"
+msgstr "POT-Creation-Date: 1999-12-23 12:49-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3207,59 +3207,59 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 8e568357d..983ca7eef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -3106,59 +3106,59 @@ msgstr "nie mo¿na otworzyæ %s\n"
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr "Sukces"
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr "B³êdna odpowied¼ serwera"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr "B³±d WE/WY(IO) serwera"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr "Przekroczony limit czasu serwera"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr "Nie mo¿na znale¼æ adresu serwera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr "Nie mo¿na znale¼æ nazwy serwera"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr "Po³±czenie z serwerem nie powiod³o siê"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr "Otwarcie transmisji danych z serwera nie powiod³o siê"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "B³±d WE/WY(IO) na lokalnym pliku"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "B³±d: ustawienie zdalnego serwera w tryb pasywny nie powiod³o siê"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Plik nie zosta³ znaleziony na serwerze"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr "Przerywanie ..."
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr "Nieznany lub nieoczekiwany b³±d"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "logowanie do %s jako %s, has³o %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5713155a5..14e33d4d4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-22 16:23-0500\n"
+msgstr "POT-Creation-Date: 1999-12-23 12:49-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3290,59 +3290,59 @@ msgstr "Não consegui abrir: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 012292dc4..b8f25c642 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3032,59 +3032,59 @@ msgstr ""
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 257faf563..6dd08ddf5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3110,59 +3110,59 @@ msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 msgid "Installing %s\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÀ %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr "õÄÁÌÏÓØ"
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr "îÅ×ÅÒÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr "ôÁÊÍÁÕÔ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ IP-ÁÄÒÅÓ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr "îÅ ÍÏÇÕ ÎÁÊÔÉ ÉÍÑ ÓÅÒ×ÅÒÁ"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ ÄÌÑ ÄÁÎÎÙÈ Ó ÓÅÒ×ÅÒÏÍ"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ × ÌÏËÁÌØÎÙÊ ÆÁÊÌ"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÐÅÒÅ×ÏÄÅ ÕÄÁÌÅÎÎÏÇÏ ÓÅÒ×ÅÒÁ × ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ ÎÁ ÓÅÒ×ÅÒÅ"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr "ïÔÍÅÎÁ × ÐÒÏÃÅÓÓÅ"
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÉÌÉ ÎÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "ÒÅÇÉÓÔÒÉÒÕÀÓØ × %s ËÁË %s, ÐÁÒÏÌØ %s\n"
diff --git a/po/sk.po b/po/sk.po
index 432fc13ff..166096426 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -3115,59 +3115,59 @@ msgstr "nie je mo¾né otvori» %s\n"
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr "Úspech"
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr "Chybná odpoveï servera"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr "Chyba vstupu/výstupu servera"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr "Prekroèenie èasového limitu servera"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr "Nie je mo¾né vyhµada» adresu servera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr "Nie je mo¾né vyhµada» názov servera"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr "Pripojenie k serveru zlyhalo"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "Chyba vstupu/výstupu lokálneho súboru"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Chyba pri nastavení vzdialeného servera do pasívneho re¾imu"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Súbor sa na serveri nenachádza"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr "Zru¹enie prebieha"
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr "Neznáma alebo neoèakávaná chyba"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
diff --git a/po/sr.po b/po/sr.po
index a796dcb0e..cc95adbf3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -3167,67 +3167,67 @@ msgstr "gre¹ka: ne mogu da otvorim %s\n"
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 #, fuzzy
 msgid "Bad server response"
 msgstr "Lo¹ odgovor FTP servera"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 #, fuzzy
 msgid "Server IO error"
 msgstr "Ulazno/izlazna FTP gre¹ka"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 #, fuzzy
 msgid "Server timeout"
 msgstr "Tajm-aut FTP servera"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "Ne mogu da odredim host adresu FTP servera"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "Ne mogu da odredim ime FTP hosta"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "Ne mogu da se pove¾em sa FTP serverom"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "Ulazno/izlazna gre¹ka kod lokalne datoteke"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Gre¹ka kod stavljanja udaljenog servera u pasivni re¾im"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "Neoèekivana ili nepoznata FTP gre¹ka"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index a8d50f199..07b34de69 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-22 16:23-0500\n"
+msgstr "POT-Creation-Date: 1999-12-23 12:49-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -3218,59 +3218,59 @@ msgstr "kan inte öppna: %s\n"
 msgid "Installing %s\n"
 msgstr ""
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 msgid "Bad server response"
 msgstr ""
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 msgid "Server IO error"
 msgstr ""
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 msgid "Server timeout"
 msgstr ""
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 msgid "Unable to lookup server host address"
 msgstr ""
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 msgid "Unable to lookup server host name"
 msgstr ""
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 msgid "Failed to connect to server"
 msgstr ""
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 msgid "Failed to establish data connection to server"
 msgstr ""
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr ""
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr ""
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr ""
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 msgid "Unknown or unexpected error"
 msgstr ""
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index d71e5b7a9..bc82eb2e6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-22 16:23-0500\n"
+"POT-Creation-Date: 1999-12-23 12:49-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3208,67 +3208,67 @@ msgstr "hata: %s eriþilemiyor\n"
 msgid "Installing %s\n"
 msgstr "%s yükleniyor\n"
 
-#: lib/rpmio.c:769
+#: lib/rpmio.c:771
 msgid "Success"
 msgstr ""
 
-#: lib/rpmio.c:772
+#: lib/rpmio.c:774
 #, fuzzy
 msgid "Bad server response"
 msgstr "FTP sunucusundan kötü yanýt"
 
-#: lib/rpmio.c:775
+#: lib/rpmio.c:777
 #, fuzzy
 msgid "Server IO error"
 msgstr "FTP I/O hatasý"
 
-#: lib/rpmio.c:778
+#: lib/rpmio.c:780
 #, fuzzy
 msgid "Server timeout"
 msgstr "FTP sunucusu zaman aþýmý"
 
-#: lib/rpmio.c:781
+#: lib/rpmio.c:783
 #, fuzzy
 msgid "Unable to lookup server host address"
 msgstr "FTP sunucusunun isim adres dönüþümü yapýlamadý"
 
-#: lib/rpmio.c:784
+#: lib/rpmio.c:786
 #, fuzzy
 msgid "Unable to lookup server host name"
 msgstr "FTP sunucusunun adres isim dönüþümü yapýlamadý"
 
-#: lib/rpmio.c:787
+#: lib/rpmio.c:789
 #, fuzzy
 msgid "Failed to connect to server"
 msgstr "FTP sunucusuna baðlanýlamadý"
 
-#: lib/rpmio.c:790
+#: lib/rpmio.c:792
 #, fuzzy
 msgid "Failed to establish data connection to server"
 msgstr "FTP sunucusu ile veri alýþveriþi yapýlamadý"
 
-#: lib/rpmio.c:793
+#: lib/rpmio.c:795
 msgid "IO error to local file"
 msgstr "Yerel dosyaya eriþim sýrasýnda I/O hatasý"
 
-#: lib/rpmio.c:796
+#: lib/rpmio.c:798
 msgid "Error setting remote server to passive mode"
 msgstr "Karþý sunucuyu pasif kipe sokam hatasý"
 
-#: lib/rpmio.c:799
+#: lib/rpmio.c:801
 msgid "File not found on server"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: lib/rpmio.c:802
+#: lib/rpmio.c:804
 msgid "Abort in progress"
 msgstr ""
 
-#: lib/rpmio.c:806
+#: lib/rpmio.c:808
 #, fuzzy
 msgid "Unknown or unexpected error"
 msgstr "FTP bilinmeyen ya da beklenmeyen hata"
 
-#: lib/rpmio.c:1339
+#: lib/rpmio.c:1341
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
diff --git a/popt/configure.in b/popt/configure.in
index d0e04ce11..400293a08 100755
--- a/popt/configure.in
+++ b/popt/configure.in
@@ -11,7 +11,7 @@ AC_PROG_CC
 AC_GCC_TRADITIONAL
 AM_C_PROTOTYPES
 
-AM_DISABLE_SHARED
+dnl AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 AC_PROG_INSTALL
diff --git a/popt/popt.spec b/popt/popt.spec
index 8adb06f6b..26106525d 100644
--- a/popt/popt.spec
+++ b/popt/popt.spec
@@ -1,6 +1,10 @@
+#
+# Note: popt is now an rpm sub-package (including libpopt.so*) so you probably
+# shouldn't need to use this spec file to package popt anymore.
+#
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.4
+Version: 1.5
 Release: 1
 Copyright: LGPL
 Group: System Environment/Libraries
diff --git a/rpm.spec b/rpm.spec
index 5409f40c6..729007a2d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.4
 Version: %{version}
-Release: 0.21
+Release: 0.23
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -10,8 +10,8 @@ Conflicts: patch < 2.5
 %ifos linux
 Prereq: gawk fileutils textutils sh-utils mktemp
 BuildRequires: bzip2 >= 0.9.0c-2
-Requires: bzip2 >= 0.9.0c-2
-#BuildRequires: python-devel >= 1.5.1
+Requires: popt, bzip2 >= 0.9.0c-2
+BuildRequires: python-devel >= 1.5.2
 %endif
 BuildRoot: /var/tmp/%{name}-root
 
@@ -26,9 +26,6 @@ the package like its version, a description, etc.
 Summary: Development files for applications which will manipulate RPM packages.
 Group: Development/Libraries
 Requires: popt
-%ifos linux
-Requires: python >= 1.5.1
-%endif
 
 %description devel
 This package contains the RPM C library and header files.  These
@@ -41,6 +38,39 @@ to function.
 This package should be installed if you want to develop programs that
 will manipulate RPM packages and databases.
 
+%ifos linux
+%package python
+Summary: Python bindings for applications which will manipulate RPM packages.
+Group: Development/Libraries
+Requires: popt
+Requires: python >= 1.5.2
+
+%description python
+This package contains the module that permits Python applications to use
+the interface supplied by RPM libraries.
+
+This package should be installed if you want to develop Python programs that
+will manipulate RPM packages and databases.
+%endif
+
+%package -n popt
+Summary: A C library for parsing command line parameters.
+Group: System Environment/Libraries
+Version: 1.5
+
+%description -n popt
+Popt is a C library for parsing command line parameters.  Popt
+was heavily influenced by the getopt() and getopt_long() functions,
+but it improves on them by allowing more powerful argument expansion.
+Popt can parse arbitrary argv[] style arrays and automatically set
+variables based on command line arguments.  Popt allows command
+line arguments to be aliased via configuration files and includes
+utility functions for parsing arbitrary strings into argv[] arrays
+using shell-like rules.
+
+Install popt if you're a C programmer and you'd like to use its
+capabilities.
+
 %prep
 %setup -q
 
@@ -80,6 +110,12 @@ fi
 %ifos linux
 %post devel -p /sbin/ldconfig
 %postun devel -p /sbin/ldconfig
+
+%post python -p /sbin/ldconfig
+%postun python -p /sbin/ldconfig
+
+%post -n popt -p /sbin/ldconfig
+%postun -n popt -p /sbin/ldconfig
 %endif
 
 %files
@@ -91,9 +127,6 @@ fi
 /usr/lib/librpm.so.*
 /usr/lib/librpmbuild.so.*
 /usr/lib/rpm
-%ifos linux
-/usr/lib/python1.5/site-packages/rpmmodule.so
-%endif
 %dir /usr/src/redhat
 %dir /usr/src/redhat/BUILD
 %dir /usr/src/redhat/SPECS
@@ -106,6 +139,12 @@ fi
 %lang(pl) /usr/man/pl/man8/*
 %lang(ru) /usr/man/ru/man8/*
 
+%ifos linux
+%files python
+%defattr(-,root,root)
+/usr/lib/python1.5/site-packages/rpmmodule.so
+%endif
+
 %files devel
 %defattr(-,root,root)
 /usr/include/rpm
@@ -115,3 +154,16 @@ fi
 /usr/lib/librpmbuild.a
 /usr/lib/librpmbuild.la
 /usr/lib/librpmbuild.so
+
+%files -n popt
+%defattr(-,root,root)
+/usr/lib/libpopt.so.*
+/usr/share/locale/*/LC_MESSAGES/popt.mo
+/usr/man/man3/popt.3
+
+# XXX These may end up in popt-devel but it hardly seems worth the effort now.
+/usr/lib/libpopt.a
+/usr/lib/libpopt.la
+/usr/lib/libpopt.so
+/usr/include/popt.h
+
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 59657c2d8..d0c5a1a0b 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -92,7 +92,6 @@ INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-LD = @LD@
 LDFLAGS_STATIC = @LDFLAGS_STATIC@
 LIBMISC = @LIBMISC@
 LIBOBJS = @LIBOBJS@
@@ -108,7 +107,6 @@ MKDIR = @MKDIR@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 PGPBIN = @PGPBIN@