1 --- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200
2 +++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200
4 $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
6 tdigest_SOURCES = tdigest.c
7 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
8 +tdigest_LDADD = librpmio.la -lpopt -lgcrypt
11 tdir_LDFLAGS = -all-static
12 -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
13 +tdir_LDADD = librpmio.la -lpopt
16 tfts_LDFLAGS = -all-static
17 -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
18 +tfts_LDADD = librpmio.la -lpopt
20 tglob_SOURCES = tglob.c
21 tglob_LDFLAGS = -all-static
22 -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
23 +tglob_LDADD = librpmio.la -lpopt
26 tinv_LDFLAGS = -all-static
27 -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
28 +tinv_LDADD = librpmio.la -lpopt
31 tkey_LDFLAGS = -all-static
32 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
33 +tkey_LDADD = librpmio.la -lpopt
35 tring_SOURCES = tring.c
36 tring_LDFLAGS = -all-static
37 -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
38 +tring_LDADD = librpmio.la -lpopt
40 trpmio_SOURCES = trpmio.c
41 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
42 +trpmio_LDADD = librpmio.la -lpopt
45 tsw_LDFLAGS = librpmio.la
46 --- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200
47 +++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200
50 librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
51 $(top_builddir)/rpmio/librpmio.la \
52 - $(top_builddir)/popt/libpopt.la \
56 librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
57 --- rpm-4.3/lib/Makefile.am.wiget 2003-05-23 16:59:36.000000000 +0200
58 +++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200
60 librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
61 $(top_builddir)/rpmdb/librpmdb.la \
62 $(top_builddir)/rpmio/librpmio.la \
63 - $(top_builddir)/popt/libpopt.la
67 @echo expect 10 shift/reduce conflicts
68 --- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200
69 +++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200
72 debugedit_SOURCES = debugedit.c hashtab.c
73 debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
74 - $(top_builddir)/popt/libpopt.la
77 javadeps_SOURCES = javadeps.c
79 --- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200
80 +++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200
82 AC_SUBST(WITH_BEECRYPT_INCLUDE)
83 AC_SUBST(WITH_BEECRYPT_LIB)
87 +AC_CHECK_HEADERS([popt.h])
88 +AC_CHECK_LIB(popt, poptGetContext, [
89 + AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
90 + WITH_POPT_LIB="-lpopt"
91 + ],[WITH_POPT_SUBDIR="popt"
92 + WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
94 +AC_SUBST(WITH_POPT_SUBDIR)
95 +AC_SUBST(WITH_POPT_LIB)
96 AC_CHECK_FUNC(setreuid, [], [
97 AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
101 dnl Check for Berkeley db3 API.
102 AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
103 + AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
104 AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
105 AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
106 AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
114 if test X"$DBLIBSRCS" = X; then
115 @@ -1257,7 +1270,7 @@
116 dnl # XXX Propagate -lucb to popt ...
117 dnl export LIBS INCPATH CONFIG_SITE
119 -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
120 +AC_CONFIG_SUBDIRS(beecrypt file)
122 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
123 scripts/perl.req scripts/perl.prov
124 @@ -1281,7 +1294,7 @@
125 python/rpmdb/test/Makefile
127 python/mpw/test/Makefile
128 - ], [ echo timestamp > popt/stamp-h.in
130 echo timestamp > beecrypt/stamp-h.in
131 echo timestamp > stamp-h.in
133 --- rpm-4.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200
134 +++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +0200
136 po/*.in po/*.po po/rpm.pot \
137 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
139 -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
140 +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
143 -I$(top_srcdir)/build \
145 $(top_builddir)/lib/librpm.la \
146 $(top_builddir)/rpmdb/librpmdb.la \
147 $(top_builddir)/rpmio/librpmio.la \
148 - $(top_builddir)/popt/libpopt.la \
154 -load lib/rpmlib.lcd \
155 -load rpmdb/rpmdb.lcd \
156 -load rpmio/rpmio.lcd \
157 - -load popt/popt.lcd \
158 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)