Link rpmcache/rpmgraph statically for now.

CVS patchset: 5909
CVS date: 2002/11/30 22:49:10

diff --git a/rpm.spec.in b/rpm.spec.in
index dd69cd3..826dd6f 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -27,8 +27,8 @@ Prereq: gawk fileutils textutils mktemp shadow-utils
 Requires: popt = 1.8
 Obsoletes: rpm-perl < %{version}
 
-# XXX not really necessary with internal elfutils
-BuildRequires: elfutils
+# XXX necessary only to drag in /usr/lib/libelf.a
+BuildRequires: elfutils-devel >= 0.63
 
 %if !%{with_internal_db}
 BuildRequires: db3-devel

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 525131f..1ae1422 100644 (file)
--- 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
 
 rpmgraph_SOURCES =     rpmgraph.c
-#rpmgraph_LDFLAGS =    @LDFLAGS_STATIC@
+rpmgraph_LDFLAGS =     @LDFLAGS_STATIC@
 
 rpminject_SOURCES =    rpminject.c
 rpminject_LDFLAGS =    @LDFLAGS_STATIC@