- link rpm libraries together, use shared helpers with external -lelf.

- move libfmagic to librpmio.
- use libtool-1.4.3, autoconf-2.56.
- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.

CVS patchset: 5910
CVS date: 2002/12/01 18:03:22

35 files changed, 88 insertions, 59 deletions

diff --git a/CHANGES b/CHANGES
index b1d93ddf9..2bd3584f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,10 @@
 	- add -g to all platforms optflags.
 	- build with external elfutils (preferred), if available.
 	- upgrade to elfutils-0.63.
+	- link rpm libraries together, use shared helpers with external -lelf.
+	- move libfmagic to librpmio.
+	- use libtool-1.4.3, autoconf-2.56.
+	- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/Makefile.am b/Makefile.am
index d18f672a2..e5c28e96b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,17 @@ myLDADD = \
 	@INTLLIBS@ \
 	@LIBMISC@
 
+whyLDADD = \
+	$(top_builddir)/build/.libs/librpmbuild.a \
+	$(top_builddir)/lib/.libs/librpm.a \
+	$(top_builddir)/rpmdb/.libs/librpmdb.a \
+	$(top_builddir)/rpmio/.libs/librpmio.a \
+	$(top_builddir)/popt/.libs/libpopt.a \
+	@WITH_LIBELF_LIB@ \
+	@WITH_ZLIB_LIB@ \
+	@INTLLIBS@ \
+	@LIBMISC@
+
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
 rpmbin_PROGRAMS = rpm
 
@@ -61,7 +72,7 @@ noinst_HEADERS = build.h debug.h system.h
 
 rpm_SOURCES =
 rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(myLDFLAGS)
-rpm_LDADD =		rpm.o $(myLDADD)
+rpm_LDADD =		rpm.o $(whyLDADD)
 rpm.o:	rpmqv.c
 	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
 
diff --git a/autogen.sh b/autogen.sh
index 41a5a208e..3de7db2ce 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,13 +3,13 @@
 export CFLAGS
 export LDFLAGS
 
-LTV="libtoolize (GNU libtool) 1.4.2"
-ACV="autoconf (GNU Autoconf) 2.54"
+LTV="libtoolize (GNU libtool) 1.4.3"
+ACV="autoconf (GNU Autoconf) 2.56"
 AMV="automake (GNU automake) 1.6.3"
 USAGE="
 This script documents the versions of the tools I'm using to build rpm:
-	libtool-1.4.2
-	autoconf-2.54
+	libtool-1.4.3
+	autoconf-2.56
 	automake-1.6.3
 Simply edit this script to change the libtool/autoconf/automake versions
 checked if you need to, as rpm should build (and has built) with all
diff --git a/beecrypt/autogen.sh b/beecrypt/autogen.sh
index 2551c8c4c..ddf3a2883 100755
--- a/beecrypt/autogen.sh
+++ b/beecrypt/autogen.sh
@@ -3,13 +3,13 @@
 export CFLAGS
 export LDFLAGS
 
-LTV="libtoolize (GNU libtool) 1.4.2"
-ACV="autoconf (GNU Autoconf) 2.54"
+LTV="libtoolize (GNU libtool) 1.4.3"
+ACV="autoconf (GNU Autoconf) 2.56"
 AMV="automake (GNU automake) 1.6.3"
 USAGE="
 This script documents the versions of the tools I'm using to build rpm:
-	libtool-1.4.2
-	autoconf-2.54
+	libtool-1.4.3
+	autoconf-2.56
 	automake-1.6.3
 Simply edit this script to change the libtool/autoconf/automake versions
 checked if you need to, as rpm should build (and has built) with all
diff --git a/build/Makefile.am b/build/Makefile.am
index 56e65de8c..4c41bf01e 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I. \
 
 LIBS =
 
-FILELOBJS = $(shell cat $(top_builddir)/file/listobjs)
+#FILELOBJS = $(shell cat $(top_builddir)/file/listobjs)
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = argv.h rpmbuild.h rpmfc.h rpmfile.h rpmspec.h
@@ -27,26 +27,26 @@ librpmbuild_la_SOURCES = \
 	parseBuildInstallClean.c parseChangelog.c parseDescription.c \
 	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
 	parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c
-librpmbuild_la_LDFLAGS = -release @VERSION@
-librpmbuild_la_LIBADD = $(FILELOBJS)
-librpmbuild_la_DEPENDENCIES = .created
+librpmbuild_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/lib/librpm.la
+#librpmbuild_la_LIBADD = $(FILELOBJS)
+#librpmbuild_la_DEPENDENCIES = .created
 
 rpmfile.h:
 	@ln -sf $(top_builddir)/file/file.h $@
 
-$(top_builddir)/file/listobjs:
-	${MAKE} -C $(top_builddir)/file listobjs
-
-.created: rpmfile.h $(top_builddir)/file/listobjs
-	for lo in $(FILELOBJS); do \
-          [ -f $$lo ] || $(LN_S) $(top_builddir)/file/$$lo $$lo ; \
-	done
-	touch $@
+#$(top_builddir)/file/listobjs:
+#	${MAKE} -C $(top_builddir)/file listobjs
+#
+#.created: rpmfile.h $(top_builddir)/file/listobjs
+#	for lo in $(FILELOBJS); do \
+#	  [ -f $$lo ] || $(LN_S) $(top_builddir)/file/$$lo $$lo ; \
+#	done
+#	touch $@
 
 rpmfc.c: rpmfile.h
 
 clean-local:
-	 rm -f $(FILELOBJS) *.o .created rpmfile.h
+	 rm -f *.o rpmfile.h # .created $(FILELOBJS)
 
 # XXX Add internal libtool dependence
 install-data-local:
diff --git a/configure.ac b/configure.ac
index f1ec32dbf..0155857a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,7 +371,7 @@ AC_CHECK_HEADER([gelf.h], [
 	AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have the <gelf.h> header file.])
 	AC_CHECK_LIB(elf, gelf_getvernaux, [
 	    AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the `elf' library (-lelf).])
-	    WITH_LIBELF_LIB="/usr/lib/libelf.a"
+	    WITH_LIBELF_LIB="-lelf"
 	])
     ], [
 	if test -d elfutils/libelf ; then
@@ -388,7 +388,7 @@ AC_SUBST(WITH_LIBELF_LIB)
 
 WITH_LIBDWARF_INCLUDE=
 AC_CHECK_HEADER([dwarf.h], [
-	    AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
+	AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
     ], [
 	if test -d elfutils/libdwarf ; then
 	    AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
@@ -1105,6 +1105,14 @@ else
     ln -s ${srcdir}/autodeps/none ./find-requires
 fi
 
+dnl XXX hack in explicit -L/lib64 -L/usr/lib64 on x86_64
+HACK_LIBTOOLPATH=
+case "${build_cpu}" in
+x86_64*)	HACK_LIBTOOLPATH="-L/lib64 -L/usr/lib64" ;;
+esac
+AC_SUBST(HACK_LIBTOOLPATH)
+
+
 dnl Determine the canonical arch-vendor-os for the build machine
 case "${build_cpu}" in
 *86)		RPMCANONARCH=i386 ;;
diff --git a/file/autogen.sh b/file/autogen.sh
index 2551c8c4c..ddf3a2883 100755
--- a/file/autogen.sh
+++ b/file/autogen.sh
@@ -3,13 +3,13 @@
 export CFLAGS
 export LDFLAGS
 
-LTV="libtoolize (GNU libtool) 1.4.2"
-ACV="autoconf (GNU Autoconf) 2.54"
+LTV="libtoolize (GNU libtool) 1.4.3"
+ACV="autoconf (GNU Autoconf) 2.56"
 AMV="automake (GNU automake) 1.6.3"
 USAGE="
 This script documents the versions of the tools I'm using to build rpm:
-	libtool-1.4.2
-	autoconf-2.54
+	libtool-1.4.3
+	autoconf-2.56
 	automake-1.6.3
 Simply edit this script to change the libtool/autoconf/automake versions
 checked if you need to, as rpm should build (and has built) with all
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fcefb84e2..6d2ce2e2a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -39,7 +39,7 @@ librpm_la_SOURCES = \
 	rpmlead.c rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c rpmvercmp.c \
 	signature.c stringbuf.c transaction.c \
 	verify.c
-librpm_la_LDFLAGS = -release @VERSION@
+librpm_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmdb/librpmdb.la
 
 # XXX Add internal libtool dependence
 install-data-local:
diff --git a/po/cs.po b/po/cs.po
index 48935776b..0b42fc693 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 8610bc1f9..fbff232ad 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index c7b1d1322..3fda6119d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-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"
diff --git a/po/fi.po b/po/fi.po
index 49642729c..bef758b60 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
diff --git a/po/fr.po b/po/fr.po
index 24d901622..4c7856b38 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-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"
diff --git a/po/gl.po b/po/gl.po
index dcc77a831..a7cb96cdc 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/is.po b/po/is.po
index eafdf1634..fc14672e8 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/ja.po b/po/ja.po
index 1e1b59b43..30f2c7a80 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
diff --git a/po/ko.po b/po/ko.po
index 84e9421e1..663bb69ef 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 06ab95830..82d40aff4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index de4d75932..2069ec68c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-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"
diff --git a/po/pt.po b/po/pt.po
index 17e922f87..5479488e2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6e0b0e20b..c03a775e7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/ro.po b/po/ro.po
index ac85ed541..30f160e9e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index cbd3576ce..523e1be4e 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-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"
diff --git a/po/ru.po b/po/ru.po
index a49d232a4..842a11a2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 3396e09ec..ccc3b99cb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-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"
diff --git a/po/sl.po b/po/sl.po
index d6645f21c..254f65a25 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.327 2002/11/29 21:36:31 jbj Exp $
+# $Id: sl.po,v 1.328 2002/12/01 18:04:09 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index f15623d8d..56e25dfcd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sv.po b/po/sv.po
index eb4251404..48b1e2f9a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index f77cfe6c2..e52c9e25f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-11-29 16:35-0500\n"
+"POT-Creation-Date: 2002-12-01 10:35-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/python/Makefile.am b/python/Makefile.am
index 5567748ab..e4ed37c9d 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -25,7 +25,8 @@ mylibs= \
 	$(top_builddir)/lib/.libs/librpm.so \
 	$(top_builddir)/rpmdb/.libs/librpmdb.so \
 	$(top_builddir)/rpmio/.libs/librpmio.so \
-	$(top_builddir)/popt/.libs/libpopt.so
+	$(top_builddir)/popt/.libs/libpopt.so \
+	@WITH_LIBELF_LIB@
 
 LDADD =
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 826dd6f05..563445f6d 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -16,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.14
+Release: 0.15
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -496,6 +496,12 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun Dec  1 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.15
+- link rpm libraries together, use shared helpers with external -lelf.
+- move libfmagic to librpmio.
+- use libtool-1.4.3, autoconf-2.56.
+- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.
+
 * Sat Nov 30 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.14
 - upgrade to elfutils-0.63.
 
diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am
index c6026e85d..ea929b1cd 100644
--- a/rpmdb/Makefile.am
+++ b/rpmdb/Makefile.am
@@ -41,7 +41,7 @@ librpmdb_la_SOURCES = \
 	hdrNVR.c header.c header_internal.c legacy.c merge.c \
 	poptDB.c rpmhash.c rpmdb.c \
 	tagname.c tagtbl.c
-librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
+librpmdb_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la @WITH_LIBELF_LIB@ @libdb3@
 librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
 librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created
 
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 4f25b38ab..9adbf58db 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = digest.c fts.c macro.c \
 	rpmio.c rpmlog.c rpmmalloc.c \
 	rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
-librpmio_la_LDFLAGS = -release @VERSION@ @WITH_ZLIB_LIB@ -lrt -lpthread
+librpmio_la_LDFLAGS = -release @VERSION@ @HACK_LIBTOOLPATH@ $(top_builddir)/file/libfmagic.la @WITH_ZLIB_LIB@ -lrt -lpthread
 librpmio_la_LIBADD = $(BEECRYPTLOBJS)
 librpmio_la_DEPENDENCIES = .created
 
diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index ec2a96019..45ec4e4ff 100644
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -9,7 +9,6 @@
 #endif
 
 #include <rpmio_internal.h>
-#include <popt.h>
 #include "ugid.h"
 #include "debug.h"
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1ae142234..1b7ae1bca 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -42,13 +42,13 @@ debugedit_SOURCES =	debugedit.c hashtab.c
 javadeps_SOURCES =	javadeps.c
 
 rpmcache_SOURCES =	rpmcache.c
-rpmcache_LDFLAGS =	@LDFLAGS_STATIC@
+#rpmcache_LDFLAGS =	@LDFLAGS_STATIC@
 
 rpmdeps_SOURCES =	rpmdeps.c
-rpmdeps_LDFLAGS =	@LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la
+#rpmdeps_LDFLAGS =	@LDFLAGS_STATIC@ $(top_builddir)/file/libfmagic.la
 
 rpmgraph_SOURCES =	rpmgraph.c
-rpmgraph_LDFLAGS =	@LDFLAGS_STATIC@
+#rpmgraph_LDFLAGS =	@LDFLAGS_STATIC@
 
 rpminject_SOURCES =	rpminject.c
 rpminject_LDFLAGS =	@LDFLAGS_STATIC@