- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19.

CVS patchset: 5950
CVS date: 2002/12/19 23:41:52

28 files changed, 70 insertions, 59 deletions

diff --git a/CHANGES b/CHANGES
index 2cf6638e5..cba246e76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -57,6 +57,9 @@
 	- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
 	- popt aliases for -U et al to achieve dynamic link with nptl.
 	- add --file{class,provide,require} popt aliases and header extensions.
+	- statically link against /usr/lib/nptl/libpthread.a, if present.
+	- remove popt aliases for -U et al.
+	- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/Makefile.am b/Makefile.am
index e5c28e96b..07ebe952f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,13 +26,13 @@ INCLUDES = \
 	@WITH_LIBELF_INCLUDE@ \
 	@INCPATH@
 
-myLDFLAGS = # @LDFLAGS_STATIC@
+staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+myLDFLAGS = # $(staticLDFLAGS)
 
 # XXX libtool can/should generate dependent libs.
 # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
 # XXX top_builddir ldpaths are wrong building in tree
 myLDADD = \
-	$(top_builddir)/build/librpmbuild.la \
 	$(top_builddir)/lib/librpm.la \
 	$(top_builddir)/rpmdb/librpmdb.la \
 	$(top_builddir)/rpmio/librpmio.la \
@@ -43,7 +43,6 @@ myLDADD = \
 	@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 \
@@ -71,18 +70,14 @@ rpmpopt-$(VERSION): rpmpopt
 noinst_HEADERS = build.h debug.h system.h
 
 rpm_SOURCES =
-rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(myLDFLAGS)
-rpm_LDADD =		rpm.o $(whyLDADD)
+rpm_LDFLAGS =		$(staticLDFLAGS)
+rpm_LDADD =		rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(whyLDADD)
 rpm.o:	rpmqv.c
 	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c rpmqv.c
 
-#rpm_SOURCES =		rpm.c
-#rpm_LDFLAGS =		@LDFLAGS_STATIC@ $(myLDFLAGS)
-#rpm_LDADD =		$(myLDADD)
-
 rpmb_SOURCES =		build.c
 rpmb_LDFLAGS =		$(myLDFLAGS)
-rpmb_LDADD =		rpmb.o $(myLDADD)
+rpmb_LDADD =		rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
 rpmb.o:	rpmqv.c
 	$(COMPILE) -DIAM_RPMBT -o $@ -c rpmqv.c
 
@@ -106,7 +101,7 @@ rpmk.o:	rpmqv.c
 
 rpmq_SOURCES =
 rpmq_LDFLAGS =		$(myLDFLAGS)
-rpmq_LDADD =		rpmq.o $(myLDADD)
+rpmq_LDADD =		rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
 rpmq.o:	rpmqv.c
 	$(COMPILE) -DIAM_RPMQV -o $@ -c rpmqv.c
 
diff --git a/configure.ac b/configure.ac
index 7e530a9cc..69f192d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,16 @@ AC_MSG_RESULT($LDFLAGS_STATIC)
 AC_SUBST(LDFLAGS_STATIC)
 
 dnl
+dnl XXX Test for libpthread.a that is NPTL aware.
+dnl
+LDFLAGS_NPTL=
+if test -f /usr/lib/nptl/libpthread.a ; then
+    LDFLAGS_NPTL="-L/usr/lib/nptl"
+    INCPATH="$INCPATH -I/usr/include/nptl"
+fi
+AC_SUBST(LDFLAGS_NPTL)
+
+dnl
 dnl look for POSIX chmod attributes
 dnl
 AC_MSG_CHECKING(POSIX chmod)
diff --git a/po/cs.po b/po/cs.po
index baabe4972..bf0a328e5 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 c8d747b18..5402bb829 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 799abd739..4665265c6 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 474d63eee..13e434629 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 7868c8342..212da1a02 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 c964a8e9a..0c33707b4 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 1c9497a7d..e836b661f 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 8f59d11aa..cd1910163 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 31ef6c83c..0e204f557 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 128c93c4e..6021480c1 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 7d26b90f7..0c0e3af86 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 cb9ed9305..be963cecd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 989dda2f1..acd641838 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 f7e1edda3..53b75a98c 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 d793025fa..3a823a987 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 698f30c21..5f5350aa3 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 f7bed2a25..64e73e9be 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 d785eeaff..547acfd51 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.338 2002/12/18 23:00:36 jbj Exp $
+# $Id: sl.po,v 1.339 2002/12/19 23:42:37 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 2917cfc27..eefe5bdcd 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 91efc70ac..d2845ef12 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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 eb57e3c02..7ea613703 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-12-18 17:59-0500\n"
+"POT-Creation-Date: 2002-12-19 18:36-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/rpm.spec.in b/rpm.spec.in
index 519bce99a..881fb10a7 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -2,7 +2,6 @@
 %define	with_python_version	@WITH_PYTHON_VERSION@%{nil}
 %define	with_bzip2		@WITH_BZIP2@%{nil}
 %define	with_apidocs		@WITH_APIDOCS@%{nil}
-%define with_internal_db	@WITH_INTERNAL_DB@%{nil}
 
 # XXX legacy requires './' payload prefix to be omitted from rpm packages.
 %define	_noPayloadPrefix	1
@@ -17,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.29nptl
+Release: 0.31
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -28,17 +27,14 @@ Prereq: gawk fileutils textutils mktemp shadow-utils
 Requires: popt = 1.8
 Obsoletes: rpm-perl < %{version}
 
-# XXX necessary only to drag in /usr/lib/libelf.a
-BuildRequires: elfutils-devel >= 0.63
+# XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal elfutils.
+BuildRequires: elfutils-libelf
 
-%if !%{with_internal_db}
-BuildRequires: db3-devel
-%endif
-
-# XXX /dev/futex support needed:
+# XXX /dev/futex kernel support needed:
+Conflicts: kernel <= 2.4.19
 Requires: kernel >= 2.4.20-0.pp.9
 
-# XXX NPTL support needed.
+# XXX NPTL glibc support needed.
 Requires: glibc >= 2.3.1-16nptl
 
 BuildRequires: zlib-devel
@@ -461,9 +457,14 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Thu Dec 19 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.31
+- statically link against /usr/lib/nptl/libpthread.a, if present.
+- remove popt aliases for -U et al.
+- add -I/usr/include/nptl, Conflicts: kernel <= 2.4.19.
+
 * Wed Dec 18 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.29nptl
 - popt aliases for -U et al to achieve dynamic link with nptl.
-- add --file{class,provide,require} popt aliases and header extensions
+- add --file{class,provide,require} popt aliases and header extensions.
 
 * Tue Dec 17 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.28nptl
 - re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
diff --git a/rpmpopt.in b/rpmpopt.in
index adbcaad76..f9bc8afcd 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -187,14 +187,14 @@ rpm	exec -V			rpmv -V
 rpm	exec -y			rpmv -y
 rpm	exec --verify		rpmv --verify
 
-rpm	exec -i			rpmi -i
-rpm	exec --install		rpmi --install
-rpm	exec -U			rpmi -U
-rpm	exec --upgrade		rpmi --upgrade
-rpm	exec -F			rpmi -F
-rpm	exec --freshen		rpmi --freshen
-rpm	exec -e			rpmi -e
-rpm	exec --erase		rpmi --erase
+#rpm	exec -i			rpmi -i
+#rpm	exec --install		rpmi --install
+#rpm	exec -U			rpmi -U
+#rpm	exec --upgrade		rpmi --upgrade
+#rpm	exec -F			rpmi -F
+#rpm	exec --freshen		rpmi --freshen
+#rpm	exec -e			rpmi -e
+#rpm	exec --erase		rpmi --erase
 
 rpm	alias --with		--define "_with_!#:+       --with-!#:+" \
 	--POPTdesc=$"enable configure <option> for build" \
diff --git a/rpmqv.c b/rpmqv.c
index 6e42bfb11..95c4158db 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -263,13 +263,13 @@ int main(int argc, const char ** argv)
     default:
 	break;
     }
-#endif
 
     /* XXX Eliminate query linkage loop */
     /*@-type@*/	/* FIX: casts? */
     parseSpecVec = parseSpec;
     freeSpecVec = freeSpec;
     /*@=type@*/
+#endif
 
 #if defined(ENABLE_NLS)
     /* set up the correct locale */
@@ -876,7 +876,6 @@ exit:
     }
 
     /* keeps memory leak checkers quiet */
-    freeNames();
     freeFilesystems();
 /*@i@*/	urlFreeCache();
     rpmlogClose();
@@ -887,6 +886,7 @@ exit:
 #endif
 
 #ifdef	IAM_RPMBT
+    freeNames();
     ba->buildRootOverride = _free(ba->buildRootOverride);
     ba->targets = _free(ba->targets);
 #endif
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5c0cfbad4..4ff28ef89 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,6 +23,8 @@ LDADD = \
 	$(top_builddir)/lib/librpm.la \
 	@INTLLIBS@
 
+staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
+
 noinst_PROGRAMS = \
 	convertdb1 dump dumpdb rpmarchive rpmheader rpmlead rpmsignature
 
@@ -38,19 +40,19 @@ debugedit_SOURCES =	debugedit.c hashtab.c
 javadeps_SOURCES =	javadeps.c
 
 rpmcache_SOURCES =	rpmcache.c
-#rpmcache_LDFLAGS =	@LDFLAGS_STATIC@
+#rpmcache_LDFLAGS =	$(staticLDFLAGS)
 
 rpmdeps_SOURCES =	rpmdeps.c
 rpmdeps_LDADD =		$(top_builddir)/build/librpmbuild.la
-#rpmdeps_LDFLAGS =	@LDFLAGS_STATIC@
+#rpmdeps_LDFLAGS =	$(staticLDFLAGS)
 
 rpmgraph_SOURCES =	rpmgraph.c
-#rpmgraph_LDFLAGS =	@LDFLAGS_STATIC@
+#rpmgraph_LDFLAGS =	$(staticLDFLAGS)
 
 rpminject_SOURCES =	rpminject.c
-rpminject_LDFLAGS =	@LDFLAGS_STATIC@
+rpminject_LDFLAGS =	$(staticLDFLAGS)
 
 rpmsort_SOURCES =	rpmsort.c
-rpmsort_LDFLAGS =	@LDFLAGS_STATIC@
+rpmsort_LDFLAGS =	$(staticLDFLAGS)
 
 $(PROGRAMS): $(LDADD)