]>
Commit | Line | Data |
---|---|---|
1 | diff -urN rpm.org/configure.ac rpm/configure.ac | |
2 | --- rpm.org/configure.ac 2004-06-14 11:46:10.220092656 +0200 | |
3 | +++ rpm/configure.ac 2004-06-14 11:47:13.499472728 +0200 | |
4 | @@ -428,6 +428,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 | @@ -1203,7 +1215,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_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec | |
31 | scripts/perl.req scripts/perl.prov | |
32 | @@ -1227,7 +1239,7 @@ | |
33 | python/rpmdb/test/Makefile | |
34 | lua/Makefile | |
35 | ]) | |
36 | -AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in | |
37 | +AC_CONFIG_COMMANDS([default],[[ | |
38 | echo timestamp > stamp-h.in | |
39 | ||
40 | ]],[[]]) | |
41 | diff -urN rpm.org/lib/Makefile.am rpm/lib/Makefile.am | |
42 | --- rpm.org/lib/Makefile.am 2004-06-14 11:46:08.925289496 +0200 | |
43 | +++ rpm/lib/Makefile.am 2004-06-14 11:47:13.502472272 +0200 | |
44 | @@ -40,7 +40,7 @@ | |
45 | librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ | |
46 | $(top_builddir)/rpmdb/librpmdb.la \ | |
47 | $(top_builddir)/rpmio/librpmio.la \ | |
48 | - $(top_builddir)/popt/libpopt.la \ | |
49 | + -lpopt \ | |
50 | @WITH_SELINUX_LIB@ | |
51 | ||
52 | getdate.c: getdate.y | |
53 | diff -urN rpm.org/Makefile.am rpm/Makefile.am | |
54 | --- rpm.org/Makefile.am 2004-06-14 11:46:04.409975928 +0200 | |
55 | +++ rpm/Makefile.am 2004-06-14 11:48:04.236759488 +0200 | |
56 | @@ -14,7 +14,7 @@ | |
57 | po/*.in po/*.po po/rpm.pot \ | |
58 | rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c | |
59 | ||
60 | -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . | |
61 | +SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . | |
62 | ||
63 | INCLUDES = \ | |
64 | -I$(top_srcdir)/build \ | |
65 | @@ -22,7 +22,6 @@ | |
66 | -I$(top_srcdir)/rpmdb \ | |
67 | -I$(top_srcdir)/rpmio \ | |
68 | @WITH_BEECRYPT_INCLUDE@ \ | |
69 | - -I$(top_srcdir)/popt \ | |
70 | @WITH_LIBELF_INCLUDE@ \ | |
71 | @INCPATH@ | |
72 | ||
73 | @@ -34,7 +33,7 @@ | |
74 | $(top_builddir)/lib/librpm.la \ | |
75 | $(top_builddir)/rpmdb/librpmdb.la \ | |
76 | $(top_builddir)/rpmio/librpmio.la \ | |
77 | - $(top_builddir)/popt/libpopt.la \ | |
78 | + -lpopt \ | |
79 | @WITH_ZLIB_LIB@ \ | |
80 | @INTLLIBS@ \ | |
81 | @LIBMISC@ | |
82 | @@ -107,7 +106,6 @@ | |
83 | -load lib/rpmlib.lcd \ | |
84 | -load rpmdb/rpmdb.lcd \ | |
85 | -load rpmio/rpmio.lcd \ | |
86 | - -load popt/popt.lcd \ | |
87 | $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) | |
88 | ||
89 | .PHONY: lint | |
90 | @@ -117,9 +115,7 @@ | |
91 | `make -s sources -C lib` \ | |
92 | `make -s sources -C rpmdb` \ | |
93 | `make -s sources -C rpmio` \ | |
94 | - `make -s sources -C beecrypt` \ | |
95 | - `make -s sources -C file/src` \ | |
96 | - `make -s sources -C popt` | |
97 | + `make -s sources -C file/src` | |
98 | ||
99 | CVSTAG = r$(subst .,-,$(VERSION)) | |
100 | ||
101 | diff -urN rpm.org/rpmdb/Makefile.am rpm/rpmdb/Makefile.am | |
102 | --- rpm.org/rpmdb/Makefile.am 2004-06-14 11:46:09.726167744 +0200 | |
103 | +++ rpm/rpmdb/Makefile.am 2004-06-14 11:47:13.524468928 +0200 | |
104 | @@ -9,7 +9,6 @@ | |
105 | -I$(top_srcdir)/lib \ | |
106 | -I$(top_srcdir)/rpmio \ | |
107 | @WITH_BEECRYPT_INCLUDE@ \ | |
108 | - -I$(top_srcdir)/popt \ | |
109 | @WITH_LIBELF_INCLUDE@ \ | |
110 | @INCPATH@ | |
111 | ||
112 | @@ -51,7 +50,7 @@ | |
113 | tagname.c tagtbl.c | |
114 | librpmdb_la_LDFLAGS = -release 4.3 \ | |
115 | $(top_builddir)/rpmio/librpmio.la \ | |
116 | - $(top_builddir)/popt/libpopt.la \ | |
117 | + @WITH_POPT_LIB@ \ | |
118 | @WITH_LIBELF_LIB@ | |
119 | librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) | |
120 | librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) | |
121 | diff -urN rpm.org/rpmio/Makefile.am rpm/rpmio/Makefile.am | |
122 | --- rpm.org/rpmio/Makefile.am 2004-06-14 11:46:09.817153912 +0200 | |
123 | +++ rpm/rpmio/Makefile.am 2004-06-14 11:48:20.584274288 +0200 | |
124 | @@ -11,7 +11,6 @@ | |
125 | INCLUDES = -I. \ | |
126 | -I$(top_srcdir) \ | |
127 | @WITH_BEECRYPT_INCLUDE@ \ | |
128 | - -I$(top_srcdir)/popt \ | |
129 | -I$(top_srcdir)/lua/include \ | |
130 | -I$(top_srcdir)/lua/local \ | |
131 | @INCPATH@ | |
132 | @@ -69,34 +68,34 @@ | |
133 | $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) | |
134 | ||
135 | tdigest_SOURCES = tdigest.c | |
136 | -tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt | |
137 | +tdigest_LDADD = librpmio.la -lpopt -lgcrypt | |
138 | ||
139 | tdir_SOURCES = tdir.c | |
140 | tdir_LDFLAGS = -all-static | |
141 | -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
142 | +tdir_LDADD = librpmio.la -lpopt | |
143 | ||
144 | tfts_SOURCES = tfts.c | |
145 | tfts_LDFLAGS = -all-static | |
146 | -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
147 | +tfts_LDADD = librpmio.la -lpopt | |
148 | ||
149 | tglob_SOURCES = tglob.c | |
150 | tglob_LDFLAGS = -all-static | |
151 | -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
152 | +tglob_LDADD = librpmio.la -lpopt | |
153 | ||
154 | tinv_SOURCES = tinv.c | |
155 | tinv_LDFLAGS = -all-static | |
156 | -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
157 | +tinv_LDADD = librpmio.la -lpopt | |
158 | ||
159 | tkey_SOURCES = tkey.c | |
160 | tkey_LDFLAGS = -all-static | |
161 | -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
162 | +tkey_LDADD = librpmio.la -lpopt | |
163 | ||
164 | tring_SOURCES = tring.c | |
165 | tring_LDFLAGS = -all-static | |
166 | -tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
167 | +tring_LDADD = librpmio.la -lpopt | |
168 | ||
169 | trpmio_SOURCES = trpmio.c | |
170 | -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la | |
171 | +trpmio_LDADD = librpmio.la -lpopt | |
172 | ||
173 | tsw_SOURCES = tsw.c | |
174 | tsw_LDFLAGS = librpmio.la | |
175 | diff -urN rpm.org/tools/Makefile.am rpm/tools/Makefile.am | |
176 | --- rpm.org/tools/Makefile.am 2004-06-14 11:46:09.906140384 +0200 | |
177 | +++ rpm/tools/Makefile.am 2004-06-14 11:47:13.532467712 +0200 | |
178 | @@ -9,7 +9,6 @@ | |
179 | -I$(top_srcdir)/rpmdb \ | |
180 | -I$(top_srcdir)/rpmio \ | |
181 | @WITH_BEECRYPT_INCLUDE@ \ | |
182 | - -I$(top_srcdir)/popt \ | |
183 | @WITH_LIBELF_INCLUDE@ \ | |
184 | @WITH_LIBDWARF_INCLUDE@ \ | |
185 | -I$(top_srcdir)/file/src \ | |
186 | @@ -37,7 +36,7 @@ | |
187 | ||
188 | debugedit_SOURCES = debugedit.c hashtab.c | |
189 | debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ | |
190 | - $(top_builddir)/popt/libpopt.la | |
191 | + -lpopt | |
192 | ||
193 | javadeps_SOURCES = javadeps.c | |
194 |