]>
Commit | Line | Data |
---|---|---|
012a8819 AM |
1 | diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac |
2 | --- rpm-4.3.org/configure.ac 2003-12-28 02:08:42.969753832 +0100 | |
3 | +++ rpm-4.3/configure.ac 2003-12-28 02:09:04.576469112 +0100 | |
4 | @@ -431,6 +431,18 @@ | |
5 | AC_SUBST(WITH_BEECRYPT_INCLUDE) | |
6 | AC_SUBST(WITH_BEECRYPT_LIB) | |
7 | ||
8 | +WITH_POPT_SUBDIR= | |
9 | +WITH_POPT_LIB= | |
10 | +AC_CHECK_HEADERS([popt.h]) | |
11 | +AC_CHECK_LIB(popt, poptGetContext, [ | |
12 | + AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.]) | |
13 | + WITH_POPT_LIB="-lpopt" | |
14 | + ],[WITH_POPT_SUBDIR="popt" | |
15 | + WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"]) | |
16 | + | |
17 | +AC_SUBST(WITH_POPT_SUBDIR) | |
18 | +AC_SUBST(WITH_POPT_LIB) | |
19 | + | |
20 | AC_CHECK_FUNC(setreuid, [], [ | |
21 | AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) | |
22 | ]) | |
23 | @@ -1218,7 +1230,7 @@ | |
24 | dnl # XXX Propagate -lucb to popt ... | |
25 | dnl export LIBS INCPATH CONFIG_SITE | |
26 | ||
27 | -AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) | |
28 | +AC_CONFIG_SUBDIRS(file) | |
29 | ||
30 | AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
31 | scripts/perl.req scripts/perl.prov | |
32 | @@ -1240,7 +1252,7 @@ | |
33 | python/Makefile | |
34 | python/rpmdb/Makefile | |
35 | python/rpmdb/test/Makefile | |
36 | - ], [ echo timestamp > popt/stamp-h.in | |
37 | + ], [ | |
38 | echo timestamp > stamp-h.in | |
39 | ] | |
40 | ) | |
41 | diff -urN rpm-4.3.org/configure.ac.orig rpm-4.3/configure.ac.orig | |
42 | --- rpm-4.3.org/configure.ac.orig 2003-12-28 02:08:50.057676304 +0100 | |
43 | +++ rpm-4.3/configure.ac.orig 2003-12-28 02:08:04.494602944 +0100 | |
44 | @@ -1222,6 +1222,7 @@ | |
45 | ||
46 | AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
47 | scripts/perl.req scripts/perl.prov | |
48 | + scripts/php.req scripts/php.prov | |
49 | rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile | |
50 | scripts/Makefile scripts/brp-redhat | |
51 | scripts/macros.perl scripts/macros.php scripts/macros.python | |
52 | diff -urN rpm-4.3.org/lib/Makefile.am rpm-4.3/lib/Makefile.am | |
53 | --- rpm-4.3.org/lib/Makefile.am 2003-12-28 02:08:42.972753376 +0100 | |
54 | +++ rpm-4.3/lib/Makefile.am 2003-12-28 02:10:03.310540176 +0100 | |
55 | @@ -10,7 +10,6 @@ | |
56 | -I$(top_srcdir)/rpmdb \ | |
57 | -I$(top_srcdir)/rpmio \ | |
58 | @WITH_BEECRYPT_INCLUDE@ \ | |
59 | - -I$(top_srcdir)/popt \ | |
60 | @INCPATH@ | |
61 | ||
62 | EXTRA_DIST = getdate.y | |
63 | @@ -40,7 +39,7 @@ | |
64 | librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ | |
65 | $(top_builddir)/rpmdb/librpmdb.la \ | |
66 | $(top_builddir)/rpmio/librpmio.la \ | |
67 | - $(top_builddir)/popt/libpopt.la \ | |
68 | + @WITH_POPT_LIB@ \ | |
69 | -lselinux | |
70 | ||
71 | getdate.c: getdate.y | |
72 | @@ -93,7 +92,7 @@ | |
73 | $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ | |
74 | -lselinux \ | |
75 | $(top_builddir)/rpmio/librpmio.la \ | |
76 | - $(top_builddir)/popt/libpopt.la | |
77 | + -lpopt | |
78 | ||
79 | #tds: tds.c librpm.la | |
80 | # $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) | |
81 | @@ -104,8 +103,8 @@ | |
82 | tthread: tthread.o librpm.la | |
83 | $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@ | |
84 | ||
85 | -tsystem: tsystem.o $(top_builddir)/popt/libpopt.la | |
86 | - $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la | |
87 | +tsystem: tsystem.o | |
88 | + $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt | |
89 | ||
90 | tre: tre.o librpm.la | |
91 | $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \ | |
92 | diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am | |
93 | --- rpm-4.3.org/Makefile.am 2003-12-28 02:08:42.937758696 +0100 | |
94 | +++ rpm-4.3/Makefile.am 2003-12-28 02:09:04.580468504 +0100 | |
95 | @@ -14,7 +14,7 @@ | |
96 | po/*.in po/*.po po/rpm.pot \ | |
97 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
98 | ||
99 | -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 . | |
100 | +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . | |
101 | ||
102 | INCLUDES = \ | |
103 | -I$(top_srcdir)/build \ | |
104 | @@ -22,7 +22,6 @@ | |
105 | -I$(top_srcdir)/rpmdb \ | |
106 | -I$(top_srcdir)/rpmio \ | |
107 | @WITH_BEECRYPT_INCLUDE@ \ | |
108 | - -I$(top_srcdir)/popt \ | |
109 | @WITH_LIBELF_INCLUDE@ \ | |
110 | @INCPATH@ | |
111 | ||
112 | @@ -34,7 +33,7 @@ | |
113 | $(top_builddir)/lib/librpm.la \ | |
114 | $(top_builddir)/rpmdb/librpmdb.la \ | |
115 | $(top_builddir)/rpmio/librpmio.la \ | |
116 | - $(top_builddir)/popt/libpopt.la \ | |
117 | + -lpopt \ | |
118 | @WITH_ZLIB_LIB@ \ | |
119 | @INTLLIBS@ \ | |
120 | @LIBMISC@ | |
121 | @@ -107,7 +106,6 @@ | |
122 | -load lib/rpmlib.lcd \ | |
123 | -load rpmdb/rpmdb.lcd \ | |
124 | -load rpmio/rpmio.lcd \ | |
125 | - -load popt/popt.lcd \ | |
126 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
127 | ||
128 | .PHONY: lint | |
129 | @@ -117,9 +115,7 @@ | |
130 | `make -s sources -C lib` \ | |
131 | `make -s sources -C rpmdb` \ | |
132 | `make -s sources -C rpmio` \ | |
133 | - `make -s sources -C beecrypt` \ | |
134 | - `make -s sources -C file/src` \ | |
135 | - `make -s sources -C popt` | |
136 | + `make -s sources -C file/src` | |
137 | ||
138 | CVSTAG = r$(subst .,-,$(VERSION)) | |
139 | ||
140 | diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am | |
141 | --- rpm-4.3.org/rpmdb/Makefile.am 2003-12-28 02:08:53.054220760 +0100 | |
142 | +++ rpm-4.3/rpmdb/Makefile.am 2003-12-28 02:09:04.581468352 +0100 | |
143 | @@ -9,7 +9,6 @@ | |
144 | -I$(top_srcdir)/lib \ | |
145 | -I$(top_srcdir)/rpmio \ | |
146 | @WITH_BEECRYPT_INCLUDE@ \ | |
147 | - -I$(top_srcdir)/popt \ | |
148 | @WITH_LIBELF_INCLUDE@ \ | |
149 | @INCPATH@ | |
150 | ||
151 | @@ -51,7 +50,7 @@ | |
152 | tagname.c tagtbl.c | |
153 | librpmdb_la_LDFLAGS = -release 4.3 \ | |
154 | $(top_builddir)/rpmio/librpmio.la \ | |
155 | - $(top_builddir)/popt/libpopt.la \ | |
156 | + @WITH_POPT_LIB@ \ | |
157 | @WITH_LIBELF_LIB@ | |
158 | librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) | |
159 | librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) | |
160 | diff -urN rpm-4.3.org/rpmio/Makefile.am rpm-4.3/rpmio/Makefile.am | |
161 | --- rpm-4.3.org/rpmio/Makefile.am 2003-12-28 02:08:42.988750944 +0100 | |
162 | +++ rpm-4.3/rpmio/Makefile.am 2003-12-28 02:09:04.582468200 +0100 | |
163 | @@ -11,7 +11,6 @@ | |
164 | INCLUDES = -I. \ | |
165 | -I$(top_srcdir) \ | |
166 | @WITH_BEECRYPT_INCLUDE@ \ | |
167 | - -I$(top_srcdir)/popt \ | |
168 | @INCPATH@ | |
169 | ||
170 | pkgincdir = $(pkgincludedir) | |
171 | @@ -65,34 +64,34 @@ | |
74c62e75 | 172 | $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) |
1b8d261d MM |
173 | |
174 | tdigest_SOURCES = tdigest.c | |
13e787b0 AF |
175 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt |
176 | +tdigest_LDADD = librpmio.la -lpopt -lgcrypt | |
1b8d261d MM |
177 | |
178 | tdir_SOURCES = tdir.c | |
179 | tdir_LDFLAGS = -all-static | |
180 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
181 | +tdir_LDADD = librpmio.la -lpopt | |
182 | ||
183 | tfts_SOURCES = tfts.c | |
184 | tfts_LDFLAGS = -all-static | |
185 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
186 | +tfts_LDADD = librpmio.la -lpopt | |
187 | ||
188 | tglob_SOURCES = tglob.c | |
189 | tglob_LDFLAGS = -all-static | |
190 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
191 | +tglob_LDADD = librpmio.la -lpopt | |
192 | ||
193 | tinv_SOURCES = tinv.c | |
194 | tinv_LDFLAGS = -all-static | |
195 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
196 | +tinv_LDADD = librpmio.la -lpopt | |
197 | ||
198 | tkey_SOURCES = tkey.c | |
199 | tkey_LDFLAGS = -all-static | |
200 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
201 | +tkey_LDADD = librpmio.la -lpopt | |
202 | ||
203 | tring_SOURCES = tring.c | |
204 | tring_LDFLAGS = -all-static | |
205 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
206 | +tring_LDADD = librpmio.la -lpopt | |
207 | ||
208 | trpmio_SOURCES = trpmio.c | |
209 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
210 | +trpmio_LDADD = librpmio.la -lpopt | |
211 | ||
13e787b0 AF |
212 | tsw_SOURCES = tsw.c |
213 | tsw_LDFLAGS = librpmio.la | |
012a8819 AM |
214 | diff -urN rpm-4.3.org/tools/Makefile.am rpm-4.3/tools/Makefile.am |
215 | --- rpm-4.3.org/tools/Makefile.am 2003-12-28 02:08:42.852771616 +0100 | |
216 | +++ rpm-4.3/tools/Makefile.am 2003-12-28 02:09:26.913073432 +0100 | |
217 | @@ -9,7 +9,6 @@ | |
218 | -I$(top_srcdir)/rpmdb \ | |
219 | -I$(top_srcdir)/rpmio \ | |
220 | @WITH_BEECRYPT_INCLUDE@ \ | |
221 | - -I$(top_srcdir)/popt \ | |
222 | @WITH_LIBELF_INCLUDE@ \ | |
223 | @WITH_LIBDWARF_INCLUDE@ \ | |
224 | -I$(top_srcdir)/file/src \ | |
225 | @@ -38,7 +37,7 @@ | |
74c62e75 AF |
226 | |
227 | debugedit_SOURCES = debugedit.c hashtab.c | |
228 | debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ | |
229 | - $(top_builddir)/popt/libpopt.la | |
230 | + -lpopt | |
1b8d261d | 231 | |
74c62e75 AF |
232 | javadeps_SOURCES = javadeps.c |
233 |