---- rpm-4.2/rpmio/Makefile.am.wiget Thu Mar 27 23:16:15 2003
-+++ rpm-4.2/rpmio/Makefile.am Thu Mar 27 23:16:15 2003
-@@ -70,34 +70,34 @@
+--- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -65,34 +65,34 @@
$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
tdigest_SOURCES = tdigest.c
--tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD = librpmio.la -lpopt
+-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
++tdigest_LDADD = librpmio.la -lpopt -lgcrypt
tdir_SOURCES = tdir.c
tdir_LDFLAGS = -all-static
-trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+trpmio_LDADD = librpmio.la -lpopt
- dumpasn1_SOURCES = dumpasn1.c
+ tsw_SOURCES = tsw.c
+ tsw_LDFLAGS = librpmio.la
+--- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200
++++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -49,7 +49,7 @@
+ tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la \
++ @WITH_POPT_LIB@ \
+ @WITH_LIBELF_LIB@ \
+ @libdb3@
+ librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
+--- rpm-4.3/lib/Makefile.am.wiget 2003-05-23 16:59:36.000000000 +0200
++++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
+ librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
+ $(top_builddir)/rpmdb/librpmdb.la \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la
++ @WITH_POPT_LIB@
-
---- rpm-4.2/tools/Makefile.am.wiget Fri Mar 7 19:21:19 2003
-+++ rpm-4.2/tools/Makefile.am Thu Mar 27 23:23:19 2003
-@@ -37,7 +37,7 @@
+ getdate.c: getdate.y
+ @echo expect 10 shift/reduce conflicts
+--- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200
++++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200
+@@ -40,7 +40,7 @@
debugedit_SOURCES = debugedit.c hashtab.c
debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
javadeps_SOURCES = javadeps.c
---- rpm-4.2/configure.ac.wiget Thu Mar 27 23:16:15 2003
-+++ rpm-4.2/configure.ac Thu Mar 27 23:58:46 2003
-@@ -407,6 +407,17 @@
- ])
- AC_SUBST(WITH_LIBDWARF_INCLUDE)
+--- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200
++++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200
+@@ -431,6 +431,17 @@
+ AC_SUBST(WITH_BEECRYPT_INCLUDE)
+ AC_SUBST(WITH_BEECRYPT_LIB)
+WITH_POPT_SUBDIR=
+WITH_POPT_LIB=
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
-@@ -465,6 +474,7 @@
+@@ -491,6 +502,7 @@
dnl Check for Berkeley db3 API.
AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
-@@ -473,6 +483,7 @@
+@@ -499,6 +511,7 @@
)
)
)
)
if test X"$DBLIBSRCS" = X; then
-@@ -1226,7 +1237,7 @@
+@@ -1257,7 +1270,7 @@
dnl # XXX Propagate -lucb to popt ...
dnl export LIBS INCPATH CONFIG_SITE
+AC_CONFIG_SUBDIRS(beecrypt file)
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- macros.perl scripts/perl.req scripts/perl.prov
-@@ -1248,7 +1259,7 @@
- python/Makefile
- python/rpmdb/Makefile
- python/test/Makefile
+ scripts/perl.req scripts/perl.prov
+@@ -1281,7 +1294,7 @@
+ python/rpmdb/test/Makefile
+ python/mpw/Makefile
+ python/mpw/test/Makefile
- ], [ echo timestamp > popt/stamp-h.in
+ ], [
echo timestamp > beecrypt/stamp-h.in
echo timestamp > stamp-h.in
]
---- rpm-4.2/Makefile.am.wiget Mon Mar 10 20:35:20 2003
-+++ rpm-4.2/Makefile.am Thu Mar 27 23:50:55 2003
+--- rpm-4.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200
++++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +0200
@@ -14,7 +14,7 @@
po/*.in po/*.po po/rpm.pot \
rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+-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 .
++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 .
INCLUDES = \
-I$(top_srcdir)/build \
$(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
.PHONY: lint
---- rpm-4.2/rpmdb/Makefile.am.syslib Fri Mar 28 00:45:58 2003
-+++ rpm-4.2/rpmdb/Makefile.am Fri Mar 28 00:48:00 2003
-@@ -49,7 +49,7 @@
- tagname.c tagtbl.c
- librpmdb_la_LDFLAGS = -release @VERSION@ \
- $(top_builddir)/rpmio/librpmio.la \
-- $(top_builddir)/popt/libpopt.la \
-+ @WITH_POPT_LIB@ \
- @WITH_LIBELF_LIB@ \
- @libdb3@
- librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
---- rpm-4.2/lib/Makefile.am.wiget Fri Mar 28 01:31:52 2003
-+++ rpm-4.2/lib/Makefile.am Fri Mar 28 01:32:37 2003
-@@ -39,7 +39,7 @@
- librpm_la_LDFLAGS = -release @VERSION@ \
- $(top_builddir)/rpmdb/librpmdb.la \
- $(top_builddir)/rpmio/librpmio.la \
-- $(top_builddir)/popt/libpopt.la
-+ @WITH_POPT_LIB@
-
- getdate.c: getdate.y
- @echo expect 10 shift/reduce conflicts