1 --- rpm-4.2/rpmio/Makefile.am.wiget Thu Mar 27 23:16:15 2003
2 +++ rpm-4.2/rpmio/Makefile.am Thu Mar 27 23:16:15 2003
4 $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
6 tdigest_SOURCES = tdigest.c
7 -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
8 +tdigest_LDADD = librpmio.la -lpopt
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
44 dumpasn1_SOURCES = dumpasn1.c
46 --- rpm-4.2/python/Makefile.am.wiget Wed Jan 8 23:33:12 2003
47 +++ rpm-4.2/python/Makefile.am Thu Mar 27 23:28:05 2003
49 $(top_builddir)/lib/.libs/librpm.so \
50 $(top_builddir)/rpmdb/.libs/librpmdb.so \
51 $(top_builddir)/rpmio/.libs/librpmio.so \
52 - $(top_builddir)/popt/.libs/libpopt.so \
58 pythondir = $(pylibdir)/site-packages
59 -python_PROGRAMS = rpmmodule.so
60 +python_LTLIBRARIES = rpmmodule.la
62 rpmdbdir = $(pylibdir)/site-packages/rpmdb
63 -rpmdb_PROGRAMS = _rpmdb.so
64 +rpmdb_LTLIBRARIES = _rpmdb.la
66 -noinst_PROGRAMS = poptmodule.so
68 -rpmmodule_so_SOURCES =
69 -rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so
70 +rpmmodule_la_SOURCES =
71 +rpmmodule_la_LIBADD = $(mylibs) $(LIBS)
72 +rpmmodule_la_LDFLAGS = -module -avoid-version
74 -_rpmdb_so_SOURCES = _rpmdb.c
75 -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so
76 +_rpmdb_la_SOURCES = _rpmdb.c
77 +_rpmdb_la_LIBADD = $(mylibs) $(LIBS)
78 +_rpmdb_la_LDFLAGS = -module -avoid-version
80 -poptmodule_so_SOURCES = poptmodule.c
81 -poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so
82 +poptmodule_la_SOURCES = poptmodule.c
83 +poptmodule_la_LIBADD = $(mylibs) $(LIBS)
84 +poptmodule_la_LDFLAGS = -module -avoid-version
86 -noinst_LTLIBRARIES = librpmmodule.la
87 +noinst_LTLIBRARIES = librpmmodule.la poptmodule.la
88 librpmmodule_la_SOURCES = rpmmodule.c header-py.c \
89 rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \
90 rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c
92 -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
93 - $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
95 -_rpmdb.so$(EXEEXT): _rpmdb.lo
96 - $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS)
98 -poptmodule.so$(EXEEXT): poptmodule.lo
99 - $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS)
101 # rpmmodule.c header-py.c \
102 # rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \
103 # rpmrc-py.c rpmte-py.c rpmts-py.c
104 --- rpm-4.2/tools/Makefile.am.wiget Fri Mar 7 19:21:19 2003
105 +++ rpm-4.2/tools/Makefile.am Thu Mar 27 23:23:19 2003
108 debugedit_SOURCES = debugedit.c hashtab.c
109 debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
110 - $(top_builddir)/popt/libpopt.la
113 javadeps_SOURCES = javadeps.c
115 --- rpm-4.2/configure.ac.wiget Thu Mar 27 23:16:15 2003
116 +++ rpm-4.2/configure.ac Thu Mar 27 23:58:46 2003
119 AC_SUBST(WITH_LIBDWARF_INCLUDE)
123 +AC_CHECK_HEADERS([popt.h])
124 +AC_CHECK_LIB(popt, poptGetContext, [
125 + AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
126 + WITH_POPT_LIB="-lpopt"
127 + ],[WITH_POPT_SUBDIR="popt"
128 + WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
130 +AC_SUBST(WITH_POPT_SUBDIR)
131 +AC_SUBST(WITH_POPT_LIB)
132 AC_CHECK_FUNC(setreuid, [], [
133 AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
137 dnl Check for Berkeley db3 API.
138 AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
139 + AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
140 AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
141 AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
142 AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
150 if test X"$DBLIBSRCS" = X; then
151 @@ -1226,7 +1237,7 @@
152 dnl # XXX Propagate -lucb to popt ...
153 dnl export LIBS INCPATH CONFIG_SITE
155 -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
156 +AC_CONFIG_SUBDIRS(beecrypt file)
158 AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
159 macros.perl scripts/perl.req scripts/perl.prov
160 @@ -1248,7 +1259,7 @@
162 python/rpmdb/Makefile
164 - ], [ echo timestamp > popt/stamp-h.in
166 echo timestamp > beecrypt/stamp-h.in
167 echo timestamp > stamp-h.in
169 --- rpm-4.2/Makefile.am.wiget Mon Mar 10 20:35:20 2003
170 +++ rpm-4.2/Makefile.am Thu Mar 27 23:50:55 2003
172 po/*.in po/*.po po/rpm.pot \
173 rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
175 -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 .
176 +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 .
179 -I$(top_srcdir)/build \
181 $(top_builddir)/lib/librpm.la \
182 $(top_builddir)/rpmdb/librpmdb.la \
183 $(top_builddir)/rpmio/librpmio.la \
184 - $(top_builddir)/popt/libpopt.la \
190 -load lib/rpmlib.lcd \
191 -load rpmdb/rpmdb.lcd \
192 -load rpmio/rpmio.lcd \
193 - -load popt/popt.lcd \
194 $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
197 --- rpm-4.2/rpmdb/Makefile.am.syslib Fri Mar 28 00:45:58 2003
198 +++ rpm-4.2/rpmdb/Makefile.am Fri Mar 28 00:48:00 2003
201 librpmdb_la_LDFLAGS = -release @VERSION@ \
202 $(top_builddir)/rpmio/librpmio.la \
203 - $(top_builddir)/popt/libpopt.la \
207 librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
208 --- rpm-4.2/lib/Makefile.am.wiget Fri Mar 28 01:31:52 2003
209 +++ rpm-4.2/lib/Makefile.am Fri Mar 28 01:32:37 2003
211 librpm_la_LDFLAGS = -release @VERSION@ \
212 $(top_builddir)/rpmdb/librpmdb.la \
213 $(top_builddir)/rpmio/librpmio.la \
214 - $(top_builddir)/popt/libpopt.la
218 @echo expect 10 shift/reduce conflicts