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
5 pkgdata_DATA=help.txt help-fr.txt help-gl.txt help-pl.txt
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
13 - rm -fr $(DESTDIR)/var/state/aptitude
14 + rm -fr $(DESTDIR)/var/lib/aptitude
15 # Is -r a good idea here?
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
23 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
24 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
26 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
27 # This Makefile.in is free software; the Free Software Foundation
29 AUTOHEADER = @AUTOHEADER@
32 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
33 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
34 INSTALL_DATA = @INSTALL_DATA@
35 INSTALL_SCRIPT = @INSTALL_SCRIPT@
37 transform = @program_transform_name@
42 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
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
53 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
54 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
56 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
62 + here=`cd $(top_builddir) && pwd`; \
63 + top_distdir=`cd $(distdir) && pwd`; \
64 + distdir=`cd $(distdir) && pwd`; \
66 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
67 @for file in $(DISTFILES); do \
69 if test -d $$d/$$file; then \
71 all-am: Makefile $(DATA) config.h
72 all-redirect: all-recursive-am
74 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
75 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
76 installdirs: installdirs-recursive
78 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
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
88 - rm -fr $(DESTDIR)/var/state/aptitude
89 + rm -fr $(DESTDIR)/var/lib/aptitude
90 # Is -r a good idea here?
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
99 Aptitude now has some persistent state information;
100 this directory holds that information.
101 - default: /var/state/aptitude
102 + default: /var/lib/aptitude
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
111 -dnl aclocal.m4 generated automatically by aclocal 1.4
112 +dnl aclocal.m4 generated automatically by aclocal 1.4a
114 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
115 dnl This file is free software; the Free Software Foundation
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.
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
141 /* Define if using alloca.c. */
144 -/* Define to empty if the keyword does not work. */
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
151 /* Define if you have a working `mmap' system call. */
154 -/* Define as __inline if that's what the C compiler calls it. */
157 /* Define to `long' if <sys/types.h> doesn't define. */
161 /* Define if the GNU gettext() function is already present or preinstalled. */
164 +/* Define if you have the popt library (-lpopt). */
167 +/* Define if you have the rpm library (-lrpm). */
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
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.
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.
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.
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.
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.
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
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
243 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
244 @@ -839,12 +840,12 @@
246 cat > conftest.$ac_ext << EOF
248 -#line 843 "configure"
249 +#line 844 "configure"
250 #include "confdefs.h"
252 int main(){return(0);}
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; }
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
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
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
284 ac_save_CXXFLAGS="$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
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
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
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. */
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
326 eval "ac_cv_lib_$ac_lib_var=yes"
328 @@ -1018,8 +1019,110 @@
329 echo "$ac_t""no" 1>&6
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
338 + ac_save_LIBS="$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. */
347 +/* We use char because int might match the return type of a gcc2
348 + builtin and then its argument prototype would still apply. */
355 +if { (eval echo configure:1046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
357 + eval "ac_cv_lib_$ac_lib_var=yes"
359 + echo "configure: failed program was:" >&5
360 + cat conftest.$ac_ext >&5
362 + eval "ac_cv_lib_$ac_lib_var=no"
365 +LIBS="$ac_save_LIBS"
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
376 + LIBS="-lpopt $LIBS"
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; }
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
389 + ac_save_LIBS="$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. */
398 +/* We use char because int might match the return type of a gcc2
399 + builtin and then its argument prototype would still apply. */
406 +if { (eval echo configure:1097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
408 + eval "ac_cv_lib_$ac_lib_var=yes"
410 + echo "configure: failed program was:" >&5
411 + cat conftest.$ac_ext >&5
413 + eval "ac_cv_lib_$ac_lib_var=no"
416 +LIBS="$ac_save_LIBS"
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
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; }
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 @@
442 LIBS="-lapt-pkg $LIBS"
443 cat > conftest.$ac_ext <<EOF
444 -#line 1031 "configure"
445 +#line 1134 "configure"
446 #include "confdefs.h"
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
455 eval "ac_cv_lib_$ac_lib_var=yes"
457 @@ -1059,11 +1162,12 @@
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; }
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 @@
474 LIBS="-lpthread $LIBS"
475 cat > conftest.$ac_ext <<EOF
476 -#line 1075 "configure"
477 +#line 1179 "configure"
478 #include "confdefs.h"
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
487 eval "ac_cv_lib_$ac_lib_var=yes"
489 @@ -1102,7 +1206,7 @@
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"
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
513 @@ -1145,12 +1249,12 @@
514 echo "$ac_t""$CXXCPP" 1>&6
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
522 cat > conftest.$ac_ext <<EOF
523 -#line 1154 "configure"
524 +#line 1258 "configure"
525 #include "confdefs.h"
528 @@ -1158,7 +1262,7 @@
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
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"
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"
555 @@ -1214,7 +1318,7 @@
558 cat > conftest.$ac_ext <<EOF
559 -#line 1218 "configure"
560 +#line 1322 "configure"
561 #include "confdefs.h"
563 extern "C" void exit(int);
564 @@ -1228,7 +1332,7 @@
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
573 @@ -1255,17 +1359,17 @@
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
582 cat > conftest.$ac_ext <<EOF
583 -#line 1264 "configure"
584 +#line 1368 "configure"
585 #include "confdefs.h"
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
594 @@ -1294,17 +1398,17 @@
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
603 cat > conftest.$ac_ext <<EOF
604 -#line 1303 "configure"
605 +#line 1407 "configure"
606 #include "confdefs.h"
607 #include <apt-pkg/init.h>
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
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; }
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
625 + cat > conftest.$ac_ext <<EOF
626 +#line 1441 "configure"
627 +#include "confdefs.h"
628 +#include <rpm/dbindex.h>
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
635 + eval "ac_cv_header_$ac_safe=yes"
638 + echo "configure: failed program was:" >&5
639 + cat conftest.$ac_ext >&5
641 + eval "ac_cv_header_$ac_safe=no"
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"
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; }
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
660 cat > conftest.$ac_ext <<EOF
661 -#line 1337 "configure"
662 +#line 1475 "configure"
663 #include "confdefs.h"
664 #include <apt-pkg/policy.h>
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
672 @@ -1366,17 +1504,17 @@
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
681 cat > conftest.$ac_ext <<EOF
682 -#line 1375 "configure"
683 +#line 1513 "configure"
684 #include "confdefs.h"
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
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
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
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
720 @@ -1523,7 +1661,7 @@
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
728 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
729 @@ -1534,12 +1672,12 @@
731 cat > conftest.$ac_ext << EOF
733 -#line 1538 "configure"
734 +#line 1676 "configure"
735 #include "confdefs.h"
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; }
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
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
759 @@ -1579,7 +1717,7 @@
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
768 @@ -1598,7 +1736,7 @@
769 ac_save_CFLAGS="$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
777 @@ -1636,7 +1774,7 @@
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
785 case "$host_alias" in
786 @@ -1658,7 +1796,7 @@
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 @@
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. */
804 @@ -1680,7 +1818,7 @@
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
811 eval "ac_cv_lib_$ac_lib_var=yes"
813 @@ -1702,128 +1840,13 @@
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
822 - cat > conftest.$ac_ext <<EOF
823 -#line 1712 "configure"
824 -#include "confdefs.h"
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;
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. */
844 -ccp = (char const *const *) p;
845 -{ /* SCO 3.2v4 cc rejects this. */
847 - char const *s = 0 ? (char *) 0 : (char const *) 0;
851 -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
852 - int x[] = {25, 17};
853 - const int *foo = &x[0];
856 -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
857 - typedef const int *iptr;
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;
866 -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
867 - const int foo = 10;
872 -if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
876 - echo "configure: failed program was:" >&5
877 - cat conftest.$ac_ext >&5
884 -echo "$ac_t""$ac_cv_c_const" 1>&6
885 -if test $ac_cv_c_const = no; then
886 - cat >> confdefs.h <<\EOF
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
898 -for ac_kw in inline __inline__ __inline; do
899 - cat > conftest.$ac_ext <<EOF
900 -#line 1789 "configure"
901 -#include "confdefs.h"
907 -if { (eval echo configure:1796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
909 - ac_cv_c_inline=$ac_kw; break
911 - echo "configure: failed program was:" >&5
912 - cat conftest.$ac_ext >&5
919 -echo "$ac_t""$ac_cv_c_inline" 1>&6
920 -case "$ac_cv_c_inline" in
922 - no) cat >> confdefs.h <<\EOF
926 - *) cat >> confdefs.h <<EOF
927 -#define inline $ac_cv_c_inline
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
938 cat > conftest.$ac_ext <<EOF
939 -#line 1827 "configure"
940 +#line 1850 "configure"
941 #include "confdefs.h"
942 #include <sys/types.h>
944 @@ -1851,12 +1874,12 @@
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
953 cat > conftest.$ac_ext <<EOF
954 -#line 1860 "configure"
955 +#line 1883 "configure"
956 #include "confdefs.h"
957 #include <sys/types.h>
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
968 cat > conftest.$ac_ext <<EOF
969 -#line 1895 "configure"
970 +#line 1918 "configure"
971 #include "confdefs.h"
974 char *p = alloca(2 * sizeof(int));
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
980 ac_cv_header_alloca_h=yes
982 @@ -1919,12 +1942,12 @@
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
991 cat > conftest.$ac_ext <<EOF
992 -#line 1928 "configure"
993 +#line 1951 "configure"
994 #include "confdefs.h"
997 @@ -1952,7 +1975,7 @@
998 char *p = (char *) alloca(1);
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
1004 ac_cv_func_alloca_works=yes
1006 @@ -1984,12 +2007,12 @@
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
1015 cat > conftest.$ac_ext <<EOF
1016 -#line 1993 "configure"
1017 +#line 2016 "configure"
1018 #include "confdefs.h"
1019 #if defined(CRAY) && ! defined(CRAY2)
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
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 @@
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
1043 eval "ac_cv_func_$ac_func=yes"
1045 @@ -2072,7 +2095,7 @@
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
1054 @@ -2080,7 +2103,7 @@
1055 ac_cv_c_stack_direction=0
1057 cat > conftest.$ac_ext <<EOF
1058 -#line 2084 "configure"
1059 +#line 2107 "configure"
1060 #include "confdefs.h"
1062 extern "C" void exit(int);
1063 @@ -2102,7 +2125,7 @@
1064 exit (find_stack_direction() < 0);
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
1070 ac_cv_c_stack_direction=1
1072 @@ -2127,17 +2150,17 @@
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
1081 cat > conftest.$ac_ext <<EOF
1082 -#line 2136 "configure"
1083 +#line 2159 "configure"
1084 #include "confdefs.h"
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
1093 @@ -2166,12 +2189,12 @@
1094 for ac_func in getpagesize
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
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 @@
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
1115 eval "ac_cv_func_$ac_func=yes"
1117 @@ -2222,7 +2245,7 @@
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
1126 @@ -2230,7 +2253,7 @@
1127 ac_cv_func_mmap_fixed_mapped=no
1129 cat > conftest.$ac_ext <<EOF
1130 -#line 2234 "configure"
1131 +#line 2257 "configure"
1132 #include "confdefs.h"
1134 extern "C" void exit(int);
1135 @@ -2373,7 +2396,7 @@
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
1142 ac_cv_func_mmap_fixed_mapped=yes
1144 @@ -2395,23 +2418,23 @@
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
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
1160 cat > conftest.$ac_ext <<EOF
1161 -#line 2410 "configure"
1162 +#line 2433 "configure"
1163 #include "confdefs.h"
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
1172 @@ -2442,12 +2465,12 @@
1173 __argz_count __argz_stringify __argz_next
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
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 @@
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
1194 eval "ac_cv_func_$ac_func=yes"
1196 @@ -2500,7 +2523,7 @@
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
1205 @@ -2508,7 +2531,7 @@
1206 am_cv_func_iconv="no, consider installing GNU libiconv"
1208 cat > conftest.$ac_ext <<EOF
1209 -#line 2512 "configure"
1210 +#line 2535 "configure"
1211 #include "confdefs.h"
1214 @@ -2518,7 +2541,7 @@
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
1221 am_cv_func_iconv=yes
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"
1232 @@ -2540,7 +2563,7 @@
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
1240 am_cv_func_iconv=yes
1241 @@ -2561,13 +2584,13 @@
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
1251 cat > conftest.$ac_ext <<EOF
1252 -#line 2571 "configure"
1253 +#line 2594 "configure"
1254 #include "confdefs.h"
1257 @@ -2586,7 +2609,7 @@
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
1264 am_cv_proto_iconv_arg1=""
1266 @@ -2615,19 +2638,19 @@
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
1275 cat > conftest.$ac_ext <<EOF
1276 -#line 2624 "configure"
1277 +#line 2647 "configure"
1278 #include "confdefs.h"
1279 #include <langinfo.h>
1281 char* cs = nl_langinfo(CODESET);
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
1287 am_cv_langinfo_codeset=yes
1289 @@ -2650,19 +2673,19 @@
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
1298 cat > conftest.$ac_ext <<EOF
1299 -#line 2659 "configure"
1300 +#line 2682 "configure"
1301 #include "confdefs.h"
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
1310 am_cv_val_LC_MESSAGES=yes
1312 @@ -2683,7 +2706,7 @@
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 @@
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 @@
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
1339 cat > conftest.$ac_ext <<EOF
1340 -#line 2733 "configure"
1341 +#line 2756 "configure"
1342 #include "confdefs.h"
1343 #include <libintl.h>
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
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
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
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
1373 gt_cv_func_gnugettext1_libc=yes
1375 @@ -2781,14 +2804,14 @@
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
1384 gt_save_LIBS="$LIBS"
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
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
1399 gt_cv_func_gnugettext1_libintl=yes
1401 @@ -2822,12 +2845,12 @@
1402 for ac_func in dcgettext
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
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 @@
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
1423 eval "ac_cv_func_$ac_func=yes"
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
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
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
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
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
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
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
1488 @@ -3172,7 +3195,7 @@
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 @@
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
1504 for presentlang in $ALL_LINGUAS; do
1506 @@ -3284,12 +3307,12 @@
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
1515 cat > conftest.$ac_ext <<EOF
1516 -#line 3293 "configure"
1517 +#line 3316 "configure"
1518 #include "confdefs.h"
1519 #include <sys/types.h>
1521 @@ -3320,12 +3343,12 @@
1522 for ac_func in strdup
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
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 @@
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
1543 eval "ac_cv_func_$ac_func=yes"
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
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]))
1557 AC_CHECK_LIB(pthread, main,
1559 , AC_MSG_WARN([Can't find the POSIX thread libraries -- configuring without threads]))
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
1568 Only in aptitude-0.0.8.6-new/: configure~
1569 diff -rud aptitude-0.0.8.6/mkinstalldirs aptitude-0.0.8.6-new/mkinstalldirs
1570 --- aptitude-0.0.8.6/mkinstalldirs Sat Mar 11 06:25:38 2000
1571 +++ aptitude-0.0.8.6-new/mkinstalldirs Fri May 18 21:35:54 2001
1573 # Created: 1993-05-16
1581 diff -rud aptitude-0.0.8.6/po/es_ES.po aptitude-0.0.8.6-new/po/es_ES.po
1582 --- aptitude-0.0.8.6/po/es_ES.po Thu May 3 21:37:01 2001
1583 +++ aptitude-0.0.8.6-new/po/es_ES.po Fri May 18 21:35:54 2001
1584 @@ -469,12 +469,12 @@
1585 #: src/download.cc:297
1587 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
1588 -"dpkg problems may not be completed.\n"
1589 +"rpm problems may not be completed.\n"
1592 "IMPORTANTE: este log sólo muestra pretensión de las acciones; las acciones "
1594 -"debidas a problemas dpkg no se completarán.\n"
1595 +"debidas a problemas rpm no se completarán.\n"
1598 #: src/download.cc:298
1599 Only in aptitude-0.0.8.6-new/po: es_ES.po~
1600 diff -rud aptitude-0.0.8.6/po/pt_BR.po aptitude-0.0.8.6-new/po/pt_BR.po
1601 --- aptitude-0.0.8.6/po/pt_BR.po Thu May 3 21:37:01 2001
1602 +++ aptitude-0.0.8.6-new/po/pt_BR.po Fri May 18 21:35:54 2001
1603 @@ -470,11 +470,11 @@
1604 #: src/download.cc:297
1606 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
1607 -"dpkg problems may not be completed.\n"
1608 +"rpm problems may not be completed.\n"
1611 "IMPORTANTE: este registro lista somente as ações pretendidas; ações que\n"
1612 -"falharem devido a problemas de dpkg poderão não ser completadas.\n"
1613 +"falharem devido a problemas de rpm poderão não ser completadas.\n"
1616 #: src/download.cc:298
1617 Only in aptitude-0.0.8.6-new/po: pt_BR.po~
1618 diff -rud aptitude-0.0.8.6/src/Makefile.am aptitude-0.0.8.6-new/src/Makefile.am
1619 --- aptitude-0.0.8.6/src/Makefile.am Sat Sep 23 10:33:22 2000
1620 +++ aptitude-0.0.8.6-new/src/Makefile.am Fri May 18 21:35:54 2001
1622 SUBDIRS=generic vscreen
1624 localedir = $(datadir)/locale
1625 -INCLUDES = -Wall -Werror -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
1626 +INCLUDES = -Wall -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl #-Werror
1627 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
1629 bin_PROGRAMS=aptitude
1630 diff -rud aptitude-0.0.8.6/src/Makefile.in aptitude-0.0.8.6-new/src/Makefile.in
1631 --- aptitude-0.0.8.6/src/Makefile.in Thu May 3 21:36:58 2001
1632 +++ aptitude-0.0.8.6-new/src/Makefile.in Fri May 18 21:35:54 2001
1634 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
1635 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
1637 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
1638 # This Makefile.in is free software; the Free Software Foundation
1640 AUTOHEADER = @AUTOHEADER@
1643 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
1644 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
1645 INSTALL_DATA = @INSTALL_DATA@
1646 INSTALL_SCRIPT = @INSTALL_SCRIPT@
1647 +INSTALL_STRIP_FLAG =
1648 transform = @program_transform_name@
1652 SUBDIRS = generic vscreen
1654 localedir = $(datadir)/locale
1655 -INCLUDES = -Wall -Werror -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
1656 +INCLUDES = -Wall -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl #-Werror
1657 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
1659 bin_PROGRAMS = aptitude
1660 @@ -127,8 +128,16 @@
1662 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
1667 +DEP_FILES = .deps/apt_info_tree.P .deps/apt_tree.P .deps/defaults.P \
1668 +.deps/dep_item.P .deps/download.P .deps/download_bar.P \
1669 +.deps/download_item.P .deps/download_screen.P .deps/load_config.P \
1670 +.deps/main.P .deps/pkg_action_tree.P .deps/pkg_columnizer.P \
1671 +.deps/pkg_description_treeitem.P .deps/pkg_grouppolicy.P \
1672 +.deps/pkg_info_screen.P .deps/pkg_item.P .deps/pkg_node.P \
1673 +.deps/pkg_subtree.P .deps/pkg_tree.P .deps/pkg_ver_item.P \
1674 +.deps/vs_progress.P
1675 SOURCES = $(aptitude_SOURCES)
1676 OBJECTS = $(aptitude_OBJECTS)
1680 .SUFFIXES: .S .c .cc .o .s
1681 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
1682 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
1683 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
1685 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1686 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
1687 cd $(top_builddir) \
1688 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
1691 $(mkinstalldirs) $(DESTDIR)$(bindir)
1692 @list='$(bin_PROGRAMS)'; for p in $$list; do \
1693 if test -f $$p; then \
1694 - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
1695 - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
1696 + echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
1697 + $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
1702 rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
1711 @@ -287,6 +293,11 @@
1714 distdir: $(DISTFILES)
1715 + here=`cd $(top_builddir) && pwd`; \
1716 + top_distdir=`cd $(top_distdir) && pwd`; \
1717 + distdir=`cd $(distdir) && pwd`; \
1718 + cd $(top_srcdir) \
1719 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
1720 @for file in $(DISTFILES); do \
1722 if test -d $$d/$$file; then \
1723 @@ -307,166 +318,57 @@
1727 -apt_info_tree.o: apt_info_tree.cc apt_info_tree.h apt_tree.h \
1728 - vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
1729 - vscreen/curses++.h vscreen/config/colors.h \
1730 - vscreen/vs_treeitem.h generic/apt.h generic/aptcache.h \
1732 -apt_tree.o: apt_tree.cc ../config.h aptitude.h apt_tree.h \
1733 - vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
1734 - vscreen/curses++.h vscreen/config/colors.h \
1735 - vscreen/vs_treeitem.h generic/apt.h generic/aptcache.h \
1736 - generic/undo.h vscreen/vs_pager.h vscreen/vs_statusedit.h \
1737 - vscreen/vs_statuschoice.h vscreen/config/keybindings.h \
1738 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1739 - vs_progress.h pkg_action_tree.h pkg_tree.h generic/matchers.h \
1740 - pkg_item.h pkg_node.h pkg_columnizer.h \
1741 - vscreen/config/column_definition.h \
1742 - vscreen/config/../columnify.h pkg_grouppolicy.h download.h
1743 -defaults.o: defaults.cc vscreen/config/keybindings.h \
1744 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1745 - vscreen/config/colors.h apt_tree.h vscreen/vs_tree.h \
1746 - vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
1747 - vscreen/vs_treeitem.h pkg_action_tree.h pkg_tree.h \
1748 - generic/matchers.h pkg_node.h generic/undo.h
1749 -dep_item.o: dep_item.cc aptitude.h ../config.h dep_item.h \
1750 - vscreen/vs_subtree.h vscreen/vs_treeitem.h vscreen/curses++.h \
1751 - vscreen/config/colors.h vscreen/vs_minibuf_win.h \
1752 - vscreen/vscreen.h vscreen/config/keybindings.h \
1753 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1754 - vscreen/vs_tree.h apt_info_tree.h apt_tree.h pkg_grouppolicy.h \
1755 - pkg_item.h pkg_node.h generic/undo.h pkg_subtree.h \
1756 - pkg_item_with_subtree.h pkg_columnizer.h \
1757 - vscreen/config/column_definition.h \
1758 - vscreen/config/../columnify.h vscreen/columnify.h \
1759 - pkg_grouppolicy_hash.h strhash.h pkg_ver_item.h generic/apt.h \
1760 - generic/aptcache.h
1761 -download.o: download.cc aptitude.h ../config.h generic/apt.h \
1762 - generic/aptcache.h download_screen.h vscreen/vs_tree.h \
1763 - vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
1764 - vscreen/config/colors.h vscreen/vs_treeitem.h \
1765 - vscreen/vs_subtree.h vscreen/config/keybindings.h \
1766 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1768 -download_bar.o: download_bar.cc aptitude.h ../config.h download_bar.h \
1769 - vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
1770 - vscreen/config/colors.h vscreen/config/keybindings.h \
1771 - vscreen/config/../../strhash.h vscreen/config/../curses++.h
1772 -download_item.o: download_item.cc aptitude.h ../config.h download_item.h \
1773 - vscreen/vs_treeitem.h vscreen/curses++.h \
1774 - vscreen/config/colors.h vscreen/vs_minibuf_win.h \
1775 - vscreen/vscreen.h vscreen/vs_tree.h
1776 -download_screen.o: download_screen.cc aptitude.h ../config.h \
1777 - download_screen.h vscreen/vs_tree.h vscreen/vs_minibuf_win.h \
1778 - vscreen/vscreen.h vscreen/curses++.h vscreen/config/colors.h \
1779 - vscreen/vs_treeitem.h vscreen/vs_subtree.h \
1780 - vscreen/config/keybindings.h vscreen/config/../../strhash.h \
1781 - vscreen/config/../curses++.h download_item.h
1782 -load_config.o: load_config.cc aptitude.h ../config.h \
1783 - vscreen/config/colors.h vscreen/config/keybindings.h \
1784 - vscreen/config/../../strhash.h vscreen/config/../curses++.h
1785 -main.o: main.cc aptitude.h ../config.h vscreen/curses++.h \
1786 - vscreen/vscreen.h vscreen/vs_tree.h vscreen/vs_minibuf_win.h \
1787 - vscreen/config/colors.h vscreen/vs_treeitem.h \
1788 - vscreen/vs_pager.h vscreen/vs_statuschoice.h \
1789 - vscreen/vs_statusedit.h vs_progress.h pkg_node.h generic/undo.h \
1790 - pkg_action_tree.h pkg_tree.h apt_tree.h generic/matchers.h \
1791 - pkg_grouppolicy.h generic/apt.h generic/aptcache.h \
1792 - load_config.h vscreen/config/keybindings.h \
1793 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1795 -pkg_action_tree.o: pkg_action_tree.cc aptitude.h ../config.h \
1796 - pkg_action_tree.h pkg_tree.h apt_tree.h vscreen/vs_tree.h \
1797 - vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
1798 - vscreen/config/colors.h vscreen/vs_treeitem.h \
1799 - generic/matchers.h generic/apt.h generic/aptcache.h \
1800 - generic/undo.h vscreen/config/keybindings.h \
1801 - vscreen/config/../../strhash.h vscreen/config/../curses++.h
1802 -pkg_columnizer.o: pkg_columnizer.cc aptitude.h ../config.h \
1803 - pkg_columnizer.h pkg_item.h pkg_node.h vscreen/vs_treeitem.h \
1804 - vscreen/curses++.h vscreen/config/colors.h \
1805 - vscreen/vs_minibuf_win.h vscreen/vscreen.h generic/undo.h \
1806 - vscreen/config/column_definition.h \
1807 - vscreen/config/../columnify.h generic/apt.h generic/aptcache.h
1808 -pkg_description_treeitem.o: pkg_description_treeitem.cc aptitude.h \
1809 - ../config.h pkg_description_treeitem.h vscreen/vs_treeitem.h \
1810 - vscreen/curses++.h vscreen/config/colors.h \
1811 - vscreen/vs_minibuf_win.h vscreen/vscreen.h apt_info_tree.h \
1812 - apt_tree.h vscreen/vs_tree.h pkg_grouppolicy.h generic/apt.h \
1813 - generic/aptcache.h
1814 -pkg_grouppolicy.o: pkg_grouppolicy.cc aptitude.h ../config.h \
1815 - pkg_grouppolicy.h pkg_item.h pkg_node.h vscreen/vs_treeitem.h \
1816 - vscreen/curses++.h vscreen/config/colors.h \
1817 - vscreen/vs_minibuf_win.h vscreen/vscreen.h generic/undo.h \
1818 - pkg_subtree.h vscreen/vs_subtree.h vscreen/config/keybindings.h \
1819 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1820 - vscreen/vs_tree.h generic/apt.h generic/aptcache.h
1821 -pkg_info_screen.o: pkg_info_screen.cc aptitude.h ../config.h \
1822 - pkg_info_screen.h pkg_grouppolicy.h apt_info_tree.h apt_tree.h \
1823 - vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
1824 - vscreen/curses++.h vscreen/config/colors.h \
1825 - vscreen/vs_treeitem.h vscreen/vs_staticitem.h pkg_subtree.h \
1826 - vscreen/vs_subtree.h vscreen/config/keybindings.h \
1827 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1828 - pkg_node.h generic/undo.h pkg_item_with_subtree.h pkg_item.h \
1829 - pkg_columnizer.h vscreen/config/column_definition.h \
1830 - vscreen/config/../columnify.h vscreen/columnify.h dep_item.h \
1831 - pkg_ver_item.h pkg_description_treeitem.h generic/apt.h \
1832 - generic/aptcache.h
1833 -pkg_item.o: pkg_item.cc aptitude.h ../config.h vscreen/vs_pager.h \
1834 - vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
1835 - vscreen/config/colors.h vscreen/config/column_definition.h \
1836 - vscreen/config/../columnify.h dep_item.h vscreen/vs_subtree.h \
1837 - vscreen/vs_treeitem.h vscreen/config/keybindings.h \
1838 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1839 - vscreen/vs_tree.h apt_info_tree.h apt_tree.h pkg_grouppolicy.h \
1840 - pkg_item.h pkg_node.h generic/undo.h pkg_subtree.h \
1841 - pkg_item_with_subtree.h pkg_columnizer.h vscreen/columnify.h \
1842 - download.h pkg_action_tree.h pkg_tree.h generic/matchers.h \
1843 - pkg_description_treeitem.h pkg_info_screen.h pkg_ver_item.h \
1844 - download_bar.h generic/pkg_changelog.h generic/apt.h \
1845 - generic/aptcache.h
1846 -pkg_node.o: pkg_node.cc vscreen/config/keybindings.h \
1847 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1848 - pkg_node.h vscreen/vs_treeitem.h vscreen/curses++.h \
1849 - vscreen/config/colors.h vscreen/vs_minibuf_win.h \
1850 - vscreen/vscreen.h generic/undo.h generic/apt.h \
1851 - generic/aptcache.h ../config.h vscreen/vs_tree.h
1852 -pkg_subtree.o: pkg_subtree.cc pkg_subtree.h vscreen/vs_subtree.h \
1853 - vscreen/vs_treeitem.h vscreen/curses++.h \
1854 - vscreen/config/colors.h vscreen/vs_minibuf_win.h \
1855 - vscreen/vscreen.h vscreen/config/keybindings.h \
1856 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1857 - vscreen/vs_tree.h pkg_node.h generic/undo.h generic/apt.h \
1858 - generic/aptcache.h ../config.h
1859 -pkg_tree.o: pkg_tree.cc aptitude.h ../config.h pkg_tree.h apt_tree.h \
1860 - vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
1861 - vscreen/curses++.h vscreen/config/colors.h \
1862 - vscreen/vs_treeitem.h generic/matchers.h vs_progress.h \
1863 - pkg_node.h generic/undo.h pkg_item.h pkg_columnizer.h \
1864 - vscreen/config/column_definition.h \
1865 - vscreen/config/../columnify.h pkg_subtree.h \
1866 - vscreen/vs_subtree.h vscreen/config/keybindings.h \
1867 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1868 - pkg_grouppolicy.h download.h vscreen/columnify.h \
1869 - vscreen/vs_statusedit.h generic/apt.h generic/aptcache.h
1870 -pkg_ver_item.o: pkg_ver_item.cc aptitude.h ../config.h pkg_item.h \
1871 - pkg_node.h vscreen/vs_treeitem.h vscreen/curses++.h \
1872 - vscreen/config/colors.h vscreen/vs_minibuf_win.h \
1873 - vscreen/vscreen.h generic/undo.h pkg_columnizer.h \
1874 - vscreen/config/column_definition.h \
1875 - vscreen/config/../columnify.h pkg_subtree.h \
1876 - vscreen/vs_subtree.h vscreen/config/keybindings.h \
1877 - vscreen/config/../../strhash.h vscreen/config/../curses++.h \
1878 - vscreen/vs_tree.h pkg_ver_item.h apt_info_tree.h apt_tree.h \
1879 - pkg_grouppolicy.h pkg_item_with_subtree.h vscreen/columnify.h \
1880 - pkg_description_treeitem.h dep_item.h pkg_info_screen.h \
1881 - generic/apt.h generic/aptcache.h
1882 -vs_progress.o: vs_progress.cc aptitude.h ../config.h vs_progress.h \
1883 - vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
1884 - vscreen/curses++.h vscreen/config/colors.h \
1885 - vscreen/vs_treeitem.h
1887 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
1889 +-include $(DEP_FILES)
1891 +mostlyclean-depend:
1898 +maintainer-clean-depend:
1901 + @echo '$(COMPILE) -c $<'; \
1902 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
1903 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
1904 + tr ' ' '\012' < .deps/$(*F).pp \
1905 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
1906 + >> .deps/$(*F).P; \
1910 + @echo '$(LTCOMPILE) -c $<'; \
1911 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
1912 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
1913 + < .deps/$(*F).pp > .deps/$(*F).P; \
1914 + tr ' ' '\012' < .deps/$(*F).pp \
1915 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
1916 + >> .deps/$(*F).P; \
1917 + rm -f .deps/$(*F).pp
1920 + @echo '$(CXXCOMPILE) -c $<'; \
1921 + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
1922 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
1923 + tr ' ' '\012' < .deps/$(*F).pp \
1924 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
1925 + >> .deps/$(*F).P; \
1929 + @echo '$(LTCXXCOMPILE) -c $<'; \
1930 + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
1931 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
1932 + < .deps/$(*F).pp > .deps/$(*F).P; \
1933 + tr ' ' '\012' < .deps/$(*F).pp \
1934 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
1935 + >> .deps/$(*F).P; \
1936 + rm -f .deps/$(*F).pp
1938 info: info-recursive
1941 all-am: Makefile $(PROGRAMS)
1942 all-redirect: all-recursive
1944 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
1945 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
1946 installdirs: installdirs-recursive
1948 $(mkinstalldirs) $(DESTDIR)$(bindir)
1949 @@ -506,23 +408,24 @@
1950 maintainer-clean-generic:
1951 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
1952 mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
1953 - mostlyclean-tags mostlyclean-generic
1954 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
1956 mostlyclean: mostlyclean-recursive
1958 -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \
1960 +clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
1961 + clean-generic mostlyclean-am
1963 clean: clean-recursive
1965 distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
1966 - distclean-generic clean-am
1967 + distclean-depend distclean-generic clean-am
1969 distclean: distclean-recursive
1971 maintainer-clean-am: maintainer-clean-binPROGRAMS \
1972 maintainer-clean-compile maintainer-clean-tags \
1973 - maintainer-clean-generic distclean-am
1974 + maintainer-clean-depend maintainer-clean-generic \
1976 @echo "This command is intended for maintainers to use;"
1977 @echo "it deletes files that may require special tools to rebuild."
1979 @@ -537,12 +440,14 @@
1980 all-recursive check-recursive installcheck-recursive info-recursive \
1981 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
1982 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
1983 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
1984 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
1985 -install-exec install-data-am install-data install-am install \
1986 -uninstall-am uninstall all-redirect all-am all installdirs-am \
1987 -installdirs mostlyclean-generic distclean-generic clean-generic \
1988 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
1989 +distclean-tags clean-tags maintainer-clean-tags distdir \
1990 +mostlyclean-depend distclean-depend clean-depend \
1991 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
1992 +installcheck-am installcheck install-exec-am install-exec \
1993 +install-data-am install-data install-am install uninstall-am uninstall \
1994 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
1995 +distclean-generic clean-generic maintainer-clean-generic clean \
1996 +mostlyclean distclean maintainer-clean
1999 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2000 Only in aptitude-0.0.8.6-new/src: Makefile.in~
2001 diff -rud aptitude-0.0.8.6/src/dep_item.cc aptitude-0.0.8.6-new/src/dep_item.cc
2002 --- aptitude-0.0.8.6/src/dep_item.cc Sat Mar 3 16:13:56 2001
2003 +++ aptitude-0.0.8.6-new/src/dep_item.cc Fri May 18 21:35:54 2001
2006 #include "generic/apt.h"
2008 -#include <apt-pkg/version.h>
2009 +//#include <apt-pkg/version.h>
2010 +#include <apt-pkg/systemfactory.h>
2011 #include <apt-pkg/configuration.h>
2013 +#define pkgCheckDep _system->checkDep
2015 class pkg_depitem:public pkg_subtree
2017 diff -rud aptitude-0.0.8.6/src/download.cc aptitude-0.0.8.6-new/src/download.cc
2018 --- aptitude-0.0.8.6/src/download.cc Fri Dec 15 19:11:48 2000
2019 +++ aptitude-0.0.8.6-new/src/download.cc Fri May 18 21:35:54 2001
2021 #include <apt-pkg/error.h>
2022 #include <apt-pkg/dpkgpm.h>
2023 #include <apt-pkg/packagemanager.h>
2024 +#include <apt-pkg/systemfactory.h>
2025 #include <apt-pkg/sourcelist.h>
2026 #include <apt-pkg/acquire.h>
2027 #include <apt-pkg/acquire-item.h>
2031 // Make a package manager, get ready to download
2032 - pkgDPkgPM pm(*apt_cache_file);
2033 + //pkgDPkgPM pm(*apt_cache_file);
2034 + pkgPackageManager *pm_ = _system->CreatePackageManager(*apt_cache_file);
2035 + pkgPackageManager &pm = *pm_;
2036 if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
2038 _error->Error(_("Internal error: couldn't generate list of packages to download"));
2042 fprintf(f, "Aptitude " VERSION ": log report\n\n");
2043 - fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\ndpkg problems may not be completed.\n\n"));
2044 + fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\nrpm problems may not be completed.\n\n"));
2045 fprintf(f, _("Will install %li packages, and remove %li packages.\n"), (*apt_cache_file)->InstCount(), (*apt_cache_file)->DelCount());
2046 if((*apt_cache_file)->UsrSize()>0)
2047 fprintf(f, _("%li bytes of disk space will be used\n"), (long int) (*apt_cache_file)->UsrSize());
2049 _error->DumpErrors();
2050 cerr<<_("Ack! Something bad happened while installing packages. Trying to recover:")<<endl;
2051 // and this is really a hack:
2052 - system("dpkg --configure -a");
2053 + //system("dpkg --configure -a");
2057 diff -rud aptitude-0.0.8.6/src/generic/Makefile.am aptitude-0.0.8.6-new/src/generic/Makefile.am
2058 --- aptitude-0.0.8.6/src/generic/Makefile.am Fri Sep 22 21:35:10 2000
2059 +++ aptitude-0.0.8.6-new/src/generic/Makefile.am Fri May 18 21:35:54 2001
2061 MAINTAINERCLEANFILES=Makefile.in
2063 localedir = $(datadir)/locale
2064 -INCLUDES = -Wall -Werror -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
2065 +INCLUDES = -Wall -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl #-Werror
2066 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
2069 diff -rud aptitude-0.0.8.6/src/generic/Makefile.in aptitude-0.0.8.6-new/src/generic/Makefile.in
2070 --- aptitude-0.0.8.6/src/generic/Makefile.in Thu May 3 21:36:59 2001
2071 +++ aptitude-0.0.8.6-new/src/generic/Makefile.in Fri May 18 21:35:54 2001
2073 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
2074 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
2076 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
2077 # This Makefile.in is free software; the Free Software Foundation
2079 AUTOHEADER = @AUTOHEADER@
2082 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
2083 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
2084 INSTALL_DATA = @INSTALL_DATA@
2085 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2086 +INSTALL_STRIP_FLAG =
2087 transform = @program_transform_name@
2091 MAINTAINERCLEANFILES = Makefile.in
2093 localedir = $(datadir)/locale
2094 -INCLUDES = -Wall -Werror -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
2095 +INCLUDES = -Wall -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl #-Werror
2096 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
2099 @@ -119,8 +120,10 @@
2101 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
2106 +DEP_FILES = .deps/apt.P .deps/aptcache.P .deps/matchers.P \
2107 +.deps/pkg_changelog.P .deps/undo.P
2108 SOURCES = $(libgeneric_a_SOURCES)
2109 OBJECTS = $(libgeneric_a_OBJECTS)
2113 .SUFFIXES: .S .c .cc .o .s
2114 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
2115 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/generic/Makefile
2116 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/generic/Makefile
2118 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2119 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
2120 cd $(top_builddir) \
2121 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2125 maintainer-clean-noinstLIBRARIES:
2133 @@ -204,6 +204,11 @@
2134 subdir = src/generic
2136 distdir: $(DISTFILES)
2137 + here=`cd $(top_builddir) && pwd`; \
2138 + top_distdir=`cd $(top_distdir) && pwd`; \
2139 + distdir=`cd $(distdir) && pwd`; \
2140 + cd $(top_srcdir) \
2141 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/generic/Makefile
2142 @for file in $(DISTFILES); do \
2144 if test -d $$d/$$file; then \
2145 @@ -214,12 +219,57 @@
2146 || cp -p $$d/$$file $(distdir)/$$file || :; \
2149 -apt.o: apt.cc apt.h aptcache.h ../../config.h undo.h
2150 -aptcache.o: aptcache.cc ../aptitude.h ../../config.h aptcache.h undo.h
2151 -matchers.o: matchers.cc matchers.h apt.h aptcache.h ../../config.h
2152 -pkg_changelog.o: pkg_changelog.cc pkg_changelog.h
2153 -undo.o: undo.cc undo.h
2155 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
2157 +-include $(DEP_FILES)
2159 +mostlyclean-depend:
2166 +maintainer-clean-depend:
2169 + @echo '$(COMPILE) -c $<'; \
2170 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2171 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2172 + tr ' ' '\012' < .deps/$(*F).pp \
2173 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2174 + >> .deps/$(*F).P; \
2178 + @echo '$(LTCOMPILE) -c $<'; \
2179 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2180 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2181 + < .deps/$(*F).pp > .deps/$(*F).P; \
2182 + tr ' ' '\012' < .deps/$(*F).pp \
2183 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2184 + >> .deps/$(*F).P; \
2185 + rm -f .deps/$(*F).pp
2188 + @echo '$(CXXCOMPILE) -c $<'; \
2189 + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2190 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2191 + tr ' ' '\012' < .deps/$(*F).pp \
2192 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2193 + >> .deps/$(*F).P; \
2197 + @echo '$(LTCXXCOMPILE) -c $<'; \
2198 + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2199 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2200 + < .deps/$(*F).pp > .deps/$(*F).P; \
2201 + tr ' ' '\012' < .deps/$(*F).pp \
2202 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2203 + >> .deps/$(*F).P; \
2204 + rm -f .deps/$(*F).pp
2209 all-am: Makefile $(LIBRARIES)
2210 all-redirect: all-am
2212 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
2213 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
2217 @@ -257,23 +307,25 @@
2218 maintainer-clean-generic:
2219 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
2220 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
2221 - mostlyclean-tags mostlyclean-generic
2222 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
2224 mostlyclean: mostlyclean-am
2226 -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
2228 +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
2229 + clean-generic mostlyclean-am
2233 distclean-am: distclean-noinstLIBRARIES distclean-compile \
2234 - distclean-tags distclean-generic clean-am
2235 + distclean-tags distclean-depend distclean-generic \
2238 distclean: distclean-am
2240 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
2241 maintainer-clean-compile maintainer-clean-tags \
2242 - maintainer-clean-generic distclean-am
2243 + maintainer-clean-depend maintainer-clean-generic \
2245 @echo "This command is intended for maintainers to use;"
2246 @echo "it deletes files that may require special tools to rebuild."
2248 @@ -283,12 +335,13 @@
2249 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
2250 mostlyclean-compile distclean-compile clean-compile \
2251 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
2252 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
2253 -check-am installcheck-am installcheck install-exec-am install-exec \
2254 -install-data-am install-data install-am install uninstall-am uninstall \
2255 -all-redirect all-am all installdirs mostlyclean-generic \
2256 -distclean-generic clean-generic maintainer-clean-generic clean \
2257 -mostlyclean distclean maintainer-clean
2258 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
2259 +distclean-depend clean-depend maintainer-clean-depend info-am info \
2260 +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
2261 +install-exec install-data-am install-data install-am install \
2262 +uninstall-am uninstall all-redirect all-am all installdirs \
2263 +mostlyclean-generic distclean-generic clean-generic \
2264 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
2267 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2268 Only in aptitude-0.0.8.6-new/src/generic: Makefile.in~
2269 diff -rud aptitude-0.0.8.6/src/generic/aptcache.cc aptitude-0.0.8.6-new/src/generic/aptcache.cc
2270 --- aptitude-0.0.8.6/src/generic/aptcache.cc Thu May 3 21:11:19 2001
2271 +++ aptitude-0.0.8.6-new/src/generic/aptcache.cc Fri May 18 21:35:54 2001
2273 #ifdef HAVE_LIBAPT_PKG3
2274 #include <apt-pkg/pkgsystem.h>
2275 #include <apt-pkg/policy.h>
2277 +#include <apt-pkg/systemfactory.h>
2282 if(!pkgDepCache::Init(&Prog))
2285 - string statedir=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude");
2286 + string statedir=_config->FindDir("Dir::Aptitude::state", "/var/lib/aptitude");
2287 // Should this not go under Dir:: ? I'm not sure..
2288 delete package_states;
2289 package_states=new aptitude_state[Head().PackageCount];
2294 - string statefile=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude")+"pkgstates";
2295 + string statefile=_config->FindDir("Dir::Aptitude::state", "/var/lib/aptitude")+"pkgstates";
2297 FileFd newstate(statefile+".new", FileFd::WriteEmpty);
2298 if(!newstate.IsOpen())
2300 bool aptitudeCacheFile::Open(OpProgress &Progress, bool WithLock)
2303 - Lock=new pkgDpkgLock;
2304 + Lock=new pkgRpmLock (false); // pkgDpkgLock;
2306 if(_error->PendingError())
2312 - pkgMakeStatusCache(List, Progress);
2313 + //pkgMakeStatusCache(List, Progress);
2314 + _system->makeStatusCache(List, Progress);
2315 if(_error->PendingError())
2316 return _error->Error(_("The package lists or status file could not be parsed or opened."));
2317 if(!_error->empty())
2322 - Map=pkgMakeStatusCacheMem(List, Progress);
2323 + //Map=pkgMakeStatusCacheMem(List, Progress);
2324 + Map=_system->makeStatusCacheMem(List, Progress);
2328 Only in aptitude-0.0.8.6-new/src/generic: aptcache.cc~
2329 diff -rud aptitude-0.0.8.6/src/generic/aptcache.h aptitude-0.0.8.6-new/src/generic/aptcache.h
2330 --- aptitude-0.0.8.6/src/generic/aptcache.h Thu May 3 21:14:59 2001
2331 +++ aptitude-0.0.8.6-new/src/generic/aptcache.h Fri May 18 21:35:54 2001
2333 #include <apt-pkg/depcache.h>
2335 #ifndef HAVE_LIBAPT_PKG3
2336 -#include <apt-pkg/dpkginit.h>
2337 +//#include <apt-pkg/dpkginit.h>
2338 +#include <apt-pkg/rpminit.h>
2345 aptitudeDepCache *Cache;
2346 - pkgDpkgLock *Lock;
2347 + //pkgDpkgLock *Lock;
2350 // We look pretty much exactly like a pointer to a dep cache
2351 inline operator aptitudeDepCache &() {return *Cache;};
2352 Only in aptitude-0.0.8.6-new/src/generic: aptcache.h~
2353 diff -rud aptitude-0.0.8.6/src/main.cc aptitude-0.0.8.6-new/src/main.cc
2354 --- aptitude-0.0.8.6/src/main.cc Thu Feb 1 11:20:43 2001
2355 +++ aptitude-0.0.8.6-new/src/main.cc Fri May 18 21:35:54 2001
2358 #include "../config.h"
2360 -#include <apt-pkg/init.h>
2361 +//#include <apt-pkg/init.h>
2362 +#include <apt-pkg/rpmfactory.h>
2363 +#include <apt-pkg/rpminit.h>
2365 class mypkgtree:public pkg_tree
2369 int main(int argc, char *argv[])
2372 + static RPMFactory bla;
2373 + static pkgRpmLock lock (false);
2378 setlocale(LC_ALL, "");
2379 diff -rud aptitude-0.0.8.6/src/pkg_columnizer.cc aptitude-0.0.8.6-new/src/pkg_columnizer.cc
2380 --- aptitude-0.0.8.6/src/pkg_columnizer.cc Tue May 1 21:39:13 2001
2381 +++ aptitude-0.0.8.6-new/src/pkg_columnizer.cc Fri May 18 21:35:54 2001
2383 #include <apt-pkg/strutl.h>
2384 #include <apt-pkg/error.h>
2385 #include <apt-pkg/configuration.h>
2386 -#include <apt-pkg/version.h>
2387 +//#include <apt-pkg/version.h>
2388 #ifdef HAVE_LIBAPT_PKG3
2389 #include <apt-pkg/pkgsystem.h>
2391 +#include <apt-pkg/systemfactory.h>
2392 +#define pkgCheckDep _system->checkDep
2395 column_definition_list *pkg_item::pkg_columnizer::columns=NULL;
2396 diff -rud aptitude-0.0.8.6/src/pkg_info_screen.cc aptitude-0.0.8.6-new/src/pkg_info_screen.cc
2397 --- aptitude-0.0.8.6/src/pkg_info_screen.cc Tue Dec 19 00:37:34 2000
2398 +++ aptitude-0.0.8.6-new/src/pkg_info_screen.cc Fri May 18 21:35:54 2001
2400 tree->add_child(new pkg_description(pkg.VersionList(), _("Description")));
2401 tree->add_child(new vs_staticitem(_("Priority: "),ver.PriorityType()?ver.PriorityType():"Unknown"));
2402 tree->add_child(new vs_staticitem(_("Section: "),pkg.Section()?pkg.Section():_("Unknown")));
2403 - tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
2404 + //tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
2405 tree->add_child(new vs_staticitem(_("Compressed size: "), SizeToStr(ver->Size)));
2406 tree->add_child(new vs_staticitem(_("Uncompressed size: "), SizeToStr(ver->InstalledSize)));
2408 if(!rec.SourcePkg().empty())
2409 tree->add_child(new vs_staticitem(_("Source Package: "),rec.SourcePkg()));
2412 setup_package_deps<pkg_item_with_generic_subtree>(pkg, ver, tree);
2414 diff -rud aptitude-0.0.8.6/src/pkg_ver_item.cc aptitude-0.0.8.6-new/src/pkg_ver_item.cc
2415 --- aptitude-0.0.8.6/src/pkg_ver_item.cc Thu May 3 21:02:37 2001
2416 +++ aptitude-0.0.8.6-new/src/pkg_ver_item.cc Fri May 18 21:35:54 2001
2418 #include <apt-pkg/configuration.h>
2419 #include <apt-pkg/strutl.h>
2421 +#define pkgCheckDep _system->checkDep
2423 class pkg_ver_columnizer:public column_generator
2425 pkgCache::VerIterator ver;
2426 diff -rud aptitude-0.0.8.6/src/pkg_ver_item.h aptitude-0.0.8.6-new/src/pkg_ver_item.h
2427 --- aptitude-0.0.8.6/src/pkg_ver_item.h Sat Mar 3 16:14:59 2001
2428 +++ aptitude-0.0.8.6-new/src/pkg_ver_item.h Fri May 18 21:35:54 2001
2430 #include "pkg_grouppolicy.h"
2431 #include "pkg_item_with_subtree.h"
2433 -#include <apt-pkg/version.h>
2434 +//#include <apt-pkg/version.h>
2435 #include <apt-pkg/depcache.h>
2436 #ifdef HAVE_LIBAPT_PKG3
2437 #include <apt-pkg/pkgsystem.h>
2439 +#include <apt-pkg/systemfactory.h>
2440 +#define pkgVersionCompare _system->versionCompare
2443 class pkg_ver_item:public pkg_tree_node
2444 diff -rud aptitude-0.0.8.6/src/vscreen/Makefile.in aptitude-0.0.8.6-new/src/vscreen/Makefile.in
2445 --- aptitude-0.0.8.6/src/vscreen/Makefile.in Thu May 3 21:37:00 2001
2446 +++ aptitude-0.0.8.6-new/src/vscreen/Makefile.in Fri May 18 21:35:54 2001
2448 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
2449 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
2451 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
2452 # This Makefile.in is free software; the Free Software Foundation
2454 AUTOHEADER = @AUTOHEADER@
2457 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
2458 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
2459 INSTALL_DATA = @INSTALL_DATA@
2460 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2461 +INSTALL_STRIP_FLAG =
2462 transform = @program_transform_name@
2465 @@ -122,8 +123,12 @@
2467 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
2472 +DEP_FILES = .deps/columnify.P .deps/curses++.P .deps/vs_minibuf_win.P \
2473 +.deps/vs_pager.P .deps/vs_staticitem.P .deps/vs_statuschoice.P \
2474 +.deps/vs_statusedit.P .deps/vs_tree.P .deps/vs_treeitem.P \
2476 SOURCES = $(libvscreen_a_SOURCES)
2477 OBJECTS = $(libvscreen_a_OBJECTS)
2481 .SUFFIXES: .S .c .cc .o .s
2482 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
2483 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/vscreen/Makefile
2484 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vscreen/Makefile
2486 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2487 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
2488 cd $(top_builddir) \
2489 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2493 maintainer-clean-noinstLIBRARIES:
2501 @@ -267,6 +269,11 @@
2502 subdir = src/vscreen
2504 distdir: $(DISTFILES)
2505 + here=`cd $(top_builddir) && pwd`; \
2506 + top_distdir=`cd $(top_distdir) && pwd`; \
2507 + distdir=`cd $(distdir) && pwd`; \
2508 + cd $(top_srcdir) \
2509 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/vscreen/Makefile
2510 @for file in $(DISTFILES); do \
2512 if test -d $$d/$$file; then \
2513 @@ -287,32 +294,57 @@
2517 -columnify.o: columnify.cc columnify.h
2518 -curses++.o: curses++.cc curses++.h
2519 -vs_minibuf_win.o: vs_minibuf_win.cc vs_minibuf_win.h vscreen.h \
2520 - curses++.h config/colors.h
2521 -vs_pager.o: vs_pager.cc vs_pager.h vs_minibuf_win.h vscreen.h curses++.h \
2522 - config/colors.h vs_statusedit.h config/keybindings.h \
2523 - config/../../strhash.h config/../curses++.h
2524 -vs_staticitem.o: vs_staticitem.cc vs_staticitem.h vs_treeitem.h \
2525 - curses++.h config/colors.h vs_minibuf_win.h vscreen.h vs_tree.h
2526 -vs_statuschoice.o: vs_statuschoice.cc vs_statuschoice.h vs_minibuf_win.h \
2527 - vscreen.h curses++.h config/colors.h config/keybindings.h \
2528 - config/../../strhash.h config/../curses++.h
2529 -vs_statusedit.o: vs_statusedit.cc vs_statusedit.h vs_minibuf_win.h \
2530 - vscreen.h curses++.h config/colors.h config/keybindings.h \
2531 - config/../../strhash.h config/../curses++.h
2532 -vs_tree.o: vs_tree.cc vs_tree.h vs_minibuf_win.h vscreen.h curses++.h \
2533 - config/colors.h vs_treeitem.h vs_statusedit.h \
2534 - config/keybindings.h config/../../strhash.h \
2535 - config/../curses++.h
2536 -vs_treeitem.o: vs_treeitem.cc vs_treeitem.h curses++.h config/colors.h \
2537 - vs_minibuf_win.h vscreen.h vs_tree.h
2538 -vscreen.o: vscreen.cc vscreen.h curses++.h config/keybindings.h \
2539 - config/../../strhash.h config/../curses++.h config/colors.h \
2540 - vs_tree.h vs_minibuf_win.h vs_treeitem.h vs_statusedit.h \
2541 - vs_statuschoice.h vs_pager.h
2543 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
2545 +-include $(DEP_FILES)
2547 +mostlyclean-depend:
2554 +maintainer-clean-depend:
2557 + @echo '$(COMPILE) -c $<'; \
2558 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2559 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2560 + tr ' ' '\012' < .deps/$(*F).pp \
2561 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2562 + >> .deps/$(*F).P; \
2566 + @echo '$(LTCOMPILE) -c $<'; \
2567 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2568 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2569 + < .deps/$(*F).pp > .deps/$(*F).P; \
2570 + tr ' ' '\012' < .deps/$(*F).pp \
2571 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2572 + >> .deps/$(*F).P; \
2573 + rm -f .deps/$(*F).pp
2576 + @echo '$(CXXCOMPILE) -c $<'; \
2577 + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2578 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2579 + tr ' ' '\012' < .deps/$(*F).pp \
2580 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2581 + >> .deps/$(*F).P; \
2585 + @echo '$(LTCXXCOMPILE) -c $<'; \
2586 + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2587 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2588 + < .deps/$(*F).pp > .deps/$(*F).P; \
2589 + tr ' ' '\012' < .deps/$(*F).pp \
2590 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2591 + >> .deps/$(*F).P; \
2592 + rm -f .deps/$(*F).pp
2594 info: info-recursive
2597 all-am: Makefile $(LIBRARIES)
2598 all-redirect: all-recursive
2600 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
2601 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
2602 installdirs: installdirs-recursive
2605 @@ -351,23 +383,25 @@
2606 maintainer-clean-generic:
2607 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
2608 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
2609 - mostlyclean-tags mostlyclean-generic
2610 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
2612 mostlyclean: mostlyclean-recursive
2614 -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
2616 +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
2617 + clean-generic mostlyclean-am
2619 clean: clean-recursive
2621 distclean-am: distclean-noinstLIBRARIES distclean-compile \
2622 - distclean-tags distclean-generic clean-am
2623 + distclean-tags distclean-depend distclean-generic \
2626 distclean: distclean-recursive
2628 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
2629 maintainer-clean-compile maintainer-clean-tags \
2630 - maintainer-clean-generic distclean-am
2631 + maintainer-clean-depend maintainer-clean-generic \
2633 @echo "This command is intended for maintainers to use;"
2634 @echo "it deletes files that may require special tools to rebuild."
2636 @@ -382,12 +416,14 @@
2637 all-recursive check-recursive installcheck-recursive info-recursive \
2638 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
2639 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
2640 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
2641 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
2642 -install-exec install-data-am install-data install-am install \
2643 -uninstall-am uninstall all-redirect all-am all installdirs-am \
2644 -installdirs mostlyclean-generic distclean-generic clean-generic \
2645 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
2646 +distclean-tags clean-tags maintainer-clean-tags distdir \
2647 +mostlyclean-depend distclean-depend clean-depend \
2648 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
2649 +installcheck-am installcheck install-exec-am install-exec \
2650 +install-data-am install-data install-am install uninstall-am uninstall \
2651 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
2652 +distclean-generic clean-generic maintainer-clean-generic clean \
2653 +mostlyclean distclean maintainer-clean
2656 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2657 Only in aptitude-0.0.8.6-new/src/vscreen: Makefile.in~
2658 diff -rud aptitude-0.0.8.6/src/vscreen/config/Makefile.in aptitude-0.0.8.6-new/src/vscreen/config/Makefile.in
2659 --- aptitude-0.0.8.6/src/vscreen/config/Makefile.in Thu May 3 21:37:01 2001
2660 +++ aptitude-0.0.8.6-new/src/vscreen/config/Makefile.in Fri May 18 21:35:54 2001
2662 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
2663 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
2665 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
2666 # This Makefile.in is free software; the Free Software Foundation
2668 AUTOHEADER = @AUTOHEADER@
2671 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
2672 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
2673 INSTALL_DATA = @INSTALL_DATA@
2674 INSTALL_SCRIPT = @INSTALL_SCRIPT@
2675 +INSTALL_STRIP_FLAG =
2676 transform = @program_transform_name@
2679 @@ -118,8 +119,10 @@
2681 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
2686 +DEP_FILES = .deps/colors.P .deps/column_definition.P \
2687 +.deps/keybindings.P
2688 SOURCES = $(libconf_a_SOURCES)
2689 OBJECTS = $(libconf_a_OBJECTS)
2693 .SUFFIXES: .S .c .cc .o .s
2694 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
2695 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/vscreen/config/Makefile
2696 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vscreen/config/Makefile
2698 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
2699 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
2700 cd $(top_builddir) \
2701 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
2705 maintainer-clean-noinstLIBRARIES:
2713 @@ -203,6 +203,11 @@
2714 subdir = src/vscreen/config
2716 distdir: $(DISTFILES)
2717 + here=`cd $(top_builddir) && pwd`; \
2718 + top_distdir=`cd $(top_distdir) && pwd`; \
2719 + distdir=`cd $(distdir) && pwd`; \
2720 + cd $(top_srcdir) \
2721 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/vscreen/config/Makefile
2722 @for file in $(DISTFILES); do \
2724 if test -d $$d/$$file; then \
2725 @@ -213,12 +218,57 @@
2726 || cp -p $$d/$$file $(distdir)/$$file || :; \
2729 -colors.o: colors.cc colors.h ../vscreen.h ../curses++.h ../../strhash.h
2730 -column_definition.o: column_definition.cc column_definition.h \
2732 -keybindings.o: keybindings.cc keybindings.h ../../strhash.h \
2733 - ../curses++.h ../../../config.h
2735 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
2737 +-include $(DEP_FILES)
2739 +mostlyclean-depend:
2746 +maintainer-clean-depend:
2749 + @echo '$(COMPILE) -c $<'; \
2750 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2751 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2752 + tr ' ' '\012' < .deps/$(*F).pp \
2753 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2754 + >> .deps/$(*F).P; \
2758 + @echo '$(LTCOMPILE) -c $<'; \
2759 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2760 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2761 + < .deps/$(*F).pp > .deps/$(*F).P; \
2762 + tr ' ' '\012' < .deps/$(*F).pp \
2763 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2764 + >> .deps/$(*F).P; \
2765 + rm -f .deps/$(*F).pp
2768 + @echo '$(CXXCOMPILE) -c $<'; \
2769 + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2770 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
2771 + tr ' ' '\012' < .deps/$(*F).pp \
2772 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2773 + >> .deps/$(*F).P; \
2777 + @echo '$(LTCXXCOMPILE) -c $<'; \
2778 + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
2779 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
2780 + < .deps/$(*F).pp > .deps/$(*F).P; \
2781 + tr ' ' '\012' < .deps/$(*F).pp \
2782 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
2783 + >> .deps/$(*F).P; \
2784 + rm -f .deps/$(*F).pp
2789 all-am: Makefile $(LIBRARIES)
2790 all-redirect: all-am
2792 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
2793 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
2797 @@ -256,23 +306,25 @@
2798 maintainer-clean-generic:
2799 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
2800 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
2801 - mostlyclean-tags mostlyclean-generic
2802 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
2804 mostlyclean: mostlyclean-am
2806 -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
2808 +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
2809 + clean-generic mostlyclean-am
2813 distclean-am: distclean-noinstLIBRARIES distclean-compile \
2814 - distclean-tags distclean-generic clean-am
2815 + distclean-tags distclean-depend distclean-generic \
2818 distclean: distclean-am
2820 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
2821 maintainer-clean-compile maintainer-clean-tags \
2822 - maintainer-clean-generic distclean-am
2823 + maintainer-clean-depend maintainer-clean-generic \
2825 @echo "This command is intended for maintainers to use;"
2826 @echo "it deletes files that may require special tools to rebuild."
2828 @@ -282,12 +334,13 @@
2829 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
2830 mostlyclean-compile distclean-compile clean-compile \
2831 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
2832 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
2833 -check-am installcheck-am installcheck install-exec-am install-exec \
2834 -install-data-am install-data install-am install uninstall-am uninstall \
2835 -all-redirect all-am all installdirs mostlyclean-generic \
2836 -distclean-generic clean-generic maintainer-clean-generic clean \
2837 -mostlyclean distclean maintainer-clean
2838 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
2839 +distclean-depend clean-depend maintainer-clean-depend info-am info \
2840 +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
2841 +install-exec install-data-am install-data install-am install \
2842 +uninstall-am uninstall all-redirect all-am all installdirs \
2843 +mostlyclean-generic distclean-generic clean-generic \
2844 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
2847 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2848 Only in aptitude-0.0.8.6-new/src/vscreen/config: Makefile.in~