---- 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)
+diff -urN rpm.org/configure.ac rpm/configure.ac
+--- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200
++++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200
+@@ -1203,7 +1215,7 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+
+-AC_CONFIG_SUBDIRS(popt zlib file sqlite db3)
++AC_CONFIG_SUBDIRS(file)
+
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+ scripts/perl.req scripts/perl.prov
+@@ -1227,7 +1239,7 @@
+ python/rpmdb/test/Makefile
+ lua/Makefile
+ ])
+-AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in
++AC_CONFIG_COMMANDS([default],[[
+ echo timestamp > stamp-h.in
+
+ ]],[[]])
+--- rpm-4.4.2/lib/Makefile.am.orig 2005-02-17 01:14:40.000000000 +0100
++++ rpm-4.4.2/lib/Makefile.am 2005-07-23 13:32:57.886832096 +0200
+@@ -98,7 +98,7 @@
+ $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
+ -lselinux \
+ $(top_builddir)/rpmio/librpmio.la \
+- $(top_builddir)/popt/libpopt.la
++ -lpopt
+
+ #tds: tds.c librpm.la
+ # $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
+@@ -109,8 +109,8 @@
+ tthread: tthread.o librpm.la
+ $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@
+
+-tsystem: tsystem.o $(top_builddir)/popt/libpopt.la
+- $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
++tsystem: tsystem.o
++ $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt
+
+ tre: tre.o librpm.la
+ $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
+diff -urN rpm.org/Makefile.am rpm/Makefile.am
+--- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200
++++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200
+@@ -107,7 +106,6 @@
+ -load lib/rpmlib.lcd \
+ -load rpmdb/rpmdb.lcd \
+ -load rpmio/rpmio.lcd \
+- -load popt/popt.lcd \
+ $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
+
+ .PHONY: lint
+--- rpm.org/rpmio/Makefile.am.org 2004-11-18 17:42:53.756263795 +0100
++++ rpm.org/rpmio/Makefile.am 2004-11-18 17:43:09.526885309 +0100
+@@ -71,47 +71,47 @@
+ tax_LDADD = librpmio.la
tdigest_SOURCES = tdigest.c
-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
+tdigest_LDADD = librpmio.la -lpopt -lgcrypt
tdir_SOURCES = tdir.c
- tdir_LDFLAGS = -all-static
+ tdir_LDFLAGS = @LDFLAGS_STATIC@
-tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tdir_LDADD = librpmio.la -lpopt
tfts_SOURCES = tfts.c
- tfts_LDFLAGS = -all-static
+ tfts_LDFLAGS = @LDFLAGS_STATIC@
-tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tfts_LDADD = librpmio.la -lpopt
+ tget_SOURCES = tget.c
+ tget_LDFLAGS = @LDFLAGS_STATIC@
+-tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tget_LDADD = librpmio.la -lpopt
+
+ thkp_SOURCES = thkp.c
+ thkp_LDFLAGS = @LDFLAGS_STATIC@
+-thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++thkp_LDADD = librpmio.la -lpopt
+
+ tput_SOURCES = tput.c
+ tput_LDFLAGS = @LDFLAGS_STATIC@
+-tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
++tput_LDADD = librpmio.la -lpopt
+
+
tglob_SOURCES = tglob.c
- tglob_LDFLAGS = -all-static
+ tglob_LDFLAGS = @LDFLAGS_STATIC@
-tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tglob_LDADD = librpmio.la -lpopt
tinv_SOURCES = tinv.c
- tinv_LDFLAGS = -all-static
+ tinv_LDFLAGS = @LDFLAGS_STATIC@
-tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tinv_LDADD = librpmio.la -lpopt
tkey_SOURCES = tkey.c
- tkey_LDFLAGS = -all-static
+ tkey_LDFLAGS = @LDFLAGS_STATIC@
-tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tkey_LDADD = librpmio.la -lpopt
tring_SOURCES = tring.c
- tring_LDFLAGS = -all-static
+ tring_LDFLAGS = @LDFLAGS_STATIC@
-tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tring_LDADD = librpmio.la -lpopt
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@
-
- 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@ \
-- $(top_builddir)/popt/libpopt.la
-+ -lpopt
-
- javadeps_SOURCES = javadeps.c
-
---- 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_HEADERS([popt.h])
-+AC_CHECK_LIB(popt, poptGetContext, [
-+ AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
-+ WITH_POPT_LIB="-lpopt"
-+ ],[WITH_POPT_SUBDIR="popt"
-+ WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
-+
-+AC_SUBST(WITH_POPT_SUBDIR)
-+AC_SUBST(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])
- ])
-@@ -491,6 +502,7 @@
-
- dnl Check for Berkeley db3 API.
- AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
-+ AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
- 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"],
-@@ -499,6 +511,7 @@
- )
- )
- )
-+ )
- )
-
- if test X"$DBLIBSRCS" = X; then
-@@ -1257,7 +1270,7 @@
- dnl # XXX Propagate -lucb to popt ...
- dnl export LIBS INCPATH CONFIG_SITE
-
--AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
-+AC_CONFIG_SUBDIRS(beecrypt file)
-
- AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- 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.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 @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 \
-@@ -34,7 +34,7 @@
- $(top_builddir)/lib/librpm.la \
- $(top_builddir)/rpmdb/librpmdb.la \
- $(top_builddir)/rpmio/librpmio.la \
-- $(top_builddir)/popt/libpopt.la \
-+ -lpopt \
- @WITH_ZLIB_LIB@ \
- @INTLLIBS@ \
- @LIBMISC@
-@@ -105,7 +105,6 @@
- -load lib/rpmlib.lcd \
- -load rpmdb/rpmdb.lcd \
- -load rpmio/rpmio.lcd \
-- -load popt/popt.lcd \
- $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
-
- .PHONY: lint
projects / packages / rpm.git / blobdiff