]>
Commit | Line | Data |
---|---|---|
b30e66ba | 1 | diff -rud aptitude-0.0.8.6/Makefile.am aptitude-0.0.8.6-new/Makefile.am |
2 | --- aptitude-0.0.8.6/Makefile.am Thu Apr 5 16:49:57 2001 | |
3 | +++ aptitude-0.0.8.6-new/Makefile.am Fri May 18 21:35:53 2001 | |
4 | @@ -9,11 +9,11 @@ | |
5 | pkgdata_DATA=help.txt help-fr.txt help-gl.txt help-pl.txt | |
6 | ||
7 | install-data-local: | |
8 | - [ -d $(DESTDIR)/var/state/aptitude ] || mkdir $(DESTDIR)/var/state/aptitude | |
9 | + [ -d $(DESTDIR)/var/lib/aptitude ] || mkdir $(DESTDIR)/var/lib/aptitude | |
10 | # FIXME: this really ought to use the autoconf directory variables | |
11 | ||
12 | uninstall-local: | |
13 | - rm -fr $(DESTDIR)/var/state/aptitude | |
14 | + rm -fr $(DESTDIR)/var/lib/aptitude | |
15 | # Is -r a good idea here? | |
16 | ||
17 | dist-hook: | |
18 | Only in aptitude-0.0.8.6-new/: Makefile.am~ | |
19 | diff -rud aptitude-0.0.8.6/Makefile.in aptitude-0.0.8.6-new/Makefile.in | |
20 | --- aptitude-0.0.8.6/Makefile.in Thu May 3 21:36:57 2001 | |
21 | +++ aptitude-0.0.8.6-new/Makefile.in Fri May 18 21:35:53 2001 | |
22 | @@ -1,4 +1,4 @@ | |
23 | -# Makefile.in generated automatically by automake 1.4 from Makefile.am | |
24 | +# Makefile.in generated automatically by automake 1.4a from Makefile.am | |
25 | ||
26 | # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. | |
27 | # This Makefile.in is free software; the Free Software Foundation | |
28 | @@ -44,9 +44,10 @@ | |
29 | AUTOHEADER = @AUTOHEADER@ | |
30 | ||
31 | INSTALL = @INSTALL@ | |
32 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) | |
33 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |
34 | INSTALL_DATA = @INSTALL_DATA@ | |
35 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | |
36 | +INSTALL_STRIP_FLAG = | |
37 | transform = @program_transform_name@ | |
38 | ||
39 | NORMAL_INSTALL = : | |
40 | @@ -104,14 +105,14 @@ | |
41 | ||
42 | DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) | |
43 | ||
44 | -TAR = tar | |
45 | +TAR = gtar | |
46 | GZIP_ENV = --best | |
47 | all: all-redirect | |
48 | .SUFFIXES: | |
49 | $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) | |
50 | - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile | |
51 | + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile | |
52 | ||
53 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | |
54 | +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) | |
55 | cd $(top_builddir) \ | |
56 | && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status | |
57 | ||
58 | @@ -297,6 +298,11 @@ | |
59 | -rm -rf $(distdir) | |
60 | mkdir $(distdir) | |
61 | -chmod 777 $(distdir) | |
62 | + here=`cd $(top_builddir) && pwd`; \ | |
63 | + top_distdir=`cd $(distdir) && pwd`; \ | |
64 | + distdir=`cd $(distdir) && pwd`; \ | |
65 | + cd $(top_srcdir) \ | |
66 | + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile | |
67 | @for file in $(DISTFILES); do \ | |
68 | d=$(srcdir); \ | |
69 | if test -d $$d/$$file; then \ | |
70 | @@ -343,7 +349,7 @@ | |
71 | all-am: Makefile $(DATA) config.h | |
72 | all-redirect: all-recursive-am | |
73 | install-strip: | |
74 | - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install | |
75 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install | |
76 | installdirs: installdirs-recursive | |
77 | installdirs-am: | |
78 | $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) | |
79 | @@ -397,11 +403,11 @@ | |
80 | ||
81 | ||
82 | install-data-local: | |
83 | - [ -d $(DESTDIR)/var/state/aptitude ] || mkdir $(DESTDIR)/var/state/aptitude | |
84 | + [ -d $(DESTDIR)/var/lib/aptitude ] || mkdir $(DESTDIR)/var/lib/aptitude | |
85 | # FIXME: this really ought to use the autoconf directory variables | |
86 | ||
87 | uninstall-local: | |
88 | - rm -fr $(DESTDIR)/var/state/aptitude | |
89 | + rm -fr $(DESTDIR)/var/lib/aptitude | |
90 | # Is -r a good idea here? | |
91 | ||
92 | dist-hook: | |
93 | Only in aptitude-0.0.8.6-new/: Makefile.in~ | |
94 | diff -rud aptitude-0.0.8.6/README aptitude-0.0.8.6-new/README | |
95 | --- aptitude-0.0.8.6/README Thu May 3 21:23:09 2001 | |
96 | +++ aptitude-0.0.8.6-new/README Fri May 18 21:35:53 2001 | |
97 | @@ -654,7 +654,7 @@ | |
98 | Dir::Aptitude::state | |
99 | Aptitude now has some persistent state information; | |
100 | this directory holds that information. | |
101 | - default: /var/state/aptitude | |
102 | + default: /var/lib/aptitude | |
103 | ||
104 | Aptitude::Allow-ReInstall | |
105 | If this is set, you will be able to select | |
106 | Only in aptitude-0.0.8.6-new/: README~ | |
107 | diff -rud aptitude-0.0.8.6/aclocal.m4 aptitude-0.0.8.6-new/aclocal.m4 | |
108 | --- aptitude-0.0.8.6/aclocal.m4 Thu May 3 21:29:30 2001 | |
109 | +++ aptitude-0.0.8.6-new/aclocal.m4 Fri May 18 21:35:53 2001 | |
110 | @@ -1,4 +1,4 @@ | |
111 | -dnl aclocal.m4 generated automatically by aclocal 1.4 | |
112 | +dnl aclocal.m4 generated automatically by aclocal 1.4a | |
113 | ||
114 | dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. | |
115 | dnl This file is free software; the Free Software Foundation | |
116 | @@ -37,6 +37,8 @@ | |
117 | ||
118 | AC_DEFUN(AM_INIT_AUTOMAKE, | |
119 | [AC_REQUIRE([AC_PROG_INSTALL]) | |
120 | +dnl We require 2.13 because we rely on SHELL being computed by configure. | |
121 | +AC_PREREQ([2.13]) | |
122 | PACKAGE=[$1] | |
123 | AC_SUBST(PACKAGE) | |
124 | VERSION=[$2] | |
125 | @@ -381,8 +383,8 @@ | |
126 | AC_REQUIRE([AC_PROG_RANLIB])dnl | |
127 | AC_REQUIRE([AC_ISC_POSIX])dnl | |
128 | AC_REQUIRE([AC_HEADER_STDC])dnl | |
129 | - AC_REQUIRE([AC_C_CONST])dnl | |
130 | - AC_REQUIRE([AC_C_INLINE])dnl | |
131 | +dnl AC_REQUIRE([AC_C_CONST])dnl | |
132 | +dnl AC_REQUIRE([AC_C_INLINE])dnl | |
133 | AC_REQUIRE([AC_TYPE_OFF_T])dnl | |
134 | AC_REQUIRE([AC_TYPE_SIZE_T])dnl | |
135 | AC_REQUIRE([AC_FUNC_ALLOCA])dnl | |
136 | Only in aptitude-0.0.8.6-new/: aclocal.m4~ | |
137 | diff -rud aptitude-0.0.8.6/config.h.in aptitude-0.0.8.6-new/config.h.in | |
138 | --- aptitude-0.0.8.6/config.h.in Thu Apr 12 22:52:37 2001 | |
139 | +++ aptitude-0.0.8.6-new/config.h.in Fri May 18 21:37:26 2001 | |
140 | @@ -3,9 +3,6 @@ | |
141 | /* Define if using alloca.c. */ | |
142 | #undef C_ALLOCA | |
143 | ||
144 | -/* Define to empty if the keyword does not work. */ | |
145 | -#undef const | |
146 | - | |
147 | /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. | |
148 | This function is required for alloca.c support on those systems. */ | |
149 | #undef CRAY_STACKSEG_END | |
150 | @@ -19,9 +16,6 @@ | |
151 | /* Define if you have a working `mmap' system call. */ | |
152 | #undef HAVE_MMAP | |
153 | ||
154 | -/* Define as __inline if that's what the C compiler calls it. */ | |
155 | -#undef inline | |
156 | - | |
157 | /* Define to `long' if <sys/types.h> doesn't define. */ | |
158 | #undef off_t | |
159 | ||
160 | @@ -175,3 +169,8 @@ | |
161 | /* Define if the GNU gettext() function is already present or preinstalled. */ | |
162 | #undef HAVE_GETTEXT | |
163 | ||
164 | +/* Define if you have the popt library (-lpopt). */ | |
165 | +#undef HAVE_LIBPOPT | |
166 | + | |
167 | +/* Define if you have the rpm library (-lrpm). */ | |
168 | +#undef HAVE_LIBRPM | |
169 | Only in aptitude-0.0.8.6-new/: config.h.in~ | |
170 | diff -rud aptitude-0.0.8.6/configure aptitude-0.0.8.6-new/configure | |
171 | --- aptitude-0.0.8.6/configure Thu May 3 21:29:30 2001 | |
172 | +++ aptitude-0.0.8.6-new/configure Fri May 18 21:37:39 2001 | |
173 | @@ -695,6 +695,7 @@ | |
174 | fi | |
175 | ||
176 | ||
177 | + | |
178 | PACKAGE=aptitude | |
179 | ||
180 | VERSION=0.0.8.6 | |
181 | @@ -714,7 +715,7 @@ | |
182 | ||
183 | missing_dir=`cd $ac_aux_dir && pwd` | |
184 | echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 | |
185 | -echo "configure:718: checking for working aclocal" >&5 | |
186 | +echo "configure:719: checking for working aclocal" >&5 | |
187 | # Run test in a subshell; some versions of sh will print an error if | |
188 | # an executable is not found, even if stderr is redirected. | |
189 | # Redirect stdin to placate older versions of autoconf. Sigh. | |
190 | @@ -727,7 +728,7 @@ | |
191 | fi | |
192 | ||
193 | echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 | |
194 | -echo "configure:731: checking for working autoconf" >&5 | |
195 | +echo "configure:732: checking for working autoconf" >&5 | |
196 | # Run test in a subshell; some versions of sh will print an error if | |
197 | # an executable is not found, even if stderr is redirected. | |
198 | # Redirect stdin to placate older versions of autoconf. Sigh. | |
199 | @@ -740,7 +741,7 @@ | |
200 | fi | |
201 | ||
202 | echo $ac_n "checking for working automake""... $ac_c" 1>&6 | |
203 | -echo "configure:744: checking for working automake" >&5 | |
204 | +echo "configure:745: checking for working automake" >&5 | |
205 | # Run test in a subshell; some versions of sh will print an error if | |
206 | # an executable is not found, even if stderr is redirected. | |
207 | # Redirect stdin to placate older versions of autoconf. Sigh. | |
208 | @@ -753,7 +754,7 @@ | |
209 | fi | |
210 | ||
211 | echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 | |
212 | -echo "configure:757: checking for working autoheader" >&5 | |
213 | +echo "configure:758: checking for working autoheader" >&5 | |
214 | # Run test in a subshell; some versions of sh will print an error if | |
215 | # an executable is not found, even if stderr is redirected. | |
216 | # Redirect stdin to placate older versions of autoconf. Sigh. | |
217 | @@ -766,7 +767,7 @@ | |
218 | fi | |
219 | ||
220 | echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 | |
221 | -echo "configure:770: checking for working makeinfo" >&5 | |
222 | +echo "configure:771: checking for working makeinfo" >&5 | |
223 | # Run test in a subshell; some versions of sh will print an error if | |
224 | # an executable is not found, even if stderr is redirected. | |
225 | # Redirect stdin to placate older versions of autoconf. Sigh. | |
226 | @@ -796,7 +797,7 @@ | |
227 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
228 | set dummy $ac_prog; ac_word=$2 | |
229 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
230 | -echo "configure:800: checking for $ac_word" >&5 | |
231 | +echo "configure:801: checking for $ac_word" >&5 | |
232 | if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then | |
233 | echo $ac_n "(cached) $ac_c" 1>&6 | |
234 | else | |
235 | @@ -828,7 +829,7 @@ | |
236 | ||
237 | ||
238 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
239 | -echo "configure:832: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
240 | +echo "configure:833: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 | |
241 | ||
242 | ac_ext=C | |
243 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
244 | @@ -839,12 +840,12 @@ | |
245 | ||
246 | cat > conftest.$ac_ext << EOF | |
247 | ||
248 | -#line 843 "configure" | |
249 | +#line 844 "configure" | |
250 | #include "confdefs.h" | |
251 | ||
252 | int main(){return(0);} | |
253 | EOF | |
254 | -if { (eval echo configure:848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
255 | +if { (eval echo configure:849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
256 | ac_cv_prog_cxx_works=yes | |
257 | # If we can't run a trivial program, we are probably using a cross compiler. | |
258 | if (./conftest; exit) 2>/dev/null; then | |
259 | @@ -870,12 +871,12 @@ | |
260 | { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } | |
261 | fi | |
262 | echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
263 | -echo "configure:874: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
264 | +echo "configure:875: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
265 | echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 | |
266 | cross_compiling=$ac_cv_prog_cxx_cross | |
267 | ||
268 | echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 | |
269 | -echo "configure:879: checking whether we are using GNU C++" >&5 | |
270 | +echo "configure:880: checking whether we are using GNU C++" >&5 | |
271 | if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then | |
272 | echo $ac_n "(cached) $ac_c" 1>&6 | |
273 | else | |
274 | @@ -884,7 +885,7 @@ | |
275 | yes; | |
276 | #endif | |
277 | EOF | |
278 | -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
279 | +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
280 | ac_cv_prog_gxx=yes | |
281 | else | |
282 | ac_cv_prog_gxx=no | |
283 | @@ -903,7 +904,7 @@ | |
284 | ac_save_CXXFLAGS="$CXXFLAGS" | |
285 | CXXFLAGS= | |
286 | echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 | |
287 | -echo "configure:907: checking whether ${CXX-g++} accepts -g" >&5 | |
288 | +echo "configure:908: checking whether ${CXX-g++} accepts -g" >&5 | |
289 | if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then | |
290 | echo $ac_n "(cached) $ac_c" 1>&6 | |
291 | else | |
292 | @@ -937,7 +938,7 @@ | |
293 | # Extract the first word of "ranlib", so it can be a program name with args. | |
294 | set dummy ranlib; ac_word=$2 | |
295 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
296 | -echo "configure:941: checking for $ac_word" >&5 | |
297 | +echo "configure:942: checking for $ac_word" >&5 | |
298 | if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then | |
299 | echo $ac_n "(cached) $ac_c" 1>&6 | |
300 | else | |
301 | @@ -969,7 +970,7 @@ | |
302 | ac_cv_c_inline=yes | |
303 | ||
304 | echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 | |
305 | -echo "configure:973: checking for initscr in -lcurses" >&5 | |
306 | +echo "configure:974: checking for initscr in -lcurses" >&5 | |
307 | ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` | |
308 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
309 | echo $ac_n "(cached) $ac_c" 1>&6 | |
310 | @@ -977,7 +978,7 @@ | |
311 | ac_save_LIBS="$LIBS" | |
312 | LIBS="-lcurses $LIBS" | |
313 | cat > conftest.$ac_ext <<EOF | |
314 | -#line 981 "configure" | |
315 | +#line 982 "configure" | |
316 | #include "confdefs.h" | |
317 | /* Override any gcc2 internal prototype to avoid an error. */ | |
318 | #ifdef __cplusplus | |
319 | @@ -991,7 +992,7 @@ | |
320 | initscr() | |
321 | ; return 0; } | |
322 | EOF | |
323 | -if { (eval echo configure:995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
324 | +if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
325 | rm -rf conftest* | |
326 | eval "ac_cv_lib_$ac_lib_var=yes" | |
327 | else | |
328 | @@ -1018,8 +1019,110 @@ | |
329 | echo "$ac_t""no" 1>&6 | |
330 | fi | |
331 | ||
332 | +echo $ac_n "checking for poptGetArg in -lpopt""... $ac_c" 1>&6 | |
333 | +echo "configure:1024: checking for poptGetArg in -lpopt" >&5 | |
334 | +ac_lib_var=`echo popt'_'poptGetArg | sed 'y%./+-%__p_%'` | |
335 | +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
336 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
337 | +else | |
338 | + ac_save_LIBS="$LIBS" | |
339 | +LIBS="-lpopt $LIBS" | |
340 | +cat > conftest.$ac_ext <<EOF | |
341 | +#line 1032 "configure" | |
342 | +#include "confdefs.h" | |
343 | +/* Override any gcc2 internal prototype to avoid an error. */ | |
344 | +#ifdef __cplusplus | |
345 | +extern "C" | |
346 | +#endif | |
347 | +/* We use char because int might match the return type of a gcc2 | |
348 | + builtin and then its argument prototype would still apply. */ | |
349 | +char poptGetArg(); | |
350 | + | |
351 | +int main() { | |
352 | +poptGetArg() | |
353 | +; return 0; } | |
354 | +EOF | |
355 | +if { (eval echo configure:1046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
356 | + rm -rf conftest* | |
357 | + eval "ac_cv_lib_$ac_lib_var=yes" | |
358 | +else | |
359 | + echo "configure: failed program was:" >&5 | |
360 | + cat conftest.$ac_ext >&5 | |
361 | + rm -rf conftest* | |
362 | + eval "ac_cv_lib_$ac_lib_var=no" | |
363 | +fi | |
364 | +rm -f conftest* | |
365 | +LIBS="$ac_save_LIBS" | |
366 | + | |
367 | +fi | |
368 | +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
369 | + echo "$ac_t""yes" 1>&6 | |
370 | + ac_tr_lib=HAVE_LIB`echo popt | sed -e 's/[^a-zA-Z0-9_]/_/g' \ | |
371 | + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` | |
372 | + cat >> confdefs.h <<EOF | |
373 | +#define $ac_tr_lib 1 | |
374 | +EOF | |
375 | + | |
376 | + LIBS="-lpopt $LIBS" | |
377 | + | |
378 | +else | |
379 | + echo "$ac_t""no" 1>&6 | |
380 | +{ echo "configure: error: Can't find the popt library -- please install popt-devel" 1>&2; exit 1; } | |
381 | +fi | |
382 | + | |
383 | +echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6 | |
384 | +echo "configure:1075: checking for rpmdbOpen in -lrpm" >&5 | |
385 | +ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'` | |
386 | +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
387 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
388 | +else | |
389 | + ac_save_LIBS="$LIBS" | |
390 | +LIBS="-lrpm $LIBS" | |
391 | +cat > conftest.$ac_ext <<EOF | |
392 | +#line 1083 "configure" | |
393 | +#include "confdefs.h" | |
394 | +/* Override any gcc2 internal prototype to avoid an error. */ | |
395 | +#ifdef __cplusplus | |
396 | +extern "C" | |
397 | +#endif | |
398 | +/* We use char because int might match the return type of a gcc2 | |
399 | + builtin and then its argument prototype would still apply. */ | |
400 | +char rpmdbOpen(); | |
401 | + | |
402 | +int main() { | |
403 | +rpmdbOpen() | |
404 | +; return 0; } | |
405 | +EOF | |
406 | +if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
407 | + rm -rf conftest* | |
408 | + eval "ac_cv_lib_$ac_lib_var=yes" | |
409 | +else | |
410 | + echo "configure: failed program was:" >&5 | |
411 | + cat conftest.$ac_ext >&5 | |
412 | + rm -rf conftest* | |
413 | + eval "ac_cv_lib_$ac_lib_var=no" | |
414 | +fi | |
415 | +rm -f conftest* | |
416 | +LIBS="$ac_save_LIBS" | |
417 | + | |
418 | +fi | |
419 | +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
420 | + echo "$ac_t""yes" 1>&6 | |
421 | + ac_tr_lib=HAVE_LIB`echo rpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \ | |
422 | + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` | |
423 | + cat >> confdefs.h <<EOF | |
424 | +#define $ac_tr_lib 1 | |
425 | +EOF | |
426 | + | |
427 | + LIBS="-lrpm $LIBS" | |
428 | + | |
429 | +else | |
430 | + echo "$ac_t""no" 1>&6 | |
431 | +{ echo "configure: error: Can't find the RPM library -- please install rpm-devel" 1>&2; exit 1; } | |
432 | +fi | |
433 | + | |
434 | echo $ac_n "checking for main in -lapt-pkg""... $ac_c" 1>&6 | |
435 | -echo "configure:1023: checking for main in -lapt-pkg" >&5 | |
436 | +echo "configure:1126: checking for main in -lapt-pkg" >&5 | |
437 | ac_lib_var=`echo apt-pkg'_'main | sed 'y%./+-%__p_%'` | |
438 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
439 | echo $ac_n "(cached) $ac_c" 1>&6 | |
440 | @@ -1027,14 +1130,14 @@ | |
441 | ac_save_LIBS="$LIBS" | |
442 | LIBS="-lapt-pkg $LIBS" | |
443 | cat > conftest.$ac_ext <<EOF | |
444 | -#line 1031 "configure" | |
445 | +#line 1134 "configure" | |
446 | #include "confdefs.h" | |
447 | ||
448 | int main() { | |
449 | main() | |
450 | ; return 0; } | |
451 | EOF | |
452 | -if { (eval echo configure:1038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
453 | +if { (eval echo configure:1141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
454 | rm -rf conftest* | |
455 | eval "ac_cv_lib_$ac_lib_var=yes" | |
456 | else | |
457 | @@ -1059,11 +1162,12 @@ | |
458 | ||
459 | else | |
460 | echo "$ac_t""no" 1>&6 | |
461 | -{ echo "configure: error: Can't find the APT libraries -- please install libapt-pkg-dev" 1>&2; exit 1; } | |
462 | +{ echo "configure: error: Can't find the APT libraries -- please install libapt-pkg-devel" 1>&2; exit 1; } | |
463 | fi | |
464 | ||
465 | + | |
466 | echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 | |
467 | -echo "configure:1067: checking for main in -lpthread" >&5 | |
468 | +echo "configure:1171: checking for main in -lpthread" >&5 | |
469 | ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` | |
470 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
471 | echo $ac_n "(cached) $ac_c" 1>&6 | |
472 | @@ -1071,14 +1175,14 @@ | |
473 | ac_save_LIBS="$LIBS" | |
474 | LIBS="-lpthread $LIBS" | |
475 | cat > conftest.$ac_ext <<EOF | |
476 | -#line 1075 "configure" | |
477 | +#line 1179 "configure" | |
478 | #include "confdefs.h" | |
479 | ||
480 | int main() { | |
481 | main() | |
482 | ; return 0; } | |
483 | EOF | |
484 | -if { (eval echo configure:1082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
485 | +if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
486 | rm -rf conftest* | |
487 | eval "ac_cv_lib_$ac_lib_var=yes" | |
488 | else | |
489 | @@ -1102,7 +1206,7 @@ | |
490 | ||
491 | ||
492 | echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 | |
493 | -echo "configure:1106: checking how to run the C++ preprocessor" >&5 | |
494 | +echo "configure:1210: checking how to run the C++ preprocessor" >&5 | |
495 | if test -z "$CXXCPP"; then | |
496 | if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then | |
497 | echo $ac_n "(cached) $ac_c" 1>&6 | |
498 | @@ -1115,12 +1219,12 @@ | |
499 | cross_compiling=$ac_cv_prog_cxx_cross | |
500 | CXXCPP="${CXX-g++} -E" | |
501 | cat > conftest.$ac_ext <<EOF | |
502 | -#line 1119 "configure" | |
503 | +#line 1223 "configure" | |
504 | #include "confdefs.h" | |
505 | #include <stdlib.h> | |
506 | EOF | |
507 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
508 | -{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
509 | +{ (eval echo configure:1228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
510 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
511 | if test -z "$ac_err"; then | |
512 | : | |
513 | @@ -1145,12 +1249,12 @@ | |
514 | echo "$ac_t""$CXXCPP" 1>&6 | |
515 | ||
516 | echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | |
517 | -echo "configure:1149: checking for ANSI C header files" >&5 | |
518 | +echo "configure:1253: checking for ANSI C header files" >&5 | |
519 | if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then | |
520 | echo $ac_n "(cached) $ac_c" 1>&6 | |
521 | else | |
522 | cat > conftest.$ac_ext <<EOF | |
523 | -#line 1154 "configure" | |
524 | +#line 1258 "configure" | |
525 | #include "confdefs.h" | |
526 | #include <stdlib.h> | |
527 | #include <stdarg.h> | |
528 | @@ -1158,7 +1262,7 @@ | |
529 | #include <float.h> | |
530 | EOF | |
531 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
532 | -{ (eval echo configure:1162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
533 | +{ (eval echo configure:1266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
534 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
535 | if test -z "$ac_err"; then | |
536 | rm -rf conftest* | |
537 | @@ -1175,7 +1279,7 @@ | |
538 | if test $ac_cv_header_stdc = yes; then | |
539 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | |
540 | cat > conftest.$ac_ext <<EOF | |
541 | -#line 1179 "configure" | |
542 | +#line 1283 "configure" | |
543 | #include "confdefs.h" | |
544 | #include <string.h> | |
545 | EOF | |
546 | @@ -1193,7 +1297,7 @@ | |
547 | if test $ac_cv_header_stdc = yes; then | |
548 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | |
549 | cat > conftest.$ac_ext <<EOF | |
550 | -#line 1197 "configure" | |
551 | +#line 1301 "configure" | |
552 | #include "confdefs.h" | |
553 | #include <stdlib.h> | |
554 | EOF | |
555 | @@ -1214,7 +1318,7 @@ | |
556 | : | |
557 | else | |
558 | cat > conftest.$ac_ext <<EOF | |
559 | -#line 1218 "configure" | |
560 | +#line 1322 "configure" | |
561 | #include "confdefs.h" | |
562 | #ifdef __cplusplus | |
563 | extern "C" void exit(int); | |
564 | @@ -1228,7 +1332,7 @@ | |
565 | exit (0); } | |
566 | ||
567 | EOF | |
568 | -if { (eval echo configure:1232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
569 | +if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
570 | then | |
571 | : | |
572 | else | |
573 | @@ -1255,17 +1359,17 @@ | |
574 | do | |
575 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
576 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
577 | -echo "configure:1259: checking for $ac_hdr" >&5 | |
578 | +echo "configure:1363: checking for $ac_hdr" >&5 | |
579 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
580 | echo $ac_n "(cached) $ac_c" 1>&6 | |
581 | else | |
582 | cat > conftest.$ac_ext <<EOF | |
583 | -#line 1264 "configure" | |
584 | +#line 1368 "configure" | |
585 | #include "confdefs.h" | |
586 | #include <$ac_hdr> | |
587 | EOF | |
588 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
589 | -{ (eval echo configure:1269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
590 | +{ (eval echo configure:1373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
591 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
592 | if test -z "$ac_err"; then | |
593 | rm -rf conftest* | |
594 | @@ -1294,17 +1398,17 @@ | |
595 | ||
596 | ac_safe=`echo "apt-pkg/init.h" | sed 'y%./+-%__p_%'` | |
597 | echo $ac_n "checking for apt-pkg/init.h""... $ac_c" 1>&6 | |
598 | -echo "configure:1298: checking for apt-pkg/init.h" >&5 | |
599 | +echo "configure:1402: checking for apt-pkg/init.h" >&5 | |
600 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
601 | echo $ac_n "(cached) $ac_c" 1>&6 | |
602 | else | |
603 | cat > conftest.$ac_ext <<EOF | |
604 | -#line 1303 "configure" | |
605 | +#line 1407 "configure" | |
606 | #include "confdefs.h" | |
607 | #include <apt-pkg/init.h> | |
608 | EOF | |
609 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
610 | -{ (eval echo configure:1308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
611 | +{ (eval echo configure:1412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
612 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
613 | if test -z "$ac_err"; then | |
614 | rm -rf conftest* | |
615 | @@ -1326,19 +1430,53 @@ | |
616 | { echo "configure: error: Can't find the APT header files -- please install libapt-pkg-dev" 1>&2; exit 1; } | |
617 | fi | |
618 | ||
619 | +ac_safe=`echo "rpm/dbindex.h" | sed 'y%./+-%__p_%'` | |
620 | +echo $ac_n "checking for rpm/dbindex.h""... $ac_c" 1>&6 | |
621 | +echo "configure:1436: checking for rpm/dbindex.h" >&5 | |
622 | +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
623 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
624 | +else | |
625 | + cat > conftest.$ac_ext <<EOF | |
626 | +#line 1441 "configure" | |
627 | +#include "confdefs.h" | |
628 | +#include <rpm/dbindex.h> | |
629 | +EOF | |
630 | +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
631 | +{ (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
632 | +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
633 | +if test -z "$ac_err"; then | |
634 | + rm -rf conftest* | |
635 | + eval "ac_cv_header_$ac_safe=yes" | |
636 | +else | |
637 | + echo "$ac_err" >&5 | |
638 | + echo "configure: failed program was:" >&5 | |
639 | + cat conftest.$ac_ext >&5 | |
640 | + rm -rf conftest* | |
641 | + eval "ac_cv_header_$ac_safe=no" | |
642 | +fi | |
643 | +rm -f conftest* | |
644 | +fi | |
645 | +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
646 | + echo "$ac_t""yes" 1>&6 | |
647 | + CXXFLAGS="$CXXFLAGS -I/usr/include/rpm" | |
648 | +else | |
649 | + echo "$ac_t""no" 1>&6 | |
650 | +{ echo "configure: error: Can't find the RPM header files -- please install librpm-devel" 1>&2; exit 1; } | |
651 | +fi | |
652 | + | |
653 | ac_safe=`echo "apt-pkg/policy.h" | sed 'y%./+-%__p_%'` | |
654 | echo $ac_n "checking for apt-pkg/policy.h""... $ac_c" 1>&6 | |
655 | -echo "configure:1332: checking for apt-pkg/policy.h" >&5 | |
656 | +echo "configure:1470: checking for apt-pkg/policy.h" >&5 | |
657 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
658 | echo $ac_n "(cached) $ac_c" 1>&6 | |
659 | else | |
660 | cat > conftest.$ac_ext <<EOF | |
661 | -#line 1337 "configure" | |
662 | +#line 1475 "configure" | |
663 | #include "confdefs.h" | |
664 | #include <apt-pkg/policy.h> | |
665 | EOF | |
666 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
667 | -{ (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
668 | +{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
669 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
670 | if test -z "$ac_err"; then | |
671 | rm -rf conftest* | |
672 | @@ -1366,17 +1504,17 @@ | |
673 | then | |
674 | ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` | |
675 | echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 | |
676 | -echo "configure:1370: checking for pthread.h" >&5 | |
677 | +echo "configure:1508: checking for pthread.h" >&5 | |
678 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
679 | echo $ac_n "(cached) $ac_c" 1>&6 | |
680 | else | |
681 | cat > conftest.$ac_ext <<EOF | |
682 | -#line 1375 "configure" | |
683 | +#line 1513 "configure" | |
684 | #include "confdefs.h" | |
685 | #include <pthread.h> | |
686 | EOF | |
687 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
688 | -{ (eval echo configure:1380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
689 | +{ (eval echo configure:1518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
690 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
691 | if test -z "$ac_err"; then | |
692 | rm -rf conftest* | |
693 | @@ -1410,7 +1548,7 @@ | |
694 | # Extract the first word of "gcc", so it can be a program name with args. | |
695 | set dummy gcc; ac_word=$2 | |
696 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
697 | -echo "configure:1414: checking for $ac_word" >&5 | |
698 | +echo "configure:1552: checking for $ac_word" >&5 | |
699 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
700 | echo $ac_n "(cached) $ac_c" 1>&6 | |
701 | else | |
702 | @@ -1440,7 +1578,7 @@ | |
703 | # Extract the first word of "cc", so it can be a program name with args. | |
704 | set dummy cc; ac_word=$2 | |
705 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
706 | -echo "configure:1444: checking for $ac_word" >&5 | |
707 | +echo "configure:1582: checking for $ac_word" >&5 | |
708 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
709 | echo $ac_n "(cached) $ac_c" 1>&6 | |
710 | else | |
711 | @@ -1491,7 +1629,7 @@ | |
712 | # Extract the first word of "cl", so it can be a program name with args. | |
713 | set dummy cl; ac_word=$2 | |
714 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
715 | -echo "configure:1495: checking for $ac_word" >&5 | |
716 | +echo "configure:1633: checking for $ac_word" >&5 | |
717 | if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then | |
718 | echo $ac_n "(cached) $ac_c" 1>&6 | |
719 | else | |
720 | @@ -1523,7 +1661,7 @@ | |
721 | fi | |
722 | ||
723 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | |
724 | -echo "configure:1527: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
725 | +echo "configure:1665: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 | |
726 | ||
727 | ac_ext=c | |
728 | # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | |
729 | @@ -1534,12 +1672,12 @@ | |
730 | ||
731 | cat > conftest.$ac_ext << EOF | |
732 | ||
733 | -#line 1538 "configure" | |
734 | +#line 1676 "configure" | |
735 | #include "confdefs.h" | |
736 | ||
737 | main(){return(0);} | |
738 | EOF | |
739 | -if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
740 | +if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
741 | ac_cv_prog_cc_works=yes | |
742 | # If we can't run a trivial program, we are probably using a cross compiler. | |
743 | if (./conftest; exit) 2>/dev/null; then | |
744 | @@ -1565,12 +1703,12 @@ | |
745 | { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } | |
746 | fi | |
747 | echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | |
748 | -echo "configure:1569: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
749 | +echo "configure:1707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 | |
750 | echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 | |
751 | cross_compiling=$ac_cv_prog_cc_cross | |
752 | ||
753 | echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 | |
754 | -echo "configure:1574: checking whether we are using GNU C" >&5 | |
755 | +echo "configure:1712: checking whether we are using GNU C" >&5 | |
756 | if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then | |
757 | echo $ac_n "(cached) $ac_c" 1>&6 | |
758 | else | |
759 | @@ -1579,7 +1717,7 @@ | |
760 | yes; | |
761 | #endif | |
762 | EOF | |
763 | -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
764 | +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then | |
765 | ac_cv_prog_gcc=yes | |
766 | else | |
767 | ac_cv_prog_gcc=no | |
768 | @@ -1598,7 +1736,7 @@ | |
769 | ac_save_CFLAGS="$CFLAGS" | |
770 | CFLAGS= | |
771 | echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 | |
772 | -echo "configure:1602: checking whether ${CC-cc} accepts -g" >&5 | |
773 | +echo "configure:1740: checking whether ${CC-cc} accepts -g" >&5 | |
774 | if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then | |
775 | echo $ac_n "(cached) $ac_c" 1>&6 | |
776 | else | |
777 | @@ -1636,7 +1774,7 @@ | |
778 | fi | |
779 | ||
780 | echo $ac_n "checking host system type""... $ac_c" 1>&6 | |
781 | -echo "configure:1640: checking host system type" >&5 | |
782 | +echo "configure:1778: checking host system type" >&5 | |
783 | ||
784 | host_alias=$host | |
785 | case "$host_alias" in | |
786 | @@ -1658,7 +1796,7 @@ | |
787 | ||
788 | ||
789 | echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 | |
790 | -echo "configure:1662: checking for strerror in -lcposix" >&5 | |
791 | +echo "configure:1800: checking for strerror in -lcposix" >&5 | |
792 | ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` | |
793 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | |
794 | echo $ac_n "(cached) $ac_c" 1>&6 | |
795 | @@ -1666,7 +1804,7 @@ | |
796 | ac_save_LIBS="$LIBS" | |
797 | LIBS="-lcposix $LIBS" | |
798 | cat > conftest.$ac_ext <<EOF | |
799 | -#line 1670 "configure" | |
800 | +#line 1808 "configure" | |
801 | #include "confdefs.h" | |
802 | /* Override any gcc2 internal prototype to avoid an error. */ | |
803 | #ifdef __cplusplus | |
804 | @@ -1680,7 +1818,7 @@ | |
805 | strerror() | |
806 | ; return 0; } | |
807 | EOF | |
808 | -if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
809 | +if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
810 | rm -rf conftest* | |
811 | eval "ac_cv_lib_$ac_lib_var=yes" | |
812 | else | |
813 | @@ -1702,128 +1840,13 @@ | |
814 | ||
815 | ||
816 | ||
817 | -echo $ac_n "checking for working const""... $ac_c" 1>&6 | |
818 | -echo "configure:1707: checking for working const" >&5 | |
819 | -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then | |
820 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
821 | -else | |
822 | - cat > conftest.$ac_ext <<EOF | |
823 | -#line 1712 "configure" | |
824 | -#include "confdefs.h" | |
825 | - | |
826 | -int main() { | |
827 | - | |
828 | -/* Ultrix mips cc rejects this. */ | |
829 | -typedef int charset[2]; const charset x; | |
830 | -/* SunOS 4.1.1 cc rejects this. */ | |
831 | -char const *const *ccp; | |
832 | -char **p; | |
833 | -/* NEC SVR4.0.2 mips cc rejects this. */ | |
834 | -struct point {int x, y;}; | |
835 | -static struct point const zero = {0,0}; | |
836 | -/* AIX XL C 1.02.0.0 rejects this. | |
837 | - It does not let you subtract one const X* pointer from another in an arm | |
838 | - of an if-expression whose if-part is not a constant expression */ | |
839 | -const char *g = "string"; | |
840 | -ccp = &g + (g ? g-g : 0); | |
841 | -/* HPUX 7.0 cc rejects these. */ | |
842 | -++ccp; | |
843 | -p = (char**) ccp; | |
844 | -ccp = (char const *const *) p; | |
845 | -{ /* SCO 3.2v4 cc rejects this. */ | |
846 | - char *t; | |
847 | - char const *s = 0 ? (char *) 0 : (char const *) 0; | |
848 | - | |
849 | - *t++ = 0; | |
850 | -} | |
851 | -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ | |
852 | - int x[] = {25, 17}; | |
853 | - const int *foo = &x[0]; | |
854 | - ++foo; | |
855 | -} | |
856 | -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ | |
857 | - typedef const int *iptr; | |
858 | - iptr p = 0; | |
859 | - ++p; | |
860 | -} | |
861 | -{ /* AIX XL C 1.02.0.0 rejects this saying | |
862 | - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ | |
863 | - struct s { int j; const int *ap[3]; }; | |
864 | - struct s *b; b->j = 5; | |
865 | -} | |
866 | -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ | |
867 | - const int foo = 10; | |
868 | -} | |
869 | - | |
870 | -; return 0; } | |
871 | -EOF | |
872 | -if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
873 | - rm -rf conftest* | |
874 | - ac_cv_c_const=yes | |
875 | -else | |
876 | - echo "configure: failed program was:" >&5 | |
877 | - cat conftest.$ac_ext >&5 | |
878 | - rm -rf conftest* | |
879 | - ac_cv_c_const=no | |
880 | -fi | |
881 | -rm -f conftest* | |
882 | -fi | |
883 | - | |
884 | -echo "$ac_t""$ac_cv_c_const" 1>&6 | |
885 | -if test $ac_cv_c_const = no; then | |
886 | - cat >> confdefs.h <<\EOF | |
887 | -#define const | |
888 | -EOF | |
889 | - | |
890 | -fi | |
891 | - | |
892 | -echo $ac_n "checking for inline""... $ac_c" 1>&6 | |
893 | -echo "configure:1782: checking for inline" >&5 | |
894 | -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then | |
895 | - echo $ac_n "(cached) $ac_c" 1>&6 | |
896 | -else | |
897 | - ac_cv_c_inline=no | |
898 | -for ac_kw in inline __inline__ __inline; do | |
899 | - cat > conftest.$ac_ext <<EOF | |
900 | -#line 1789 "configure" | |
901 | -#include "confdefs.h" | |
902 | - | |
903 | -int main() { | |
904 | -} $ac_kw foo() { | |
905 | -; return 0; } | |
906 | -EOF | |
907 | -if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
908 | - rm -rf conftest* | |
909 | - ac_cv_c_inline=$ac_kw; break | |
910 | -else | |
911 | - echo "configure: failed program was:" >&5 | |
912 | - cat conftest.$ac_ext >&5 | |
913 | -fi | |
914 | -rm -f conftest* | |
915 | -done | |
916 | - | |
917 | -fi | |
918 | - | |
919 | -echo "$ac_t""$ac_cv_c_inline" 1>&6 | |
920 | -case "$ac_cv_c_inline" in | |
921 | - inline | yes) ;; | |
922 | - no) cat >> confdefs.h <<\EOF | |
923 | -#define inline | |
924 | -EOF | |
925 | - ;; | |
926 | - *) cat >> confdefs.h <<EOF | |
927 | -#define inline $ac_cv_c_inline | |
928 | -EOF | |
929 | - ;; | |
930 | -esac | |
931 | - | |
932 | echo $ac_n "checking for off_t""... $ac_c" 1>&6 | |
933 | -echo "configure:1822: checking for off_t" >&5 | |
934 | +echo "configure:1845: checking for off_t" >&5 | |
935 | if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then | |
936 | echo $ac_n "(cached) $ac_c" 1>&6 | |
937 | else | |
938 | cat > conftest.$ac_ext <<EOF | |
939 | -#line 1827 "configure" | |
940 | +#line 1850 "configure" | |
941 | #include "confdefs.h" | |
942 | #include <sys/types.h> | |
943 | #if STDC_HEADERS | |
944 | @@ -1851,12 +1874,12 @@ | |
945 | fi | |
946 | ||
947 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
948 | -echo "configure:1855: checking for size_t" >&5 | |
949 | +echo "configure:1878: checking for size_t" >&5 | |
950 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | |
951 | echo $ac_n "(cached) $ac_c" 1>&6 | |
952 | else | |
953 | cat > conftest.$ac_ext <<EOF | |
954 | -#line 1860 "configure" | |
955 | +#line 1883 "configure" | |
956 | #include "confdefs.h" | |
957 | #include <sys/types.h> | |
958 | #if STDC_HEADERS | |
959 | @@ -1886,19 +1909,19 @@ | |
960 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | |
961 | # for constant arguments. Useless! | |
962 | echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 | |
963 | -echo "configure:1890: checking for working alloca.h" >&5 | |
964 | +echo "configure:1913: checking for working alloca.h" >&5 | |
965 | if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then | |
966 | echo $ac_n "(cached) $ac_c" 1>&6 | |
967 | else | |
968 | cat > conftest.$ac_ext <<EOF | |
969 | -#line 1895 "configure" | |
970 | +#line 1918 "configure" | |
971 | #include "confdefs.h" | |
972 | #include <alloca.h> | |
973 | int main() { | |
974 | char *p = alloca(2 * sizeof(int)); | |
975 | ; return 0; } | |
976 | EOF | |
977 | -if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
978 | +if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
979 | rm -rf conftest* | |
980 | ac_cv_header_alloca_h=yes | |
981 | else | |
982 | @@ -1919,12 +1942,12 @@ | |
983 | fi | |
984 | ||
985 | echo $ac_n "checking for alloca""... $ac_c" 1>&6 | |
986 | -echo "configure:1923: checking for alloca" >&5 | |
987 | +echo "configure:1946: checking for alloca" >&5 | |
988 | if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then | |
989 | echo $ac_n "(cached) $ac_c" 1>&6 | |
990 | else | |
991 | cat > conftest.$ac_ext <<EOF | |
992 | -#line 1928 "configure" | |
993 | +#line 1951 "configure" | |
994 | #include "confdefs.h" | |
995 | ||
996 | #ifdef __GNUC__ | |
997 | @@ -1952,7 +1975,7 @@ | |
998 | char *p = (char *) alloca(1); | |
999 | ; return 0; } | |
1000 | EOF | |
1001 | -if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1002 | +if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1003 | rm -rf conftest* | |
1004 | ac_cv_func_alloca_works=yes | |
1005 | else | |
1006 | @@ -1984,12 +2007,12 @@ | |
1007 | ||
1008 | ||
1009 | echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 | |
1010 | -echo "configure:1988: checking whether alloca needs Cray hooks" >&5 | |
1011 | +echo "configure:2011: checking whether alloca needs Cray hooks" >&5 | |
1012 | if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then | |
1013 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1014 | else | |
1015 | cat > conftest.$ac_ext <<EOF | |
1016 | -#line 1993 "configure" | |
1017 | +#line 2016 "configure" | |
1018 | #include "confdefs.h" | |
1019 | #if defined(CRAY) && ! defined(CRAY2) | |
1020 | webecray | |
1021 | @@ -2014,12 +2037,12 @@ | |
1022 | if test $ac_cv_os_cray = yes; then | |
1023 | for ac_func in _getb67 GETB67 getb67; do | |
1024 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1025 | -echo "configure:2018: checking for $ac_func" >&5 | |
1026 | +echo "configure:2041: checking for $ac_func" >&5 | |
1027 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1028 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1029 | else | |
1030 | cat > conftest.$ac_ext <<EOF | |
1031 | -#line 2023 "configure" | |
1032 | +#line 2046 "configure" | |
1033 | #include "confdefs.h" | |
1034 | /* System header to define __stub macros and hopefully few prototypes, | |
1035 | which can conflict with char $ac_func(); below. */ | |
1036 | @@ -2045,7 +2068,7 @@ | |
1037 | ||
1038 | ; return 0; } | |
1039 | EOF | |
1040 | -if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1041 | +if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1042 | rm -rf conftest* | |
1043 | eval "ac_cv_func_$ac_func=yes" | |
1044 | else | |
1045 | @@ -2072,7 +2095,7 @@ | |
1046 | fi | |
1047 | ||
1048 | echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 | |
1049 | -echo "configure:2076: checking stack direction for C alloca" >&5 | |
1050 | +echo "configure:2099: checking stack direction for C alloca" >&5 | |
1051 | if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then | |
1052 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1053 | else | |
1054 | @@ -2080,7 +2103,7 @@ | |
1055 | ac_cv_c_stack_direction=0 | |
1056 | else | |
1057 | cat > conftest.$ac_ext <<EOF | |
1058 | -#line 2084 "configure" | |
1059 | +#line 2107 "configure" | |
1060 | #include "confdefs.h" | |
1061 | #ifdef __cplusplus | |
1062 | extern "C" void exit(int); | |
1063 | @@ -2102,7 +2125,7 @@ | |
1064 | exit (find_stack_direction() < 0); | |
1065 | } | |
1066 | EOF | |
1067 | -if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1068 | +if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1069 | then | |
1070 | ac_cv_c_stack_direction=1 | |
1071 | else | |
1072 | @@ -2127,17 +2150,17 @@ | |
1073 | do | |
1074 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1075 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1076 | -echo "configure:2131: checking for $ac_hdr" >&5 | |
1077 | +echo "configure:2154: checking for $ac_hdr" >&5 | |
1078 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1079 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1080 | else | |
1081 | cat > conftest.$ac_ext <<EOF | |
1082 | -#line 2136 "configure" | |
1083 | +#line 2159 "configure" | |
1084 | #include "confdefs.h" | |
1085 | #include <$ac_hdr> | |
1086 | EOF | |
1087 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1088 | -{ (eval echo configure:2141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1089 | +{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1090 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1091 | if test -z "$ac_err"; then | |
1092 | rm -rf conftest* | |
1093 | @@ -2166,12 +2189,12 @@ | |
1094 | for ac_func in getpagesize | |
1095 | do | |
1096 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1097 | -echo "configure:2170: checking for $ac_func" >&5 | |
1098 | +echo "configure:2193: checking for $ac_func" >&5 | |
1099 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1100 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1101 | else | |
1102 | cat > conftest.$ac_ext <<EOF | |
1103 | -#line 2175 "configure" | |
1104 | +#line 2198 "configure" | |
1105 | #include "confdefs.h" | |
1106 | /* System header to define __stub macros and hopefully few prototypes, | |
1107 | which can conflict with char $ac_func(); below. */ | |
1108 | @@ -2197,7 +2220,7 @@ | |
1109 | ||
1110 | ; return 0; } | |
1111 | EOF | |
1112 | -if { (eval echo configure:2201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1113 | +if { (eval echo configure:2224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1114 | rm -rf conftest* | |
1115 | eval "ac_cv_func_$ac_func=yes" | |
1116 | else | |
1117 | @@ -2222,7 +2245,7 @@ | |
1118 | done | |
1119 | ||
1120 | echo $ac_n "checking for working mmap""... $ac_c" 1>&6 | |
1121 | -echo "configure:2226: checking for working mmap" >&5 | |
1122 | +echo "configure:2249: checking for working mmap" >&5 | |
1123 | if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then | |
1124 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1125 | else | |
1126 | @@ -2230,7 +2253,7 @@ | |
1127 | ac_cv_func_mmap_fixed_mapped=no | |
1128 | else | |
1129 | cat > conftest.$ac_ext <<EOF | |
1130 | -#line 2234 "configure" | |
1131 | +#line 2257 "configure" | |
1132 | #include "confdefs.h" | |
1133 | #ifdef __cplusplus | |
1134 | extern "C" void exit(int); | |
1135 | @@ -2373,7 +2396,7 @@ | |
1136 | } | |
1137 | ||
1138 | EOF | |
1139 | -if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1140 | +if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
1141 | then | |
1142 | ac_cv_func_mmap_fixed_mapped=yes | |
1143 | else | |
1144 | @@ -2395,23 +2418,23 @@ | |
1145 | ||
1146 | fi | |
1147 | ||
1148 | - | |
1149 | + | |
1150 | for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ | |
1151 | stdlib.h string.h unistd.h sys/param.h | |
1152 | do | |
1153 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
1154 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
1155 | -echo "configure:2405: checking for $ac_hdr" >&5 | |
1156 | +echo "configure:2428: checking for $ac_hdr" >&5 | |
1157 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1158 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1159 | else | |
1160 | cat > conftest.$ac_ext <<EOF | |
1161 | -#line 2410 "configure" | |
1162 | +#line 2433 "configure" | |
1163 | #include "confdefs.h" | |
1164 | #include <$ac_hdr> | |
1165 | EOF | |
1166 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1167 | -{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1168 | +{ (eval echo configure:2438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1169 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1170 | if test -z "$ac_err"; then | |
1171 | rm -rf conftest* | |
1172 | @@ -2442,12 +2465,12 @@ | |
1173 | __argz_count __argz_stringify __argz_next | |
1174 | do | |
1175 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1176 | -echo "configure:2446: checking for $ac_func" >&5 | |
1177 | +echo "configure:2469: checking for $ac_func" >&5 | |
1178 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1179 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1180 | else | |
1181 | cat > conftest.$ac_ext <<EOF | |
1182 | -#line 2451 "configure" | |
1183 | +#line 2474 "configure" | |
1184 | #include "confdefs.h" | |
1185 | /* System header to define __stub macros and hopefully few prototypes, | |
1186 | which can conflict with char $ac_func(); below. */ | |
1187 | @@ -2473,7 +2496,7 @@ | |
1188 | ||
1189 | ; return 0; } | |
1190 | EOF | |
1191 | -if { (eval echo configure:2477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1192 | +if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1193 | rm -rf conftest* | |
1194 | eval "ac_cv_func_$ac_func=yes" | |
1195 | else | |
1196 | @@ -2500,7 +2523,7 @@ | |
1197 | ||
1198 | ||
1199 | echo $ac_n "checking for iconv""... $ac_c" 1>&6 | |
1200 | -echo "configure:2504: checking for iconv" >&5 | |
1201 | +echo "configure:2527: checking for iconv" >&5 | |
1202 | if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then | |
1203 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1204 | else | |
1205 | @@ -2508,7 +2531,7 @@ | |
1206 | am_cv_func_iconv="no, consider installing GNU libiconv" | |
1207 | am_cv_lib_iconv=no | |
1208 | cat > conftest.$ac_ext <<EOF | |
1209 | -#line 2512 "configure" | |
1210 | +#line 2535 "configure" | |
1211 | #include "confdefs.h" | |
1212 | #include <stdlib.h> | |
1213 | #include <iconv.h> | |
1214 | @@ -2518,7 +2541,7 @@ | |
1215 | iconv_close(cd); | |
1216 | ; return 0; } | |
1217 | EOF | |
1218 | -if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1219 | +if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1220 | rm -rf conftest* | |
1221 | am_cv_func_iconv=yes | |
1222 | else | |
1223 | @@ -2530,7 +2553,7 @@ | |
1224 | am_save_LIBS="$LIBS" | |
1225 | LIBS="$LIBS -liconv" | |
1226 | cat > conftest.$ac_ext <<EOF | |
1227 | -#line 2534 "configure" | |
1228 | +#line 2557 "configure" | |
1229 | #include "confdefs.h" | |
1230 | #include <stdlib.h> | |
1231 | #include <iconv.h> | |
1232 | @@ -2540,7 +2563,7 @@ | |
1233 | iconv_close(cd); | |
1234 | ; return 0; } | |
1235 | EOF | |
1236 | -if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1237 | +if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1238 | rm -rf conftest* | |
1239 | am_cv_lib_iconv=yes | |
1240 | am_cv_func_iconv=yes | |
1241 | @@ -2561,13 +2584,13 @@ | |
1242 | EOF | |
1243 | ||
1244 | echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 | |
1245 | -echo "configure:2565: checking for iconv declaration" >&5 | |
1246 | +echo "configure:2588: checking for iconv declaration" >&5 | |
1247 | if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then | |
1248 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1249 | else | |
1250 | ||
1251 | cat > conftest.$ac_ext <<EOF | |
1252 | -#line 2571 "configure" | |
1253 | +#line 2594 "configure" | |
1254 | #include "confdefs.h" | |
1255 | ||
1256 | #include <stdlib.h> | |
1257 | @@ -2586,7 +2609,7 @@ | |
1258 | ||
1259 | ; return 0; } | |
1260 | EOF | |
1261 | -if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1262 | +if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
1263 | rm -rf conftest* | |
1264 | am_cv_proto_iconv_arg1="" | |
1265 | else | |
1266 | @@ -2615,19 +2638,19 @@ | |
1267 | ||
1268 | ||
1269 | echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 | |
1270 | -echo "configure:2619: checking for nl_langinfo and CODESET" >&5 | |
1271 | +echo "configure:2642: checking for nl_langinfo and CODESET" >&5 | |
1272 | if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then | |
1273 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1274 | else | |
1275 | cat > conftest.$ac_ext <<EOF | |
1276 | -#line 2624 "configure" | |
1277 | +#line 2647 "configure" | |
1278 | #include "confdefs.h" | |
1279 | #include <langinfo.h> | |
1280 | int main() { | |
1281 | char* cs = nl_langinfo(CODESET); | |
1282 | ; return 0; } | |
1283 | EOF | |
1284 | -if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1285 | +if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1286 | rm -rf conftest* | |
1287 | am_cv_langinfo_codeset=yes | |
1288 | else | |
1289 | @@ -2650,19 +2673,19 @@ | |
1290 | ||
1291 | if test $ac_cv_header_locale_h = yes; then | |
1292 | echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | |
1293 | -echo "configure:2654: checking for LC_MESSAGES" >&5 | |
1294 | +echo "configure:2677: checking for LC_MESSAGES" >&5 | |
1295 | if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then | |
1296 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1297 | else | |
1298 | cat > conftest.$ac_ext <<EOF | |
1299 | -#line 2659 "configure" | |
1300 | +#line 2682 "configure" | |
1301 | #include "confdefs.h" | |
1302 | #include <locale.h> | |
1303 | int main() { | |
1304 | return LC_MESSAGES | |
1305 | ; return 0; } | |
1306 | EOF | |
1307 | -if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1308 | +if { (eval echo configure:2689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1309 | rm -rf conftest* | |
1310 | am_cv_val_LC_MESSAGES=yes | |
1311 | else | |
1312 | @@ -2683,7 +2706,7 @@ | |
1313 | fi | |
1314 | fi | |
1315 | echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 | |
1316 | -echo "configure:2687: checking whether NLS is requested" >&5 | |
1317 | +echo "configure:2710: checking whether NLS is requested" >&5 | |
1318 | # Check whether --enable-nls or --disable-nls was given. | |
1319 | if test "${enable_nls+set}" = set; then | |
1320 | enableval="$enable_nls" | |
1321 | @@ -2704,7 +2727,7 @@ | |
1322 | EOF | |
1323 | ||
1324 | echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 | |
1325 | -echo "configure:2708: checking whether included gettext is requested" >&5 | |
1326 | +echo "configure:2731: checking whether included gettext is requested" >&5 | |
1327 | # Check whether --with-included-gettext or --without-included-gettext was given. | |
1328 | if test "${with_included_gettext+set}" = set; then | |
1329 | withval="$with_included_gettext" | |
1330 | @@ -2724,17 +2747,17 @@ | |
1331 | ||
1332 | ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` | |
1333 | echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 | |
1334 | -echo "configure:2728: checking for libintl.h" >&5 | |
1335 | +echo "configure:2751: checking for libintl.h" >&5 | |
1336 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
1337 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1338 | else | |
1339 | cat > conftest.$ac_ext <<EOF | |
1340 | -#line 2733 "configure" | |
1341 | +#line 2756 "configure" | |
1342 | #include "confdefs.h" | |
1343 | #include <libintl.h> | |
1344 | EOF | |
1345 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
1346 | -{ (eval echo configure:2738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1347 | +{ (eval echo configure:2761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
1348 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
1349 | if test -z "$ac_err"; then | |
1350 | rm -rf conftest* | |
1351 | @@ -2751,12 +2774,12 @@ | |
1352 | if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
1353 | echo "$ac_t""yes" 1>&6 | |
1354 | echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 | |
1355 | -echo "configure:2755: checking for GNU gettext in libc" >&5 | |
1356 | +echo "configure:2778: checking for GNU gettext in libc" >&5 | |
1357 | if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then | |
1358 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1359 | else | |
1360 | cat > conftest.$ac_ext <<EOF | |
1361 | -#line 2760 "configure" | |
1362 | +#line 2783 "configure" | |
1363 | #include "confdefs.h" | |
1364 | #include <libintl.h> | |
1365 | extern int _nl_msg_cat_cntr; | |
1366 | @@ -2765,7 +2788,7 @@ | |
1367 | return (int) gettext ("") + _nl_msg_cat_cntr | |
1368 | ; return 0; } | |
1369 | EOF | |
1370 | -if { (eval echo configure:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1371 | +if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1372 | rm -rf conftest* | |
1373 | gt_cv_func_gnugettext1_libc=yes | |
1374 | else | |
1375 | @@ -2781,14 +2804,14 @@ | |
1376 | ||
1377 | if test "$gt_cv_func_gnugettext1_libc" != "yes"; then | |
1378 | echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 | |
1379 | -echo "configure:2785: checking for GNU gettext in libintl" >&5 | |
1380 | +echo "configure:2808: checking for GNU gettext in libintl" >&5 | |
1381 | if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then | |
1382 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1383 | else | |
1384 | gt_save_LIBS="$LIBS" | |
1385 | LIBS="$LIBS -lintl" | |
1386 | cat > conftest.$ac_ext <<EOF | |
1387 | -#line 2792 "configure" | |
1388 | +#line 2815 "configure" | |
1389 | #include "confdefs.h" | |
1390 | #include <libintl.h> | |
1391 | extern int _nl_msg_cat_cntr; | |
1392 | @@ -2797,7 +2820,7 @@ | |
1393 | return (int) gettext ("") + _nl_msg_cat_cntr | |
1394 | ; return 0; } | |
1395 | EOF | |
1396 | -if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1397 | +if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1398 | rm -rf conftest* | |
1399 | gt_cv_func_gnugettext1_libintl=yes | |
1400 | else | |
1401 | @@ -2822,12 +2845,12 @@ | |
1402 | for ac_func in dcgettext | |
1403 | do | |
1404 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1405 | -echo "configure:2826: checking for $ac_func" >&5 | |
1406 | +echo "configure:2849: checking for $ac_func" >&5 | |
1407 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1408 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1409 | else | |
1410 | cat > conftest.$ac_ext <<EOF | |
1411 | -#line 2831 "configure" | |
1412 | +#line 2854 "configure" | |
1413 | #include "confdefs.h" | |
1414 | /* System header to define __stub macros and hopefully few prototypes, | |
1415 | which can conflict with char $ac_func(); below. */ | |
1416 | @@ -2853,7 +2876,7 @@ | |
1417 | ||
1418 | ; return 0; } | |
1419 | EOF | |
1420 | -if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1421 | +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1422 | rm -rf conftest* | |
1423 | eval "ac_cv_func_$ac_func=yes" | |
1424 | else | |
1425 | @@ -2880,7 +2903,7 @@ | |
1426 | # Extract the first word of "msgfmt", so it can be a program name with args. | |
1427 | set dummy msgfmt; ac_word=$2 | |
1428 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1429 | -echo "configure:2884: checking for $ac_word" >&5 | |
1430 | +echo "configure:2907: checking for $ac_word" >&5 | |
1431 | if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then | |
1432 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1433 | else | |
1434 | @@ -2914,7 +2937,7 @@ | |
1435 | # Extract the first word of "gmsgfmt", so it can be a program name with args. | |
1436 | set dummy gmsgfmt; ac_word=$2 | |
1437 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1438 | -echo "configure:2918: checking for $ac_word" >&5 | |
1439 | +echo "configure:2941: checking for $ac_word" >&5 | |
1440 | if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then | |
1441 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1442 | else | |
1443 | @@ -2951,7 +2974,7 @@ | |
1444 | # Extract the first word of "xgettext", so it can be a program name with args. | |
1445 | set dummy xgettext; ac_word=$2 | |
1446 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1447 | -echo "configure:2955: checking for $ac_word" >&5 | |
1448 | +echo "configure:2978: checking for $ac_word" >&5 | |
1449 | if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then | |
1450 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1451 | else | |
1452 | @@ -3003,7 +3026,7 @@ | |
1453 | # Extract the first word of "msgfmt", so it can be a program name with args. | |
1454 | set dummy msgfmt; ac_word=$2 | |
1455 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1456 | -echo "configure:3007: checking for $ac_word" >&5 | |
1457 | +echo "configure:3030: checking for $ac_word" >&5 | |
1458 | if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then | |
1459 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1460 | else | |
1461 | @@ -3037,7 +3060,7 @@ | |
1462 | # Extract the first word of "gmsgfmt", so it can be a program name with args. | |
1463 | set dummy gmsgfmt; ac_word=$2 | |
1464 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1465 | -echo "configure:3041: checking for $ac_word" >&5 | |
1466 | +echo "configure:3064: checking for $ac_word" >&5 | |
1467 | if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then | |
1468 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1469 | else | |
1470 | @@ -3073,7 +3096,7 @@ | |
1471 | # Extract the first word of "xgettext", so it can be a program name with args. | |
1472 | set dummy xgettext; ac_word=$2 | |
1473 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1474 | -echo "configure:3077: checking for $ac_word" >&5 | |
1475 | +echo "configure:3100: checking for $ac_word" >&5 | |
1476 | if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then | |
1477 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1478 | else | |
1479 | @@ -3139,7 +3162,7 @@ | |
1480 | # Extract the first word of "$ac_prog", so it can be a program name with args. | |
1481 | set dummy $ac_prog; ac_word=$2 | |
1482 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | |
1483 | -echo "configure:3143: checking for $ac_word" >&5 | |
1484 | +echo "configure:3166: checking for $ac_word" >&5 | |
1485 | if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then | |
1486 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1487 | else | |
1488 | @@ -3172,7 +3195,7 @@ | |
1489 | ac_verc_fail=yes | |
1490 | else | |
1491 | echo $ac_n "checking version of bison""... $ac_c" 1>&6 | |
1492 | -echo "configure:3176: checking version of bison" >&5 | |
1493 | +echo "configure:3199: checking version of bison" >&5 | |
1494 | ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'` | |
1495 | case $ac_prog_version in | |
1496 | '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; | |
1497 | @@ -3213,7 +3236,7 @@ | |
1498 | LINGUAS= | |
1499 | else | |
1500 | echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 | |
1501 | -echo "configure:3217: checking for catalogs to be installed" >&5 | |
1502 | +echo "configure:3240: checking for catalogs to be installed" >&5 | |
1503 | NEW_LINGUAS= | |
1504 | for presentlang in $ALL_LINGUAS; do | |
1505 | useit=no | |
1506 | @@ -3284,12 +3307,12 @@ | |
1507 | ||
1508 | ||
1509 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | |
1510 | -echo "configure:3288: checking for size_t" >&5 | |
1511 | +echo "configure:3311: checking for size_t" >&5 | |
1512 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | |
1513 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1514 | else | |
1515 | cat > conftest.$ac_ext <<EOF | |
1516 | -#line 3293 "configure" | |
1517 | +#line 3316 "configure" | |
1518 | #include "confdefs.h" | |
1519 | #include <sys/types.h> | |
1520 | #if STDC_HEADERS | |
1521 | @@ -3320,12 +3343,12 @@ | |
1522 | for ac_func in strdup | |
1523 | do | |
1524 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | |
1525 | -echo "configure:3324: checking for $ac_func" >&5 | |
1526 | +echo "configure:3347: checking for $ac_func" >&5 | |
1527 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | |
1528 | echo $ac_n "(cached) $ac_c" 1>&6 | |
1529 | else | |
1530 | cat > conftest.$ac_ext <<EOF | |
1531 | -#line 3329 "configure" | |
1532 | +#line 3352 "configure" | |
1533 | #include "confdefs.h" | |
1534 | /* System header to define __stub macros and hopefully few prototypes, | |
1535 | which can conflict with char $ac_func(); below. */ | |
1536 | @@ -3351,7 +3374,7 @@ | |
1537 | ||
1538 | ; return 0; } | |
1539 | EOF | |
1540 | -if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1541 | +if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1542 | rm -rf conftest* | |
1543 | eval "ac_cv_func_$ac_func=yes" | |
1544 | else | |
1545 | diff -rud aptitude-0.0.8.6/configure.in aptitude-0.0.8.6-new/configure.in | |
1546 | --- aptitude-0.0.8.6/configure.in Thu May 3 21:29:25 2001 | |
1547 | +++ aptitude-0.0.8.6-new/configure.in Fri May 18 21:35:54 2001 | |
1548 | @@ -16,7 +16,10 @@ | |
1549 | ||
1550 | dnl Checks for libraries. | |
1551 | AC_CHECK_LIB(curses, initscr) | |
1552 | -AC_CHECK_LIB(apt-pkg, main, , AC_MSG_ERROR([Can't find the APT libraries -- please install libapt-pkg-dev])) | |
1553 | +AC_CHECK_LIB(popt, poptGetArg, , AC_MSG_ERROR([Can't find the popt library -- please install popt-devel])) | |
1554 | +AC_CHECK_LIB(rpm, rpmdbOpen, , AC_MSG_ERROR([Can't find the RPM library -- please install rpm-devel])) | |
1555 | +AC_CHECK_LIB(apt-pkg, main, , AC_MSG_ERROR([Can't find the APT libraries -- please install libapt-pkg-devel])) | |
1556 | + | |
1557 | AC_CHECK_LIB(pthread, main, | |
1558 | HAVE_LIBPTHREAD=1 | |
1559 | , AC_MSG_WARN([Can't find the POSIX thread libraries -- configuring without threads])) | |
1560 | @@ -25,6 +28,7 @@ | |
1561 | AC_HEADER_STDC | |
1562 | AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h, , AC_MSG_ERROR([Can't find needed header file.])) | |
1563 | AC_CHECK_HEADER(apt-pkg/init.h, , AC_MSG_ERROR([Can't find the APT header files -- please install libapt-pkg-dev])) | |
1564 | +AC_CHECK_HEADER(rpm/dbindex.h, CXXFLAGS="$CXXFLAGS -I/usr/include/rpm" , AC_MSG_ERROR([Can't find the RPM header files -- please install librpm-devel])) | |
1565 | AC_CHECK_HEADER(apt-pkg/policy.h, AC_DEFINE(HAVE_LIBAPT_PKG3)) | |
1566 | if test x$HAVE_LIBPTHREAD = x1 | |
1567 | then | |
b30e66ba | 1568 | diff -rud aptitude-0.0.8.6/po/es_ES.po aptitude-0.0.8.6-new/po/es_ES.po |
1569 | --- aptitude-0.0.8.6/po/es_ES.po Thu May 3 21:37:01 2001 | |
1570 | +++ aptitude-0.0.8.6-new/po/es_ES.po Fri May 18 21:35:54 2001 | |
1571 | @@ -469,12 +469,12 @@ | |
1572 | #: src/download.cc:297 | |
1573 | msgid "" | |
1574 | "IMPORTANT: this log only lists intended actions; actions which fail due to\n" | |
1575 | -"dpkg problems may not be completed.\n" | |
1576 | +"rpm problems may not be completed.\n" | |
1577 | "\n" | |
1578 | msgstr "" | |
1579 |