1 --- rpm-4.1/configure.ac.nointernallib Thu Sep 19 04:02:42 2002
2 +++ rpm-4.1/configure.ac Thu Sep 19 04:03:04 2002
4 dnl # XXX Propagate -lucb to popt ...
5 dnl export LIBS INCPATH CONFIG_SITE
7 -AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
8 +AC_CONFIG_SUBDIRS(beecrypt)
10 AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec m4/Makefile
11 macros.perl scripts/perl.req scripts/perl.prov
12 --- rpm-4.1/Makefile.am.nointernallib Thu Sep 19 04:03:19 2002
13 +++ rpm-4.1/Makefile.am Thu Sep 19 04:04:00 2002
15 po/*.in po/*.po po/rpm.pot \
16 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
18 -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ libelf @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
19 +SUBDIRS = intl po beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
22 -I$(top_srcdir)/build \
24 $(top_builddir)/lib/librpm.la \
25 $(top_builddir)/rpmdb/librpmdb.la \
26 $(top_builddir)/rpmio/librpmio.la \
27 - $(top_builddir)/popt/libpopt.la \
33 -load lib/rpmlib.lcd \
34 -load rpmdb/rpmdb.lcd \
35 -load rpmio/rpmio.lcd \
36 - -load popt/popt.lcd \
37 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
41 `make -s sources -C lib` \
42 `make -s sources -C rpmdb` \
43 `make -s sources -C rpmio` \
44 - `make -s sources -C beecrypt` \
45 - `make -s sources -C popt`
46 + `make -s sources -C beecrypt`
48 CVSTAG = r$(subst .,-,$(VERSION))
50 --- rpm-4.1/python/Makefile.am~ Fri Oct 18 08:38:02 2002
51 +++ rpm-4.1/python/Makefile.am Fri Oct 18 08:55:34 2002
53 $(top_builddir)/lib/.libs/librpm.so \
54 $(top_builddir)/rpmdb/.libs/librpmdb.so \
55 $(top_builddir)/rpmio/.libs/librpmio.so \
56 - $(top_builddir)/popt/.libs/libpopt.so
61 --- rpm-4.1/rpmio/Makefile.am~ Fri Oct 18 08:38:02 2002
62 +++ rpm-4.1/rpmio/Makefile.am Fri Oct 18 10:43:29 2002
64 lclint $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
66 tdigest_SOURCES = tdigest.c
67 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
68 +tdigest_LDADD = librpmio.la -lpopt
71 tdir_LDFLAGS = -all-static
72 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
73 +tdir_LDADD = librpmio.la -lpopt
76 tfts_LDFLAGS = -all-static
77 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
78 +tfts_LDADD = librpmio.la -lpopt
80 tglob_SOURCES = tglob.c
81 tglob_LDFLAGS = -all-static
82 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
83 +tglob_LDADD = librpmio.la -lpopt
86 tinv_LDFLAGS = -all-static
87 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
88 +tinv_LDADD = librpmio.la -lpopt
91 tkey_LDFLAGS = -all-static
92 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
93 +tkey_LDADD = librpmio.la -lpopt
95 tring_SOURCES = tring.c
96 tring_LDFLAGS = -all-static
97 -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
98 +tring_LDADD = librpmio.la -lpopt
100 trpmio_SOURCES = trpmio.c
101 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
102 +trpmio_LDADD = librpmio.la -lpopt
104 dumpasn1_SOURCES = dumpasn1.c
106 --- rpm-4.1/tools/Makefile.am~ Thu Aug 22 19:42:37 2002
107 +++ rpm-4.1/tools/Makefile.am Fri Oct 18 11:12:37 2002
109 $(top_builddir)/lib/librpm.la \
110 $(top_builddir)/rpmdb/librpmdb.la \
111 $(top_builddir)/rpmio/librpmio.la \
112 - $(top_builddir)/popt/libpopt.la \