1 --- rpm-4.5/configure.ac~ 2008-04-13 03:20:07.000000000 +0300
2 +++ rpm-4.5/configure.ac 2008-04-13 03:23:45.011443406 +0300
4 dnl # XXX Propagate -lucb to popt ...
5 dnl export LIBS INCPATH CONFIG_SITE
7 -AC_CONFIG_SUBDIRS(popt zlib file sqlite db3)
8 +AC_CONFIG_SUBDIRS(file db3)
10 AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
11 scripts/perl.req scripts/perl.prov
15 AC_CONFIG_COMMANDS([default],[[
16 - [ -d popt ] && echo timestamp > popt/stamp-h.in
17 echo timestamp > stamp-h.in
18 [ -d perl ] && cd perl && perl Makefile.PL INSTALLDIRS=vendor
20 --- rpm-4.5/Makefile.am~ 2008-04-13 03:20:07.000000000 +0300
21 +++ rpm-4.5/Makefile.am 2008-04-13 03:24:33.962259478 +0300
23 -load lib/rpmlib.lcd \
24 -load rpmdb/rpmdb.lcd \
25 -load rpmio/rpmio.lcd \
26 - -load popt/popt.lcd \
27 $(DEFS) $(INCLUDES) rpmqv.c $(rpmbuild_SOURCES)
30 --- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100
31 +++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100
35 tdir_LDFLAGS = @LDFLAGS_STATIC@
36 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
37 +tdir_LDADD = librpmio.la -lpopt
40 tfts_LDFLAGS = @LDFLAGS_STATIC@
41 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
42 +tfts_LDADD = librpmio.la -lpopt
45 tget_LDFLAGS = @LDFLAGS_STATIC@
46 -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
47 +tget_LDADD = librpmio.la -lpopt
50 thkp_LDFLAGS = @LDFLAGS_STATIC@
51 -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
52 +thkp_LDADD = librpmio.la -lpopt
55 tput_LDFLAGS = @LDFLAGS_STATIC@
56 -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
57 +tput_LDADD = librpmio.la -lpopt
60 tglob_SOURCES = tglob.c
61 tglob_LDFLAGS = @LDFLAGS_STATIC@
62 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
63 +tglob_LDADD = librpmio.la -lpopt
66 tinv_LDFLAGS = @LDFLAGS_STATIC@
67 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
68 +tinv_LDADD = librpmio.la -lpopt
71 tkey_LDFLAGS = @LDFLAGS_STATIC@
72 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
73 +tkey_LDADD = librpmio.la -lpopt
75 trpmio_SOURCES = trpmio.c
76 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
77 +trpmio_LDADD = librpmio.la -lpopt
80 tsw_LDFLAGS = librpmio.la