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 diff -urN rpm.org/Makefile.am rpm/Makefile.am
23 --- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200
24 +++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200
26 -load lib/rpmlib.lcd \
27 -load rpmdb/rpmdb.lcd \
28 -load rpmio/rpmio.lcd \
29 - -load popt/popt.lcd \
30 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
33 --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100
34 +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100
38 tdir_LDFLAGS = @LDFLAGS_STATIC@
39 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
40 +tdir_LDADD = librpmio.la -lpopt
43 tfts_LDFLAGS = @LDFLAGS_STATIC@
44 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
45 +tfts_LDADD = librpmio.la -lpopt
48 tget_LDFLAGS = @LDFLAGS_STATIC@
49 -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
50 +tget_LDADD = librpmio.la -lpopt
53 thkp_LDFLAGS = @LDFLAGS_STATIC@
54 -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
55 +thkp_LDADD = librpmio.la -lpopt
58 tput_LDFLAGS = @LDFLAGS_STATIC@
59 -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
60 +tput_LDADD = librpmio.la -lpopt
63 tglob_SOURCES = tglob.c
64 tglob_LDFLAGS = @LDFLAGS_STATIC@
65 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
66 +tglob_LDADD = librpmio.la -lpopt
69 tinv_LDFLAGS = @LDFLAGS_STATIC@
70 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
71 +tinv_LDADD = librpmio.la -lpopt
74 tkey_LDFLAGS = @LDFLAGS_STATIC@
75 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
76 +tkey_LDADD = librpmio.la -lpopt
78 trpmio_SOURCES = trpmio.c
79 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
80 +trpmio_LDADD = librpmio.la -lpopt
83 tsw_LDFLAGS = librpmio.la