1 diff -urN rpm.org/configure.ac rpm/configure.ac
2 --- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200
3 +++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200
5 dnl # XXX Propagate -lucb to popt ...
6 dnl export LIBS INCPATH CONFIG_SITE
8 -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3)
9 +AC_CONFIG_SUBDIRS(file)
11 AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
12 scripts/perl.req scripts/perl.prov
14 python/rpmdb/test/Makefile
17 -AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in
18 +AC_CONFIG_COMMANDS([default],[[
19 echo timestamp > stamp-h.in
22 --- rpm-4.4.2/lib/Makefile.am.orig 2005-02-17 01:14:40.000000000 +0100
23 +++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:32:57.886832096 +0200
25 $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
27 $(top_builddir)/rpmio/librpmio.la \
28 - $(top_builddir)/popt/libpopt.la
32 # $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
34 tthread: tthread.o librpm.la
35 $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@
37 -tsystem: tsystem.o $(top_builddir)/popt/libpopt.la
38 - $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
40 + $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt
43 $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
44 diff -urN rpm.org/Makefile.am rpm/Makefile.am
45 --- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200
46 +++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200
48 -load lib/rpmlib.lcd \
49 -load rpmdb/rpmdb.lcd \
50 -load rpmio/rpmio.lcd \
51 - -load popt/popt.lcd \
52 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
55 --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100
56 +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100
58 tax_LDADD = librpmio.la
60 tdigest_SOURCES = tdigest.c
61 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
62 +tdigest_LDADD = librpmio.la -lpopt -lgcrypt
65 tdir_LDFLAGS = @LDFLAGS_STATIC@
66 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
67 +tdir_LDADD = librpmio.la -lpopt
70 tfts_LDFLAGS = @LDFLAGS_STATIC@
71 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
72 +tfts_LDADD = librpmio.la -lpopt
75 tget_LDFLAGS = @LDFLAGS_STATIC@
76 -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
77 +tget_LDADD = librpmio.la -lpopt
80 thkp_LDFLAGS = @LDFLAGS_STATIC@
81 -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
82 +thkp_LDADD = librpmio.la -lpopt
85 tput_LDFLAGS = @LDFLAGS_STATIC@
86 -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
87 +tput_LDADD = librpmio.la -lpopt
90 tglob_SOURCES = tglob.c
91 tglob_LDFLAGS = @LDFLAGS_STATIC@
92 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
93 +tglob_LDADD = librpmio.la -lpopt
96 tinv_LDFLAGS = @LDFLAGS_STATIC@
97 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
98 +tinv_LDADD = librpmio.la -lpopt
100 tkey_SOURCES = tkey.c
101 tkey_LDFLAGS = @LDFLAGS_STATIC@
102 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
103 +tkey_LDADD = librpmio.la -lpopt
105 tring_SOURCES = tring.c
106 tring_LDFLAGS = @LDFLAGS_STATIC@
107 -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
108 +tring_LDADD = librpmio.la -lpopt
110 trpmio_SOURCES = trpmio.c
111 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
112 +trpmio_LDADD = librpmio.la -lpopt
115 tsw_LDFLAGS = librpmio.la