2 Description: Needs to be broken out (FIXME).
4 diff -Naurp apachetop.orig/Makefile.in apachetop/Makefile.in
5 --- apachetop.orig/Makefile.in 2009-07-16 21:43:27.000000000 +0000
6 +++ apachetop/Makefile.in 2009-07-16 21:46:39.000000000 +0000
8 -# Makefile.in generated automatically by automake 1.5 from Makefile.am.
9 +# Makefile.in generated by automake 1.7.9 from Makefile.am.
12 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
13 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
14 # Free Software Foundation, Inc.
15 # This Makefile.in is free software; the Free Software Foundation
16 # gives unlimited permission to copy and/or distribute it,
24 top_srcdir = @top_srcdir@
27 -exec_prefix = @exec_prefix@
31 -libexecdir = @libexecdir@
33 -sysconfdir = @sysconfdir@
34 -sharedstatedir = @sharedstatedir@
35 -localstatedir = @localstatedir@
39 -includedir = @includedir@
40 -oldincludedir = /usr/include
41 pkgdatadir = $(datadir)/@PACKAGE@
42 pkglibdir = $(libdir)/@PACKAGE@
43 pkgincludedir = $(includedir)/@PACKAGE@
47 -AUTOCONF = @AUTOCONF@
48 -AUTOMAKE = @AUTOMAKE@
49 -AUTOHEADER = @AUTOHEADER@
51 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
53 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
54 -INSTALL_DATA = @INSTALL_DATA@
55 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
56 +install_sh_DATA = $(install_sh) -c -m 644
57 +install_sh_PROGRAM = $(install_sh) -c
58 +install_sh_SCRIPT = $(install_sh) -c
59 INSTALL_HEADER = $(INSTALL_DATA)
60 -transform = @program_transform_name@
61 +transform = $(program_transform_name)
69 +AMDEP_FALSE = @AMDEP_FALSE@
70 +AMDEP_TRUE = @AMDEP_TRUE@
72 +AUTOCONF = @AUTOCONF@
73 +AUTOHEADER = @AUTOHEADER@
74 +AUTOMAKE = @AUTOMAKE@
76 +CPPFLAGS = @CPPFLAGS@
79 +CXXDEPMODE = @CXXDEPMODE@
81 +CYGPATH_W = @CYGPATH_W@
89 HAVE_READLINE = @HAVE_READLINE@
90 +INSTALL_DATA = @INSTALL_DATA@
91 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
92 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
93 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
97 +LTLIBOBJS = @LTLIBOBJS@
98 +MAKEINFO = @MAKEINFO@
101 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
102 +PACKAGE_NAME = @PACKAGE_NAME@
103 +PACKAGE_STRING = @PACKAGE_STRING@
104 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
105 +PACKAGE_VERSION = @PACKAGE_VERSION@
106 +PATH_SEPARATOR = @PATH_SEPARATOR@
107 +SET_MAKE = @SET_MAKE@
111 +ac_ct_CXX = @ac_ct_CXX@
112 +ac_ct_STRIP = @ac_ct_STRIP@
113 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
114 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
115 am__include = @am__include@
116 +am__leading_dot = @am__leading_dot@
117 am__quote = @am__quote@
119 +build_alias = @build_alias@
121 +exec_prefix = @exec_prefix@
122 +host_alias = @host_alias@
123 +includedir = @includedir@
125 install_sh = @install_sh@
127 +libexecdir = @libexecdir@
128 +localstatedir = @localstatedir@
130 +oldincludedir = @oldincludedir@
132 +program_transform_name = @program_transform_name@
134 +sharedstatedir = @sharedstatedir@
135 +sysconfdir = @sysconfdir@
136 +target_alias = @target_alias@
138 SUBDIRS = man src config
140 @@ -84,25 +119,27 @@ CONFIG_HEADER = config.h
144 -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
145 - uninstall-info-recursive all-recursive install-data-recursive \
146 - install-exec-recursive installdirs-recursive install-recursive \
147 - uninstall-recursive check-recursive installcheck-recursive
148 -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
149 - Makefile.am Makefile.in NEWS TODO aclocal.m4 config.h.in \
150 - configure configure.ac
151 +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
152 + ps-recursive install-info-recursive uninstall-info-recursive \
153 + all-recursive install-data-recursive install-exec-recursive \
154 + installdirs-recursive install-recursive uninstall-recursive \
155 + check-recursive installcheck-recursive
156 +DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
157 + COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
158 + config.h.in configure configure.ac
159 DIST_SUBDIRS = $(SUBDIRS)
161 $(MAKE) $(AM_MAKEFLAGS) all-recursive
165 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
167 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
168 cd $(top_srcdir) && \
169 $(AUTOMAKE) --gnu Makefile
170 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
171 - cd $(top_builddir) && \
172 - CONFIG_HEADERS= CONFIG_LINKS= \
173 - CONFIG_FILES=$@ $(SHELL) ./config.status
174 + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
176 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
177 $(SHELL) ./config.status --recheck
178 @@ -111,31 +148,23 @@ $(srcdir)/configure: $(srcdir)/configur
180 $(ACLOCAL_M4): configure.ac
181 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
183 - @if test ! -f $@; then \
187 -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
188 - @rm -f stamp-h stamp-hT
189 - @echo timestamp > stamp-hT 2> /dev/null
190 - cd $(top_builddir) \
191 - && CONFIG_FILES= CONFIG_HEADERS=config.h \
192 - $(SHELL) ./config.status
193 - @mv stamp-hT stamp-h
194 -$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
197 @if test ! -f $@; then \
198 - rm -f $(srcdir)/./stamp-h.in; \
199 - $(MAKE) $(srcdir)/./stamp-h.in; \
201 + $(MAKE) stamp-h1; \
203 -$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
204 - @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
205 - @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
207 +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
209 + cd $(top_builddir) && $(SHELL) ./config.status config.h
211 +$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
212 cd $(top_srcdir) && $(AUTOHEADER)
213 - @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
214 + touch $(srcdir)/config.h.in
218 + -rm -f config.h stamp-h1
221 # This directory's subdirectories are mostly independent; you can cd
222 @@ -145,7 +174,7 @@ uninstall-info-am:
223 # (which will cause the Makefiles to be regenerated when you run `make');
224 # (2) otherwise, pass the desired values on the `make' command line.
225 $(RECURSIVE_TARGETS):
226 - @set fnord $(MAKEFLAGS); amf=$$2; \
227 + @set fnord $$MAKEFLAGS; amf=$$2; \
229 target=`echo $@ | sed s/-recursive//`; \
230 list='$(SUBDIRS)'; for subdir in $$list; do \
231 @@ -165,7 +194,7 @@ $(RECURSIVE_TARGETS):
233 mostlyclean-recursive clean-recursive distclean-recursive \
234 maintainer-clean-recursive:
235 - @set fnord $(MAKEFLAGS); amf=$$2; \
236 + @set fnord $$MAKEFLAGS; amf=$$2; \
239 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
240 @@ -192,71 +221,119 @@ tags-recursive:
241 list='$(SUBDIRS)'; for subdir in $$list; do \
242 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
245 + list='$(SUBDIRS)'; for subdir in $$list; do \
246 + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
257 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
258 - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
259 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
260 unique=`for i in $$list; do \
261 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
263 $(AWK) ' { files[$$0] = 1; } \
264 END { for (i in files) print i; }'`; \
265 - mkid -fID $$unique $(LISP)
268 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
269 $(TAGS_FILES) $(LISP)
272 + if (etags --etags-include --version) >/dev/null 2>&1; then \
273 + include_option=--etags-include; \
275 + include_option=--include; \
277 list='$(SUBDIRS)'; for subdir in $$list; do \
278 if test "$$subdir" = .; then :; else \
279 - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
280 + test -f $$subdir/TAGS && \
281 + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
284 - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
285 + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
286 + unique=`for i in $$list; do \
287 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
289 + $(AWK) ' { files[$$0] = 1; } \
290 + END { for (i in files) print i; }'`; \
291 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
292 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
296 +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
297 + $(TAGS_FILES) $(LISP)
300 + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
301 unique=`for i in $$list; do \
302 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
304 $(AWK) ' { files[$$0] = 1; } \
305 END { for (i in files) print i; }'`; \
306 - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
307 - || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
308 + test -z "$(CTAGS_ARGS)$$tags$$unique" \
309 + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
313 - here=`CDPATH=: && cd $(top_builddir) && pwd` \
314 + here=`$(am__cd) $(top_builddir) && pwd` \
315 && cd $(top_srcdir) \
316 && gtags -i $(GTAGS_ARGS) $$here
319 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
321 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
322 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
325 -# Avoid unsightly `./'.
326 distdir = $(PACKAGE)-$(VERSION)
328 +am__remove_distdir = \
329 + { test ! -d $(distdir) \
330 + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
331 + && rm -fr $(distdir); }; }
334 +distuninstallcheck_listfiles = find . -type f -print
335 +distcleancheck_listfiles = find . -type f -print
337 distdir: $(DISTFILES)
338 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
339 + $(am__remove_distdir)
341 - @for file in $(DISTFILES); do \
342 - if test -f $$file; then d=.; else d=$(srcdir); fi; \
343 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
344 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
345 + list='$(DISTFILES)'; for file in $$list; do \
347 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
348 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
350 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
351 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
352 if test "$$dir" != "$$file" && test "$$dir" != "."; then \
353 - $(mkinstalldirs) "$(distdir)/$$dir"; \
355 + $(mkinstalldirs) "$(distdir)$$dir"; \
359 if test -d $$d/$$file; then \
360 - cp -pR $$d/$$file $(distdir) \
362 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
363 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
365 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
367 test -f $(distdir)/$$file \
368 || cp -p $$d/$$file $(distdir)/$$file \
372 - for subdir in $(SUBDIRS); do \
373 + list='$(SUBDIRS)'; for subdir in $$list; do \
374 if test "$$subdir" = .; then :; else \
375 test -d $(distdir)/$$subdir \
376 || mkdir $(distdir)/$$subdir \
377 @@ -274,41 +351,70 @@ distdir: $(DISTFILES)
378 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
379 ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
380 || chmod -R a+r $(distdir)
383 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
384 + $(am__remove_distdir)
386 +dist dist-all: distdir
387 $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
388 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
389 + $(am__remove_distdir)
391 # This target untars the dist file and tries a VPATH configuration. Then
392 # it guarantees that the distribution is self-contained by making another
395 - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
396 + $(am__remove_distdir)
397 GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
398 chmod -R a-w $(distdir); chmod a+w $(distdir)
399 - mkdir $(distdir)/=build
400 - mkdir $(distdir)/=inst
401 + mkdir $(distdir)/_build
402 + mkdir $(distdir)/_inst
404 - dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
405 - && cd $(distdir)/=build \
406 - && ../configure --srcdir=.. --prefix=$$dc_install_base \
407 + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
408 + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
409 + && cd $(distdir)/_build \
410 + && ../configure --srcdir=.. --prefix="$$dc_install_base" \
411 + $(DISTCHECK_CONFIGURE_FLAGS) \
412 && $(MAKE) $(AM_MAKEFLAGS) \
413 && $(MAKE) $(AM_MAKEFLAGS) dvi \
414 && $(MAKE) $(AM_MAKEFLAGS) check \
415 && $(MAKE) $(AM_MAKEFLAGS) install \
416 && $(MAKE) $(AM_MAKEFLAGS) installcheck \
417 && $(MAKE) $(AM_MAKEFLAGS) uninstall \
418 - && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
419 - || (echo "Error: files left after uninstall" 1>&2; \
421 - && $(MAKE) $(AM_MAKEFLAGS) dist \
422 - && $(MAKE) $(AM_MAKEFLAGS) distclean \
423 + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
424 + distuninstallcheck \
425 + && chmod -R a-w "$$dc_install_base" \
427 + (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
428 + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
429 + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
430 + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
431 + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
432 + } || { rm -rf "$$dc_destdir"; exit 1; }) \
433 + && rm -rf "$$dc_destdir" \
434 + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
435 && rm -f $(distdir).tar.gz \
436 - && (test `find . -type f -print | wc -l` -eq 0 \
437 - || (echo "Error: files left after distclean" 1>&2; \
439 - -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
440 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
441 + $(am__remove_distdir)
442 @echo "$(distdir).tar.gz is ready for distribution" | \
443 sed 'h;s/./=/g;p;x;p;x'
445 + @cd $(distuninstallcheck_dir) \
446 + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
447 + || { echo "ERROR: files left after uninstall:" ; \
448 + if test -n "$(DESTDIR)"; then \
449 + echo " (check DESTDIR support)"; \
451 + $(distuninstallcheck_listfiles) ; \
453 +distcleancheck: distclean
454 + @if test '$(srcdir)' = . ; then \
455 + echo "ERROR: distcleancheck can only run from a VPATH build" ; \
458 + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
459 + || { echo "ERROR: files left in build directory after distclean:" ; \
460 + $(distcleancheck_listfiles) ; \
463 check: check-recursive
464 all-am: Makefile config.h
465 @@ -326,6 +432,7 @@ install-am: all-am
466 installcheck: installcheck-recursive
468 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
469 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
470 `test -z '$(STRIP)' || \
471 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
473 @@ -333,7 +440,7 @@ mostlyclean-generic:
477 - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
478 + -rm -f $(CONFIG_CLEAN_FILES)
480 maintainer-clean-generic:
481 @echo "This command is intended for maintainers to use"
482 @@ -343,11 +450,9 @@ clean: clean-recursive
484 clean-am: clean-generic mostlyclean-am
487 - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
488 - -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
489 distclean: distclean-recursive
490 - -rm -f config.status config.cache config.log
491 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
493 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
496 @@ -369,31 +474,43 @@ install-man:
499 maintainer-clean: maintainer-clean-recursive
501 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
502 + -rm -rf $(top_srcdir)/autom4te.cache
504 maintainer-clean-am: distclean-am maintainer-clean-generic
506 mostlyclean: mostlyclean-recursive
508 mostlyclean-am: mostlyclean-generic
518 uninstall-am: uninstall-info-am
520 uninstall-info: uninstall-info-recursive
522 -.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
523 - clean-generic clean-recursive dist dist-all distcheck distclean \
524 - distclean-generic distclean-hdr distclean-recursive \
525 - distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
526 - info-recursive install install-am install-data install-data-am \
527 - install-data-recursive install-exec install-exec-am \
528 - install-exec-recursive install-info install-info-am \
529 - install-info-recursive install-man install-recursive \
530 - install-strip installcheck installcheck-am installdirs \
531 - installdirs-am installdirs-recursive maintainer-clean \
532 - maintainer-clean-generic maintainer-clean-recursive mostlyclean \
533 - mostlyclean-generic mostlyclean-recursive tags tags-recursive \
534 - uninstall uninstall-am uninstall-info-am \
535 - uninstall-info-recursive uninstall-recursive
536 +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
537 + clean-generic clean-recursive ctags ctags-recursive dist \
538 + dist-all dist-gzip distcheck distclean distclean-generic \
539 + distclean-hdr distclean-recursive distclean-tags distcleancheck \
540 + distdir distuninstallcheck dvi dvi-am dvi-recursive info \
541 + info-am info-recursive install install-am install-data \
542 + install-data-am install-data-recursive install-exec \
543 + install-exec-am install-exec-recursive install-info \
544 + install-info-am install-info-recursive install-man \
545 + install-recursive install-strip installcheck installcheck-am \
546 + installdirs installdirs-am installdirs-recursive \
547 + maintainer-clean maintainer-clean-generic \
548 + maintainer-clean-recursive mostlyclean mostlyclean-generic \
549 + mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
550 + ps-recursive tags tags-recursive uninstall uninstall-am \
551 + uninstall-info-am uninstall-info-recursive uninstall-recursive
553 # Tell versions [3.59,3.63) of GNU make to not export all variables.
554 # Otherwise a system limit (for SysV at least) may be exceeded.
555 diff -Naurp apachetop.orig/aclocal.m4 apachetop/aclocal.m4
556 --- apachetop.orig/aclocal.m4 2009-07-16 21:43:27.000000000 +0000
557 +++ apachetop/aclocal.m4 2009-07-16 21:46:39.000000000 +0000
559 -# aclocal.m4 generated automatically by aclocal 1.5
560 +# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
562 -# Copyright 1996, 1997, 1998, 1999, 2000, 2001
563 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
564 # Free Software Foundation, Inc.
565 # This file is free software; the Free Software Foundation
566 # gives unlimited permission to copy and/or distribute it,
567 @@ -11,142 +11,113 @@
568 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
569 # PARTICULAR PURPOSE.
571 -# Like AC_CONFIG_HEADER, but automatically create stamp file.
572 +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
575 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
577 -# When config.status generates a header, we must update the stamp-h file.
578 -# This file resides in the same directory as the config header
579 -# that is generated. We must strip everything past the first ":",
580 -# and everything past the last "/".
581 +# This program is free software; you can redistribute it and/or modify
582 +# it under the terms of the GNU General Public License as published by
583 +# the Free Software Foundation; either version 2, or (at your option)
584 +# any later version.
587 +# This program is distributed in the hope that it will be useful,
588 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
589 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
590 +# GNU General Public License for more details.
592 -AC_DEFUN([AM_CONFIG_HEADER],
593 -[ifdef([AC_FOREACH],dnl
594 - [dnl init our file count if it isn't already
595 - m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
596 - dnl prepare to store our destination file list for use in config.status
597 - AC_FOREACH([_AM_File], [$1],
598 - [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
599 - m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
600 - dnl and add it to the list of files AC keeps track of, along
602 - AC_CONFIG_HEADERS(_AM_File,
603 -dnl COMMANDS, [, INIT-CMDS]
604 -[# update the timestamp
605 -echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
606 -][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
607 - m4_popdef([_AM_Dest])])],dnl
608 -[AC_CONFIG_HEADER([$1])
609 - AC_OUTPUT_COMMANDS(
610 - ifelse(patsubst([$1], [[^ ]], []),
612 - [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
613 - patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
615 -for am_file in $1; do
616 - case " \$CONFIG_HEADERS " in
618 - am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
619 - if test -n "\$am_dir"; then
620 - am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
621 - for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
622 - am_tmpdir=\$am_tmpdir\$am_subdir/
623 - if test ! -d \$am_tmpdir; then
628 - echo timestamp > "\$am_dir"stamp-h\$am_indx
631 - am_indx=\`expr \$am_indx + 1\`
633 -])]) # AM_CONFIG_HEADER
634 +# You should have received a copy of the GNU General Public License
635 +# along with this program; if not, write to the Free Software
636 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
641 -# Like AS_DIRNAME, only do it during macro expansion
642 -AC_DEFUN([_AM_DIRNAME],
643 - [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
644 - m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
645 - m4_if(m4_regexp([$1], [^/.*]), -1,
647 - m4_patsubst([$1], [^\(/\).*], [\1])),
648 - m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
649 - m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
652 -# Do all the work for Automake. This macro actually does too much --
653 -# some checks are only needed if your package does certain things.
654 -# But this isn't really a big deal.
660 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
661 -# written in clear, in which case automake, when reading aclocal.m4,
662 -# will think it sees a *use*, and therefore will trigger all it's
663 -# C support machinery. Also note that it means that autoscan, seeing
664 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
665 +# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
666 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
668 +# Do all the work for Automake. -*- Autoconf -*-
670 -# We require 2.13 because we rely on SHELL being computed by configure.
672 +# This macro actually does too much some checks are only needed if
673 +# your package does certain things. But this isn't really a big deal.
675 -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
676 -# -----------------------------------------------------------
677 -# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
678 -# The purpose of this macro is to provide the user with a means to
679 -# check macros which are provided without letting her know how the
680 -# information is coded.
681 -# If this macro is not defined by Autoconf, define it here.
682 -ifdef([AC_PROVIDE_IFELSE],
684 - [define([AC_PROVIDE_IFELSE],
685 - [ifdef([AC_PROVIDE_$1],
687 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
688 +# Free Software Foundation, Inc.
690 +# This program is free software; you can redistribute it and/or modify
691 +# it under the terms of the GNU General Public License as published by
692 +# the Free Software Foundation; either version 2, or (at your option)
693 +# any later version.
695 +# This program is distributed in the hope that it will be useful,
696 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
697 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
698 +# GNU General Public License for more details.
700 +# You should have received a copy of the GNU General Public License
701 +# along with this program; if not, write to the Free Software
702 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
707 -# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
708 -# ----------------------------------------------
711 +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
712 +# the ones we care about.
713 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
715 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
716 +# AM_INIT_AUTOMAKE([OPTIONS])
717 +# -----------------------------------------------
718 +# The call with PACKAGE and VERSION arguments is the old style
719 +# call (pre autoconf-2.50), which is being phased out. PACKAGE
720 +# and VERSION should now be passed to AC_INIT and removed from
721 +# the call to AM_INIT_AUTOMAKE.
722 +# We support both call styles for the transition. After
723 +# the next Automake release, Autoconf can make the AC_INIT
724 +# arguments mandatory, and then we can depend on a new Autoconf
725 +# release and drop the old call support.
726 AC_DEFUN([AM_INIT_AUTOMAKE],
727 -[AC_REQUIRE([AC_PROG_INSTALL])dnl
728 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
729 + AC_REQUIRE([AC_PROG_INSTALL])dnl
730 # test to see if srcdir already configured
731 -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
732 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
733 test -f $srcdir/config.status; then
734 - AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
735 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
738 -# Define the identity of the package.
740 -AC_SUBST(PACKAGE)dnl
742 -AC_SUBST(VERSION)dnl
744 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
745 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
746 +# test whether we have cygpath
747 +if test -z "$CYGPATH_W"; then
748 + if (cygpath --version) >/dev/null 2>/dev/null; then
749 + CYGPATH_W='cygpath -w'
754 +AC_SUBST([CYGPATH_W])
756 -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
757 -# the ones we care about.
758 -ifdef([m4_pattern_allow],
759 - [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
760 +# Define the identity of the package.
761 +dnl Distinguish between old-style and new-style calls.
763 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
764 + AC_SUBST([PACKAGE], [$1])dnl
765 + AC_SUBST([VERSION], [$2])],
766 +[_AM_SET_OPTIONS([$1])dnl
767 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
768 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
770 -# Autoconf 2.50 always computes EXEEXT. However we need to be
771 -# compatible with 2.13, for now. So we always define EXEEXT, but we
774 -# Similar for OBJEXT -- only we only use OBJEXT if the user actually
775 -# requests that it be used. This is a bit dumb.
778 +_AM_IF_OPTION([no-define],,
779 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
780 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
782 # Some tools Automake needs.
783 AC_REQUIRE([AM_SANITY_CHECK])dnl
784 AC_REQUIRE([AC_ARG_PROGRAM])dnl
785 -AM_MISSING_PROG(ACLOCAL, aclocal)
786 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
787 AM_MISSING_PROG(AUTOCONF, autoconf)
788 -AM_MISSING_PROG(AUTOMAKE, automake)
789 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
790 AM_MISSING_PROG(AUTOHEADER, autoheader)
791 AM_MISSING_PROG(MAKEINFO, makeinfo)
792 AM_MISSING_PROG(AMTAR, tar)
793 @@ -156,22 +127,135 @@ AM_PROG_INSTALL_STRIP
795 AC_REQUIRE([AC_PROG_AWK])dnl
796 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
797 -AC_REQUIRE([AM_DEP_TRACK])dnl
798 -AC_REQUIRE([AM_SET_DEPDIR])dnl
799 -AC_PROVIDE_IFELSE([AC_PROG_][CC],
800 +AC_REQUIRE([AM_SET_LEADING_DOT])dnl
802 +_AM_IF_OPTION([no-dependencies],,
803 +[AC_PROVIDE_IFELSE([AC_PROG_CC],
804 [_AM_DEPENDENCIES(CC)],
805 - [define([AC_PROG_][CC],
806 - defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
807 -AC_PROVIDE_IFELSE([AC_PROG_][CXX],
808 + [define([AC_PROG_CC],
809 + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
810 +AC_PROVIDE_IFELSE([AC_PROG_CXX],
811 [_AM_DEPENDENCIES(CXX)],
812 - [define([AC_PROG_][CXX],
813 - defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
814 + [define([AC_PROG_CXX],
815 + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
820 +# When config.status generates a header, we must update the stamp-h file.
821 +# This file resides in the same directory as the config header
822 +# that is generated. The stamp files are numbered to have different names.
824 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
825 +# loop where config.status creates the headers, so we can generate
826 +# our stamp files there.
827 +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
828 +[# Compute $1's index in $config_headers.
830 +for _am_header in $config_headers :; do
831 + case $_am_header in
835 + _am_stamp_count=`expr $_am_stamp_count + 1` ;;
838 +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
840 +# Copyright 2002 Free Software Foundation, Inc.
842 +# This program is free software; you can redistribute it and/or modify
843 +# it under the terms of the GNU General Public License as published by
844 +# the Free Software Foundation; either version 2, or (at your option)
845 +# any later version.
847 +# This program is distributed in the hope that it will be useful,
848 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
849 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
850 +# GNU General Public License for more details.
852 +# You should have received a copy of the GNU General Public License
853 +# along with this program; if not, write to the Free Software
854 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
856 +# AM_AUTOMAKE_VERSION(VERSION)
857 +# ----------------------------
858 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
859 +# generated from the m4 files accompanying Automake X.Y.
860 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
862 +# AM_SET_CURRENT_AUTOMAKE_VERSION
863 +# -------------------------------
864 +# Call AM_AUTOMAKE_VERSION so it can be traced.
865 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
866 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
867 + [AM_AUTOMAKE_VERSION([1.7.9])])
869 +# Helper functions for option handling. -*- Autoconf -*-
871 +# Copyright 2001, 2002 Free Software Foundation, Inc.
873 +# This program is free software; you can redistribute it and/or modify
874 +# it under the terms of the GNU General Public License as published by
875 +# the Free Software Foundation; either version 2, or (at your option)
876 +# any later version.
878 +# This program is distributed in the hope that it will be useful,
879 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
880 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
881 +# GNU General Public License for more details.
883 +# You should have received a copy of the GNU General Public License
884 +# along with this program; if not, write to the Free Software
885 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
890 +# _AM_MANGLE_OPTION(NAME)
891 +# -----------------------
892 +AC_DEFUN([_AM_MANGLE_OPTION],
893 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
895 +# _AM_SET_OPTION(NAME)
896 +# ------------------------------
897 +# Set option NAME. Presently that only means defining a flag for this option.
898 +AC_DEFUN([_AM_SET_OPTION],
899 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
901 +# _AM_SET_OPTIONS(OPTIONS)
902 +# ----------------------------------
903 +# OPTIONS is a space-separated list of Automake options.
904 +AC_DEFUN([_AM_SET_OPTIONS],
905 +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
907 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
908 +# -------------------------------------------
909 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
910 +AC_DEFUN([_AM_IF_OPTION],
911 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
914 # Check to make sure that the build environment is sane.
917 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
919 +# This program is free software; you can redistribute it and/or modify
920 +# it under the terms of the GNU General Public License as published by
921 +# the Free Software Foundation; either version 2, or (at your option)
922 +# any later version.
924 +# This program is distributed in the hope that it will be useful,
925 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
926 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
927 +# GNU General Public License for more details.
929 +# You should have received a copy of the GNU General Public License
930 +# along with this program; if not, write to the Free Software
931 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
937 @@ -215,8 +299,27 @@ Check your system clock])
945 +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
947 +# This program is free software; you can redistribute it and/or modify
948 +# it under the terms of the GNU General Public License as published by
949 +# the Free Software Foundation; either version 2, or (at your option)
950 +# any later version.
952 +# This program is distributed in the hope that it will be useful,
953 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
954 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
955 +# GNU General Public License for more details.
957 +# You should have received a copy of the GNU General Public License
958 +# along with this program; if not, write to the Free Software
959 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
964 # AM_MISSING_PROG(NAME, PROGRAM)
965 # ------------------------------
966 @@ -238,13 +341,29 @@ if eval "$MISSING --run true"; then
967 am_missing_run="$MISSING --run "
971 - AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
972 + AC_MSG_WARN([`missing' script is too old or missing])
978 +# Copyright 2001 Free Software Foundation, Inc.
980 +# This program is free software; you can redistribute it and/or modify
981 +# it under the terms of the GNU General Public License as published by
982 +# the Free Software Foundation; either version 2, or (at your option)
983 +# any later version.
985 +# This program is distributed in the hope that it will be useful,
986 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
987 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
988 +# GNU General Public License for more details.
990 +# You should have received a copy of the GNU General Public License
991 +# along with this program; if not, write to the Free Software
992 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
995 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
996 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
997 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
998 @@ -283,19 +402,59 @@ fi
999 # absolute PATH. The drawback is that using absolute paths prevent a
1000 # configured tree to be moved without reconfiguration.
1002 +# Rely on autoconf to set up CDPATH properly.
1005 AC_DEFUN([AM_AUX_DIR_EXPAND], [
1006 # expand $ac_aux_dir to an absolute path
1007 -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
1008 +am_aux_dir=`cd $ac_aux_dir && pwd`
1011 # AM_PROG_INSTALL_SH
1012 # ------------------
1013 # Define $install_sh.
1015 +# Copyright 2001 Free Software Foundation, Inc.
1017 +# This program is free software; you can redistribute it and/or modify
1018 +# it under the terms of the GNU General Public License as published by
1019 +# the Free Software Foundation; either version 2, or (at your option)
1020 +# any later version.
1022 +# This program is distributed in the hope that it will be useful,
1023 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1024 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1025 +# GNU General Public License for more details.
1027 +# You should have received a copy of the GNU General Public License
1028 +# along with this program; if not, write to the Free Software
1029 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1032 AC_DEFUN([AM_PROG_INSTALL_SH],
1033 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1034 install_sh=${install_sh-"$am_aux_dir/install-sh"}
1035 AC_SUBST(install_sh)])
1037 +# AM_PROG_INSTALL_STRIP
1039 +# Copyright 2001 Free Software Foundation, Inc.
1041 +# This program is free software; you can redistribute it and/or modify
1042 +# it under the terms of the GNU General Public License as published by
1043 +# the Free Software Foundation; either version 2, or (at your option)
1044 +# any later version.
1046 +# This program is distributed in the hope that it will be useful,
1047 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1048 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1049 +# GNU General Public License for more details.
1051 +# You should have received a copy of the GNU General Public License
1052 +# along with this program; if not, write to the Free Software
1053 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1056 # One issue with vendor `install' (even GNU) is that you can't
1057 # specify the program used to strip binaries. This is especially
1058 # annoying in cross-compiling environments, where the build's strip
1059 @@ -305,11 +464,68 @@ AC_SUBST(install_sh)])
1060 # STRIPPROG with the value of the STRIP variable (set by the user).
1061 AC_DEFUN([AM_PROG_INSTALL_STRIP],
1062 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1063 +# Installed binaries are usually stripped using `strip' when the user
1064 +# run `make install-strip'. However `strip' might not be the right
1065 +# tool to use in cross-compilation environments, therefore Automake
1066 +# will honor the `STRIP' environment variable to overrule this program.
1067 +dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1068 +if test "$cross_compiling" != no; then
1069 + AC_CHECK_TOOL([STRIP], [strip], :)
1071 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
1072 AC_SUBST([INSTALL_STRIP_PROGRAM])])
1074 -# serial 4 -*- Autoconf -*-
1076 +# Copyright (C) 2003 Free Software Foundation, Inc.
1078 +# This program is free software; you can redistribute it and/or modify
1079 +# it under the terms of the GNU General Public License as published by
1080 +# the Free Software Foundation; either version 2, or (at your option)
1081 +# any later version.
1083 +# This program is distributed in the hope that it will be useful,
1084 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1085 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1086 +# GNU General Public License for more details.
1088 +# You should have received a copy of the GNU General Public License
1089 +# along with this program; if not, write to the Free Software
1090 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1095 +# Check whether the underlying file-system supports filenames
1096 +# with a leading dot. For instance MS-DOS doesn't.
1097 +AC_DEFUN([AM_SET_LEADING_DOT],
1098 +[rm -rf .tst 2>/dev/null
1099 +mkdir .tst 2>/dev/null
1100 +if test -d .tst; then
1105 +rmdir .tst 2>/dev/null
1106 +AC_SUBST([am__leading_dot])])
1108 +# serial 5 -*- Autoconf -*-
1110 +# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
1112 +# This program is free software; you can redistribute it and/or modify
1113 +# it under the terms of the GNU General Public License as published by
1114 +# the Free Software Foundation; either version 2, or (at your option)
1115 +# any later version.
1117 +# This program is distributed in the hope that it will be useful,
1118 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1119 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1120 +# GNU General Public License for more details.
1122 +# You should have received a copy of the GNU General Public License
1123 +# along with this program; if not, write to the Free Software
1124 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1128 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1129 @@ -321,9 +537,9 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
1132 # _AM_DEPENDENCIES(NAME)
1133 -# ---------------------
1134 +# ----------------------
1135 # See how the compiler implements dependency checking.
1136 -# NAME is "CC", "CXX" or "OBJC".
1137 +# NAME is "CC", "CXX", "GCJ", or "OBJC".
1138 # We try a few techniques and use that to set a single cache variable.
1140 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
1141 @@ -338,7 +554,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
1143 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1144 [$1], CXX, [depcc="$CXX" am_compiler_list=],
1145 - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
1146 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1147 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1148 [depcc="$$1" am_compiler_list=])
1150 @@ -355,18 +571,32 @@ AC_CACHE_CHECK([dependency style of $dep
1151 # using a relative directory.
1152 cp "$am_depcomp" conftest.dir
1154 + # We will build objects and dependencies in a subdirectory because
1155 + # it helps to detect inapplicable dependency modes. For instance
1156 + # both Tru64's cc and ICC support -MD to output dependencies as a
1157 + # side effect of compilation, but ICC will put the dependencies in
1158 + # the current directory while Tru64 will put them in the object
1162 am_cv_$1_dependencies_compiler_type=none
1163 if test "$am_compiler_list" = ""; then
1164 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
1166 for depmode in $am_compiler_list; do
1167 + # Setup a source with many dependencies, because some compilers
1168 + # like to wrap large dependency lists on column 80 (with \), and
1169 + # we should not choose a depcomp mode which is confused by this.
1171 # We need to recreate these files for each test, as the compiler may
1172 # overwrite some of them when testing with obscure command lines.
1173 # This happens at least with the AIX C compiler.
1174 - echo '#include "conftest.h"' > conftest.c
1175 - echo 'int i;' > conftest.h
1176 - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
1177 + : > sub/conftest.c
1178 + for i in 1 2 3 4 5 6; do
1179 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
1180 + : > sub/conftst$i.h
1182 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1186 @@ -384,13 +614,20 @@ AC_CACHE_CHECK([dependency style of $dep
1187 # mode. It turns out that the SunPro C++ compiler does not properly
1188 # handle `-M -o', and we need to detect this.
1189 if depmode=$depmode \
1190 - source=conftest.c object=conftest.o \
1191 - depfile=conftest.Po tmpdepfile=conftest.TPo \
1192 - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
1193 - grep conftest.h conftest.Po > /dev/null 2>&1 &&
1194 + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
1195 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1196 + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
1197 + >/dev/null 2>conftest.err &&
1198 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1199 + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1200 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1201 - am_cv_$1_dependencies_compiler_type=$depmode
1203 + # icc doesn't choke on unknown options, it will just issue warnings
1204 + # (even with -Werror). So we grep stderr for any message
1205 + # that says an option was ignored.
1206 + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
1207 + am_cv_$1_dependencies_compiler_type=$depmode
1213 @@ -400,8 +637,10 @@ else
1214 am_cv_$1_dependencies_compiler_type=none
1217 -$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
1218 -AC_SUBST([$1DEPMODE])
1219 +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
1220 +AM_CONDITIONAL([am__fastdep$1], [
1221 + test "x$enable_dependency_tracking" != xno \
1222 + && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
1226 @@ -410,16 +649,8 @@ AC_SUBST([$1DEPMODE])
1227 # Choose a directory name for dependency files.
1228 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
1229 AC_DEFUN([AM_SET_DEPDIR],
1230 -[rm -f .deps 2>/dev/null
1231 -mkdir .deps 2>/dev/null
1232 -if test -d .deps; then
1235 - # MS-DOS does not allow filenames that begin with a dot.
1238 -rmdir .deps 2>/dev/null
1240 +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1241 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
1245 @@ -434,30 +665,48 @@ if test "x$enable_dependency_tracking" !
1248 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
1249 -pushdef([subst], defn([AC_SUBST]))
1250 -subst(AMDEPBACKSLASH)
1252 +AC_SUBST([AMDEPBACKSLASH])
1255 -# Generate code to set up dependency tracking.
1256 -# This macro should only be invoked once -- use via AC_REQUIRE.
1258 -# AM_OUTPUT_DEPENDENCY_COMMANDS
1259 +# Generate code to set up dependency tracking. -*- Autoconf -*-
1262 -# This code is only required when automatic dependency tracking
1263 -# is enabled. FIXME. This creates each `.P' file that we will
1264 -# need in order to bootstrap the dependency handling code.
1265 -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
1266 -AC_OUTPUT_COMMANDS([
1267 -test x"$AMDEP_TRUE" != x"" ||
1268 -for mf in $CONFIG_FILES; do
1270 - Makefile) dirpart=.;;
1271 - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
1274 - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
1275 +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
1277 +# This program is free software; you can redistribute it and/or modify
1278 +# it under the terms of the GNU General Public License as published by
1279 +# the Free Software Foundation; either version 2, or (at your option)
1280 +# any later version.
1282 +# This program is distributed in the hope that it will be useful,
1283 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1284 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1285 +# GNU General Public License for more details.
1287 +# You should have received a copy of the GNU General Public License
1288 +# along with this program; if not, write to the Free Software
1289 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1294 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
1295 +# ------------------------------
1296 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1297 +[for mf in $CONFIG_FILES; do
1298 + # Strip MF so we end up with the name of the file.
1299 + mf=`echo "$mf" | sed -e 's/:.*$//'`
1300 + # Check whether this is an Automake generated Makefile or not.
1301 + # We used to match only the files named `Makefile.in', but
1302 + # some people rename them; so instead we look at the file content.
1303 + # Grep'ing the first line is not enough: some people post-process
1304 + # each Makefile.in and add a new line on top of each file to say so.
1305 + # So let's grep whole file.
1306 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
1307 + dirpart=`AS_DIRNAME("$mf")`
1311 + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
1312 # Extract the definition of DEP_FILES from the Makefile without
1314 DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
1315 @@ -481,14 +730,48 @@ for mf in $CONFIG_FILES; do
1316 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1317 # Make sure the directory exists.
1318 test -f "$dirpart/$file" && continue
1319 - fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
1320 - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
1321 + fdir=`AS_DIRNAME(["$file"])`
1322 + AS_MKDIR_P([$dirpart/$fdir])
1323 # echo "creating $dirpart/$file"
1324 echo '# dummy' > "$dirpart/$file"
1327 -], [AMDEP_TRUE="$AMDEP_TRUE"
1328 -ac_aux_dir="$ac_aux_dir"])])
1329 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1332 +# AM_OUTPUT_DEPENDENCY_COMMANDS
1333 +# -----------------------------
1334 +# This macro should only be invoked once -- use via AC_REQUIRE.
1336 +# This code is only required when automatic dependency tracking
1337 +# is enabled. FIXME. This creates each `.P' file that we will
1338 +# need in order to bootstrap the dependency handling code.
1339 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1340 +[AC_CONFIG_COMMANDS([depfiles],
1341 + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
1342 + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1345 +# Check to see how 'make' treats includes. -*- Autoconf -*-
1347 +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
1349 +# This program is free software; you can redistribute it and/or modify
1350 +# it under the terms of the GNU General Public License as published by
1351 +# the Free Software Foundation; either version 2, or (at your option)
1352 +# any later version.
1354 +# This program is distributed in the hope that it will be useful,
1355 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1356 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1357 +# GNU General Public License for more details.
1359 +# You should have received a copy of the GNU General Public License
1360 +# along with this program; if not, write to the Free Software
1361 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1368 @@ -496,12 +779,13 @@ ac_aux_dir="$ac_aux_dir"])])
1369 AC_DEFUN([AM_MAKE_INCLUDE],
1370 [am_make=${MAKE-make}
1371 cat > confinc << 'END'
1377 # If we don't find an include directive, just comment out the code.
1378 AC_MSG_CHECKING([for style of include used by $am_make])
1383 # First try GNU make style include.
1384 @@ -511,7 +795,7 @@ echo "include confinc" > confmf
1385 # In particular we don't look at `^make:' because GNU make might
1386 # be invoked under some other name (usually "gmake"), in which
1387 # case it prints its new name instead of `make'.
1388 -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
1389 +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
1393 @@ -521,33 +805,45 @@ if test "$am__include" = "#"; then
1394 echo '.include "confinc"' > confmf
1395 if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
1396 am__include=.include
1402 -AC_SUBST(am__include)
1403 -AC_SUBST(am__quote)
1404 -AC_MSG_RESULT($_am_result)
1405 +AC_SUBST([am__include])
1406 +AC_SUBST([am__quote])
1407 +AC_MSG_RESULT([$_am_result])
1408 rm -f confinc confmf
1412 +# AM_CONDITIONAL -*- Autoconf -*-
1414 +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
1416 +# This program is free software; you can redistribute it and/or modify
1417 +# it under the terms of the GNU General Public License as published by
1418 +# the Free Software Foundation; either version 2, or (at your option)
1419 +# any later version.
1421 +# This program is distributed in the hope that it will be useful,
1422 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1423 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1424 +# GNU General Public License for more details.
1426 +# You should have received a copy of the GNU General Public License
1427 +# along with this program; if not, write to the Free Software
1428 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1435 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
1436 # -------------------------------------
1437 # Define a conditional.
1439 -# FIXME: Once using 2.50, use this:
1440 -# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
1441 AC_DEFUN([AM_CONDITIONAL],
1442 -[ifelse([$1], [TRUE],
1443 - [errprint(__file__:__line__: [$0: invalid condition: $1
1446 -ifelse([$1], [FALSE],
1447 - [errprint(__file__:__line__: [$0: invalid condition: $1
1450 +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1451 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1453 AC_SUBST([$1_FALSE])
1455 @@ -556,5 +852,10 @@ if $2; then
1461 +AC_CONFIG_COMMANDS_PRE(
1462 +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
1463 + AC_MSG_ERROR([conditional "$1" was never defined.
1464 +Usually this means the macro was only invoked conditionally.])
1467 diff -Naurp apachetop.orig/config/Makefile.in apachetop/config/Makefile.in
1468 --- apachetop.orig/config/Makefile.in 2009-07-16 21:43:27.000000000 +0000
1469 +++ apachetop/config/Makefile.in 2009-07-16 21:46:39.000000000 +0000
1471 -# Makefile.in generated automatically by automake 1.5 from Makefile.am.
1472 +# Makefile.in generated by automake 1.7.9 from Makefile.am.
1473 +# @configure_input@
1475 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1476 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
1477 # Free Software Foundation, Inc.
1478 # This Makefile.in is free software; the Free Software Foundation
1479 # gives unlimited permission to copy and/or distribute it,
1487 top_srcdir = @top_srcdir@
1490 -exec_prefix = @exec_prefix@
1493 -sbindir = @sbindir@
1494 -libexecdir = @libexecdir@
1495 -datadir = @datadir@
1496 -sysconfdir = @sysconfdir@
1497 -sharedstatedir = @sharedstatedir@
1498 -localstatedir = @localstatedir@
1500 -infodir = @infodir@
1502 -includedir = @includedir@
1503 -oldincludedir = /usr/include
1504 pkgdatadir = $(datadir)/@PACKAGE@
1505 pkglibdir = $(libdir)/@PACKAGE@
1506 pkgincludedir = $(includedir)/@PACKAGE@
1509 -ACLOCAL = @ACLOCAL@
1510 -AUTOCONF = @AUTOCONF@
1511 -AUTOMAKE = @AUTOMAKE@
1512 -AUTOHEADER = @AUTOHEADER@
1514 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1516 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
1517 -INSTALL_DATA = @INSTALL_DATA@
1518 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
1519 +install_sh_DATA = $(install_sh) -c -m 644
1520 +install_sh_PROGRAM = $(install_sh) -c
1521 +install_sh_SCRIPT = $(install_sh) -c
1522 INSTALL_HEADER = $(INSTALL_DATA)
1523 -transform = @program_transform_name@
1524 +transform = $(program_transform_name)
1528 NORMAL_UNINSTALL = :
1531 +ACLOCAL = @ACLOCAL@
1532 +AMDEP_FALSE = @AMDEP_FALSE@
1533 +AMDEP_TRUE = @AMDEP_TRUE@
1535 +AUTOCONF = @AUTOCONF@
1536 +AUTOHEADER = @AUTOHEADER@
1537 +AUTOMAKE = @AUTOMAKE@
1539 +CPPFLAGS = @CPPFLAGS@
1542 +CXXDEPMODE = @CXXDEPMODE@
1543 CXXFLAGS = @CXXFLAGS@
1544 +CYGPATH_W = @CYGPATH_W@
1552 HAVE_READLINE = @HAVE_READLINE@
1553 +INSTALL_DATA = @INSTALL_DATA@
1554 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
1555 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
1556 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
1557 +LDFLAGS = @LDFLAGS@
1558 +LIBOBJS = @LIBOBJS@
1560 +LTLIBOBJS = @LTLIBOBJS@
1561 +MAKEINFO = @MAKEINFO@
1564 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
1565 +PACKAGE_NAME = @PACKAGE_NAME@
1566 +PACKAGE_STRING = @PACKAGE_STRING@
1567 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
1568 +PACKAGE_VERSION = @PACKAGE_VERSION@
1569 +PATH_SEPARATOR = @PATH_SEPARATOR@
1570 +SET_MAKE = @SET_MAKE@
1574 +ac_ct_CXX = @ac_ct_CXX@
1575 +ac_ct_STRIP = @ac_ct_STRIP@
1576 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
1577 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
1578 am__include = @am__include@
1579 +am__leading_dot = @am__leading_dot@
1580 am__quote = @am__quote@
1582 +build_alias = @build_alias@
1583 +datadir = @datadir@
1584 +exec_prefix = @exec_prefix@
1585 +host_alias = @host_alias@
1586 +includedir = @includedir@
1587 +infodir = @infodir@
1588 install_sh = @install_sh@
1591 +libexecdir = @libexecdir@
1592 +localstatedir = @localstatedir@
1594 +oldincludedir = @oldincludedir@
1596 +program_transform_name = @program_transform_name@
1597 +sbindir = @sbindir@
1598 +sharedstatedir = @sharedstatedir@
1599 +sysconfdir = @sysconfdir@
1600 +target_alias = @target_alias@
1601 AUX_DIST = config.guess \
1604 @@ -79,12 +113,13 @@ AUX_DIST = config.guess \
1606 MAINTAINERCLEANFILES = Makefile.in
1608 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1609 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
1610 CONFIG_HEADER = $(top_builddir)/config.h
1611 CONFIG_CLEAN_FILES =
1613 -DIST_COMMON = Makefile.am Makefile.in config.guess config.sub depcomp \
1614 - install-sh missing mkinstalldirs
1615 +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am config.guess config.sub \
1616 + depcomp install-sh missing mkinstalldirs
1620 @@ -92,13 +127,13 @@ $(srcdir)/Makefile.in: Makefile.am $(t
1621 cd $(top_srcdir) && \
1622 $(AUTOMAKE) --gnu config/Makefile
1623 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
1624 - cd $(top_builddir) && \
1625 - CONFIG_HEADERS= CONFIG_LINKS= \
1626 - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
1627 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
1635 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1637 @@ -106,15 +141,26 @@ top_distdir = ..
1638 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
1640 distdir: $(DISTFILES)
1641 - @for file in $(DISTFILES); do \
1642 - if test -f $$file; then d=.; else d=$(srcdir); fi; \
1643 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
1644 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
1645 + list='$(DISTFILES)'; for file in $$list; do \
1647 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
1648 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
1650 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1651 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
1652 if test "$$dir" != "$$file" && test "$$dir" != "."; then \
1653 - $(mkinstalldirs) "$(distdir)/$$dir"; \
1655 + $(mkinstalldirs) "$(distdir)$$dir"; \
1659 if test -d $$d/$$file; then \
1660 - cp -pR $$d/$$file $(distdir) \
1662 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1663 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1665 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1667 test -f $(distdir)/$$file \
1668 || cp -p $$d/$$file $(distdir)/$$file \
1669 @@ -126,7 +172,6 @@ check: check-am
1675 install-exec: install-exec-am
1676 install-data: install-data-am
1677 @@ -138,6 +183,7 @@ install-am: all-am
1678 installcheck: installcheck-am
1680 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1681 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1682 `test -z '$(STRIP)' || \
1683 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1684 mostlyclean-generic:
1685 @@ -145,7 +191,7 @@ mostlyclean-generic:
1689 - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
1690 + -rm -f $(CONFIG_CLEAN_FILES)
1692 maintainer-clean-generic:
1693 @echo "This command is intended for maintainers to use"
1694 @@ -156,7 +202,7 @@ clean: clean-am
1695 clean-am: clean-generic mostlyclean-am
1697 distclean: distclean-am
1700 distclean-am: clean-am distclean-generic
1703 @@ -178,13 +224,21 @@ install-man:
1706 maintainer-clean: maintainer-clean-am
1709 maintainer-clean-am: distclean-am maintainer-clean-generic
1711 mostlyclean: mostlyclean-am
1713 mostlyclean-am: mostlyclean-generic
1723 uninstall-am: uninstall-info-am
1725 .PHONY: all all-am check check-am clean clean-generic distclean \
1726 @@ -193,7 +247,8 @@ uninstall-am: uninstall-info-am
1727 install-exec-am install-info install-info-am install-man \
1728 install-strip installcheck installcheck-am installdirs \
1729 maintainer-clean maintainer-clean-generic mostlyclean \
1730 - mostlyclean-generic uninstall uninstall-am uninstall-info-am
1731 + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
1734 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1735 # Otherwise a system limit (for SysV at least) may be exceeded.
1736 diff -Naurp apachetop.orig/config.h.in apachetop/config.h.in
1737 --- apachetop.orig/config.h.in 2009-07-16 21:43:27.000000000 +0000
1738 +++ apachetop/config.h.in 2009-07-16 21:46:39.000000000 +0000
1740 /* Define to 1 if you have the `kqueue' function. */
1743 -/* Define to 1 if your system has a working `malloc' function. */
1744 +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
1745 + to 0 otherwise. */
1748 /* Define to 1 if you have the <memory.h> header file. */
1750 /* Define to empty if `const' does not conform to ANSI C. */
1753 +/* Define to rpl_malloc if the replacement function should be used. */
1756 /* Define to `long' if <sys/types.h> does not define. */
1759 diff -Naurp apachetop.orig/configure apachetop/configure
1760 --- apachetop.orig/configure 2009-07-16 21:43:27.000000000 +0000
1761 +++ apachetop/configure 2009-07-16 21:46:39.000000000 +0000
1764 # Guess values for system-dependent variables and create Makefiles.
1765 -# Generated by GNU Autoconf 2.57 for apachetop 0.12.6.
1766 +# Generated by GNU Autoconf 2.59 for apachetop 0.12.6.
1768 # Report bugs to <apachetop@webta.org>.
1770 -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
1771 -# Free Software Foundation, Inc.
1772 +# Copyright (C) 2003 Free Software Foundation, Inc.
1773 # This configure script is free software; the Free Software Foundation
1774 # gives unlimited permission to copy, distribute and modify it.
1775 ## --------------------- ##
1776 @@ -22,9 +21,10 @@ if test -n "${ZSH_VERSION+set}" && (emul
1777 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
1780 +DUALCASE=1; export DUALCASE # for MKS sh
1782 # Support unset when possible.
1783 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
1784 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
1788 @@ -43,7 +43,7 @@ for as_var in \
1789 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
1790 LC_TELEPHONE LC_TIME
1792 - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
1793 + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
1794 eval $as_var=C; export $as_var
1797 @@ -220,16 +220,17 @@ rm -f conf$$ conf$$.exe conf$$.file
1798 if mkdir -p . 2>/dev/null; then
1801 + test -d ./-p && rmdir ./-p
1805 as_executable_p="test -f"
1807 # Sed expression to map a string onto a valid CPP name.
1808 -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
1809 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1811 # Sed expression to map a string onto a valid variable name.
1812 -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
1813 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
1817 @@ -310,7 +311,7 @@ ac_includes_default="\
1818 # include <unistd.h>
1821 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION EXEEXT OBJEXT ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh INSTALL_STRIP_PROGRAM AWK SET_MAKE AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH DEPDIR CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX am__include am__quote CXXDEPMODE CXXCPP EGREP LIBOBJS HAVE_READLINE LTLIBOBJS'
1822 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP EGREP LIBOBJS HAVE_READLINE LTLIBOBJS'
1825 # Initialize some variables set by options.
1826 @@ -669,7 +670,7 @@ done
1828 # Be sure to have absolute paths.
1829 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
1830 - localstatedir libdir includedir oldincludedir infodir mandir
1831 + localstatedir libdir includedir oldincludedir infodir mandir
1833 eval ac_val=$`echo $ac_var`
1835 @@ -709,10 +710,10 @@ if test -z "$srcdir"; then
1836 # Try the directory containing this script, then its parent.
1837 ac_confdir=`(dirname "$0") 2>/dev/null ||
1838 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
1839 - X"$0" : 'X\(//\)[^/]' \| \
1840 - X"$0" : 'X\(//\)$' \| \
1841 - X"$0" : 'X\(/\)' \| \
1842 - . : '\(.\)' 2>/dev/null ||
1843 + X"$0" : 'X\(//\)[^/]' \| \
1844 + X"$0" : 'X\(//\)$' \| \
1845 + X"$0" : 'X\(/\)' \| \
1846 + . : '\(.\)' 2>/dev/null ||
1848 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
1849 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
1850 @@ -804,9 +805,9 @@ _ACEOF
1852 Installation directories:
1853 --prefix=PREFIX install architecture-independent files in PREFIX
1854 - [$ac_default_prefix]
1855 + [$ac_default_prefix]
1856 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
1860 By default, \`make install' will install all the files in
1861 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
1862 @@ -911,12 +912,45 @@ case $srcdir in
1863 ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
1864 ac_top_srcdir=$ac_top_builddir$srcdir ;;
1866 -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
1868 -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
1869 -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
1870 -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
1871 -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
1873 +# Do not use `cd foo && pwd` to compute absolute paths, because
1874 +# the directories may not exist.
1876 +.) ac_abs_builddir="$ac_dir";;
1879 + .) ac_abs_builddir=`pwd`;;
1880 + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
1881 + *) ac_abs_builddir=`pwd`/"$ac_dir";;
1884 +case $ac_abs_builddir in
1885 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
1887 + case ${ac_top_builddir}. in
1888 + .) ac_abs_top_builddir=$ac_abs_builddir;;
1889 + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
1890 + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
1893 +case $ac_abs_builddir in
1894 +.) ac_abs_srcdir=$ac_srcdir;;
1896 + case $ac_srcdir in
1897 + .) ac_abs_srcdir=$ac_abs_builddir;;
1898 + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
1899 + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
1902 +case $ac_abs_builddir in
1903 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
1905 + case $ac_top_srcdir in
1906 + .) ac_abs_top_srcdir=$ac_abs_builddir;;
1907 + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
1908 + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
1913 # Check for guested configure; otherwise get Cygnus style configure.
1914 @@ -927,13 +961,13 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a
1916 $SHELL $ac_srcdir/configure --help=recursive
1917 elif test -f $ac_srcdir/configure.ac ||
1918 - test -f $ac_srcdir/configure.in; then
1919 + test -f $ac_srcdir/configure.in; then
1921 $ac_configure --help
1923 echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
1930 @@ -941,10 +975,9 @@ test -n "$ac_init_help" && exit 0
1931 if $ac_init_version; then
1933 apachetop configure 0.12.6
1934 -generated by GNU Autoconf 2.57
1935 +generated by GNU Autoconf 2.59
1937 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
1938 -Free Software Foundation, Inc.
1939 +Copyright (C) 2003 Free Software Foundation, Inc.
1940 This configure script is free software; the Free Software Foundation
1941 gives unlimited permission to copy, distribute and modify it.
1943 @@ -956,7 +989,7 @@ This file contains any messages produced
1944 running configure, to aid debugging if configure makes a mistake.
1946 It was created by apachetop $as_me 0.12.6, which was
1947 -generated by GNU Autoconf 2.57. Invocation command line was
1948 +generated by GNU Autoconf 2.59. Invocation command line was
1952 @@ -1033,19 +1066,19 @@ do
1954 ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1955 if test $ac_must_keep_next = true; then
1956 - ac_must_keep_next=false # Got value, back to normal.
1957 + ac_must_keep_next=false # Got value, back to normal.
1960 - *=* | --config-cache | -C | -disable-* | --disable-* \
1961 - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1962 - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1963 - | -with-* | --with-* | -without-* | --without-* | --x)
1964 - case "$ac_configure_args0 " in
1965 - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1968 - -* ) ac_must_keep_next=true ;;
1971 + *=* | --config-cache | -C | -disable-* | --disable-* \
1972 + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
1973 + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
1974 + | -with-* | --with-* | -without-* | --without-* | --x)
1975 + case "$ac_configure_args0 " in
1976 + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
1979 + -* ) ac_must_keep_next=true ;;
1982 ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
1983 # Get rid of the leading space.
1984 @@ -1079,12 +1112,12 @@ _ASBOX
1985 case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
1988 - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1989 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1990 + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
1991 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1995 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1996 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
2000 @@ -1113,7 +1146,7 @@ _ASBOX
2001 for ac_var in $ac_subst_files
2003 eval ac_val=$`echo $ac_var`
2004 - echo "$ac_var='"'"'$ac_val'"'"'"
2005 + echo "$ac_var='"'"'$ac_val'"'"'"
2009 @@ -1132,7 +1165,7 @@ _ASBOX
2010 echo "$as_me: caught signal $ac_signal"
2011 echo "$as_me: exit $exit_status"
2013 - rm -f core core.* *.core &&
2014 + rm -f core *.core &&
2015 rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
2018 @@ -1212,7 +1245,7 @@ fi
2020 ac_cache_corrupted=false
2021 for ac_var in `(set) 2>&1 |
2022 - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
2023 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
2024 eval ac_old_set=\$ac_cv_env_${ac_var}_set
2025 eval ac_new_set=\$ac_env_${ac_var}_set
2026 eval ac_old_val="\$ac_cv_env_${ac_var}_value"
2027 @@ -1229,13 +1262,13 @@ echo "$as_me: error: \`$ac_var' was not
2030 if test "x$ac_old_val" != "x$ac_new_val"; then
2031 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
2032 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
2033 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
2034 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
2035 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
2036 echo "$as_me: former value: $ac_old_val" >&2;}
2037 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
2038 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
2039 echo "$as_me: current value: $ac_new_val" >&2;}
2040 - ac_cache_corrupted=:
2041 + ac_cache_corrupted=:
2044 # Pass precious variables to config.status.
2045 @@ -1320,11 +1353,9 @@ ac_configure="$SHELL $ac_aux_dir/configu
2047 #AC_CONFIG_MACRO_DIR(m4) # 2.58
2049 + ac_config_headers="$ac_config_headers config.h"
2053 - ac_config_headers="$ac_config_headers config.h"
2055 +am__api_version="1.7"
2056 # Find a good install program. We prefer a C program (faster),
2057 # so one script is as good as another. But avoid the broken or
2058 # incompatible versions:
2059 @@ -1336,6 +1367,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
2060 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
2061 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
2062 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2063 +# OS/2's system install, which has a completely different semantic
2064 # ./install, which can be erroneously created by make from ./install.sh.
2065 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
2066 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
2067 @@ -1352,6 +1384,7 @@ do
2069 ./ | .// | /cC/* | \
2070 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
2071 + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
2074 # OSF1 and SCO ODT 3.0 have their own names for install.
2075 @@ -1359,20 +1392,20 @@ case $as_dir/ in
2077 for ac_prog in ginstall scoinst install; do
2078 for ac_exec_ext in '' $ac_executable_extensions; do
2079 - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2080 - if test $ac_prog = install &&
2081 - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2082 - # AIX install. It has an incompatible calling convention.
2084 - elif test $ac_prog = install &&
2085 - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2086 - # program-specific install script used by HP pwplus--don't use.
2089 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2093 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2094 + if test $ac_prog = install &&
2095 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2096 + # AIX install. It has an incompatible calling convention.
2098 + elif test $ac_prog = install &&
2099 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2100 + # program-specific install script used by HP pwplus--don't use.
2103 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2110 @@ -1462,7 +1495,7 @@ rm conftest.sed
2113 # expand $ac_aux_dir to an absolute path
2114 -am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
2115 +am_aux_dir=`cd $ac_aux_dir && pwd`
2117 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
2118 # Use eval to expand $SHELL
2119 @@ -1470,9 +1503,8 @@ if eval "$MISSING --run true"; then
2120 am_missing_run="$MISSING --run "
2124 - { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5
2125 -echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
2126 + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
2127 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2130 for ac_prog in gawk mawk nawk awk
2131 @@ -1517,7 +1549,7 @@ done
2133 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2134 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
2135 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
2136 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
2137 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
2138 echo $ECHO_N "(cached) $ECHO_C" >&6
2140 @@ -1544,50 +1576,37 @@ echo "${ECHO_T}no" >&6
2141 SET_MAKE="MAKE=${MAKE-make}"
2144 -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
2145 -if test "${enable_dependency_tracking+set}" = set; then
2146 - enableval="$enable_dependency_tracking"
2149 -if test "x$enable_dependency_tracking" != xno; then
2150 - am_depcomp="$ac_aux_dir/depcomp"
2151 - AMDEPBACKSLASH='\'
2155 -if test "x$enable_dependency_tracking" != xno; then
2166 -rm -f .deps 2>/dev/null
2167 -mkdir .deps 2>/dev/null
2168 -if test -d .deps; then
2170 +rm -rf .tst 2>/dev/null
2171 +mkdir .tst 2>/dev/null
2172 +if test -d .tst; then
2175 - # MS-DOS does not allow filenames that begin with a dot.
2179 -rmdir .deps 2>/dev/null
2180 +rmdir .tst 2>/dev/null
2183 -# test to see if srcdir already configured
2184 -if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
2185 + # test to see if srcdir already configured
2186 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
2187 test -f $srcdir/config.status; then
2188 { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
2189 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
2190 { (exit 1); exit 1; }; }
2193 +# test whether we have cygpath
2194 +if test -z "$CYGPATH_W"; then
2195 + if (cygpath --version) >/dev/null 2>/dev/null; then
2196 + CYGPATH_W='cygpath -w'
2203 # Define the identity of the package.
2210 cat >>confdefs.h <<_ACEOF
2211 #define PACKAGE "$PACKAGE"
2212 @@ -1598,28 +1617,15 @@ cat >>confdefs.h <<_ACEOF
2213 #define VERSION "$VERSION"
2217 -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
2218 -# the ones we care about.
2220 -# Autoconf 2.50 always computes EXEEXT. However we need to be
2221 -# compatible with 2.13, for now. So we always define EXEEXT, but we
2222 -# don't compute it.
2224 -# Similar for OBJEXT -- only we only use OBJEXT if the user actually
2225 -# requests that it be used. This is a bit dumb.
2229 # Some tools Automake needs.
2231 -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
2232 +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
2235 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
2238 -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
2239 +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
2242 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
2243 @@ -1632,10 +1638,98 @@ AMTAR=${AMTAR-"${am_missing_run}tar"}
2245 install_sh=${install_sh-"$am_aux_dir/install-sh"}
2247 +# Installed binaries are usually stripped using `strip' when the user
2248 +# run `make install-strip'. However `strip' might not be the right
2249 +# tool to use in cross-compilation environments, therefore Automake
2250 +# will honor the `STRIP' environment variable to overrule this program.
2251 +if test "$cross_compiling" != no; then
2252 + if test -n "$ac_tool_prefix"; then
2253 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2254 +set dummy ${ac_tool_prefix}strip; ac_word=$2
2255 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2256 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2257 +if test "${ac_cv_prog_STRIP+set}" = set; then
2258 + echo $ECHO_N "(cached) $ECHO_C" >&6
2260 + if test -n "$STRIP"; then
2261 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
2263 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2264 +for as_dir in $PATH
2267 + test -z "$as_dir" && as_dir=.
2268 + for ac_exec_ext in '' $ac_executable_extensions; do
2269 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2270 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2271 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2279 +STRIP=$ac_cv_prog_STRIP
2280 +if test -n "$STRIP"; then
2281 + echo "$as_me:$LINENO: result: $STRIP" >&5
2282 +echo "${ECHO_T}$STRIP" >&6
2284 + echo "$as_me:$LINENO: result: no" >&5
2285 +echo "${ECHO_T}no" >&6
2289 +if test -z "$ac_cv_prog_STRIP"; then
2290 + ac_ct_STRIP=$STRIP
2291 + # Extract the first word of "strip", so it can be a program name with args.
2292 +set dummy strip; ac_word=$2
2293 +echo "$as_me:$LINENO: checking for $ac_word" >&5
2294 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
2295 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
2296 + echo $ECHO_N "(cached) $ECHO_C" >&6
2298 + if test -n "$ac_ct_STRIP"; then
2299 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
2301 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2302 +for as_dir in $PATH
2305 + test -z "$as_dir" && as_dir=.
2306 + for ac_exec_ext in '' $ac_executable_extensions; do
2307 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2308 + ac_cv_prog_ac_ct_STRIP="strip"
2309 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2315 + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
2318 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2319 +if test -n "$ac_ct_STRIP"; then
2320 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
2321 +echo "${ECHO_T}$ac_ct_STRIP" >&6
2323 + echo "$as_me:$LINENO: result: no" >&5
2324 +echo "${ECHO_T}no" >&6
2327 + STRIP=$ac_ct_STRIP
2329 + STRIP="$ac_cv_prog_STRIP"
2333 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
2335 # We need awk for the "check" target. The system "awk" is bad on
2341 # Add non-standard directories to the include path
2342 @@ -1771,7 +1865,6 @@ ac_compiler=`set X $ac_compile; echo $2`
2343 (exit $ac_status); }
2345 cat >conftest.$ac_ext <<_ACEOF
2346 -#line $LINENO "configure"
2349 cat confdefs.h >>conftest.$ac_ext
2350 @@ -1791,8 +1884,8 @@ ac_clean_files="$ac_clean_files a.out a.
2351 # Try to create an executable without -o first, disregard a.out.
2352 # It will help us diagnose broken compilers, and finding out an intuition
2354 -echo "$as_me:$LINENO: checking for C++ compiler default output" >&5
2355 -echo $ECHO_N "checking for C++ compiler default output... $ECHO_C" >&6
2356 +echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
2357 +echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
2358 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
2359 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
2360 (eval $ac_link_default) 2>&5
2361 @@ -1812,23 +1905,23 @@ do
2362 test -f "$ac_file" || continue
2364 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
2368 - # This is the source file.
2370 + # This is the source file.
2373 - # We found the default executable, but exeext='' is most
2374 - # certainly right.
2376 + # We found the default executable, but exeext='' is most
2377 + # certainly right.
2380 - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2381 - # FIXME: I believe we export ac_cv_exeext for Libtool,
2382 - # but it would be cool to find out if it's true. Does anybody
2383 - # maintain Libtool? --akim.
2384 - export ac_cv_exeext
2386 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2387 + # FIXME: I believe we export ac_cv_exeext for Libtool,
2388 + # but it would be cool to find out if it's true. Does anybody
2389 + # maintain Libtool? --akim.
2390 + export ac_cv_exeext
2398 @@ -1902,8 +1995,8 @@ for ac_file in conftest.exe conftest con
2400 *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
2401 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
2402 - export ac_cv_exeext
2404 + export ac_cv_exeext
2409 @@ -1928,7 +2021,6 @@ if test "${ac_cv_objext+set}" = set; the
2410 echo $ECHO_N "(cached) $ECHO_C" >&6
2412 cat >conftest.$ac_ext <<_ACEOF
2413 -#line $LINENO "configure"
2416 cat confdefs.h >>conftest.$ac_ext
2417 @@ -1979,7 +2071,6 @@ if test "${ac_cv_cxx_compiler_gnu+set}"
2418 echo $ECHO_N "(cached) $ECHO_C" >&6
2420 cat >conftest.$ac_ext <<_ACEOF
2421 -#line $LINENO "configure"
2424 cat confdefs.h >>conftest.$ac_ext
2425 @@ -1999,11 +2090,20 @@ main ()
2427 rm -f conftest.$ac_objext
2428 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2429 - (eval $ac_compile) 2>&5
2430 + (eval $ac_compile) 2>conftest.er1
2432 + grep -v '^ *+' conftest.er1 >conftest.err
2433 + rm -f conftest.er1
2434 + cat conftest.err >&5
2435 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2436 (exit $ac_status); } &&
2437 - { ac_try='test -s conftest.$ac_objext'
2438 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2439 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2440 + (eval $ac_try) 2>&5
2442 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2443 + (exit $ac_status); }; } &&
2444 + { ac_try='test -s conftest.$ac_objext'
2445 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2448 @@ -2016,7 +2116,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2452 -rm -f conftest.$ac_objext conftest.$ac_ext
2453 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2454 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
2457 @@ -2032,7 +2132,6 @@ if test "${ac_cv_prog_cxx_g+set}" = set;
2458 echo $ECHO_N "(cached) $ECHO_C" >&6
2460 cat >conftest.$ac_ext <<_ACEOF
2461 -#line $LINENO "configure"
2464 cat confdefs.h >>conftest.$ac_ext
2465 @@ -2049,11 +2148,20 @@ main ()
2467 rm -f conftest.$ac_objext
2468 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2469 - (eval $ac_compile) 2>&5
2470 + (eval $ac_compile) 2>conftest.er1
2472 + grep -v '^ *+' conftest.er1 >conftest.err
2473 + rm -f conftest.er1
2474 + cat conftest.err >&5
2475 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2476 (exit $ac_status); } &&
2477 - { ac_try='test -s conftest.$ac_objext'
2478 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2479 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2480 + (eval $ac_try) 2>&5
2482 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2483 + (exit $ac_status); }; } &&
2484 + { ac_try='test -s conftest.$ac_objext'
2485 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2488 @@ -2066,7 +2174,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2492 -rm -f conftest.$ac_objext conftest.$ac_ext
2493 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2495 echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
2496 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
2497 @@ -2086,8 +2194,7 @@ else
2500 for ac_declaration in \
2502 - '#include <stdlib.h>' \
2504 'extern "C" void std::exit (int) throw (); using std::exit;' \
2505 'extern "C" void std::exit (int); using std::exit;' \
2506 'extern "C" void exit (int) throw ();' \
2507 @@ -2095,14 +2202,13 @@ for ac_declaration in \
2510 cat >conftest.$ac_ext <<_ACEOF
2511 -#line $LINENO "configure"
2514 cat confdefs.h >>conftest.$ac_ext
2515 cat >>conftest.$ac_ext <<_ACEOF
2516 /* end confdefs.h. */
2517 -#include <stdlib.h>
2519 +#include <stdlib.h>
2523 @@ -2113,11 +2219,20 @@ exit (42);
2525 rm -f conftest.$ac_objext
2526 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2527 - (eval $ac_compile) 2>&5
2528 + (eval $ac_compile) 2>conftest.er1
2530 + grep -v '^ *+' conftest.er1 >conftest.err
2531 + rm -f conftest.er1
2532 + cat conftest.err >&5
2533 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2534 (exit $ac_status); } &&
2535 - { ac_try='test -s conftest.$ac_objext'
2536 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2537 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2538 + (eval $ac_try) 2>&5
2540 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2541 + (exit $ac_status); }; } &&
2542 + { ac_try='test -s conftest.$ac_objext'
2543 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2546 @@ -2130,9 +2245,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
2550 -rm -f conftest.$ac_objext conftest.$ac_ext
2551 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2552 cat >conftest.$ac_ext <<_ACEOF
2553 -#line $LINENO "configure"
2556 cat confdefs.h >>conftest.$ac_ext
2557 @@ -2149,11 +2263,20 @@ exit (42);
2559 rm -f conftest.$ac_objext
2560 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2561 - (eval $ac_compile) 2>&5
2562 + (eval $ac_compile) 2>conftest.er1
2564 + grep -v '^ *+' conftest.er1 >conftest.err
2565 + rm -f conftest.er1
2566 + cat conftest.err >&5
2567 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2568 (exit $ac_status); } &&
2569 - { ac_try='test -s conftest.$ac_objext'
2570 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2571 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2572 + (eval $ac_try) 2>&5
2574 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2575 + (exit $ac_status); }; } &&
2576 + { ac_try='test -s conftest.$ac_objext'
2577 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2580 @@ -2165,7 +2288,7 @@ else
2581 sed 's/^/| /' conftest.$ac_ext >&5
2584 -rm -f conftest.$ac_objext conftest.$ac_ext
2585 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2588 if test -n "$ac_declaration"; then
2589 @@ -2179,18 +2302,21 @@ ac_cpp='$CPP $CPPFLAGS'
2590 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2591 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2592 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2593 +DEPDIR="${am__leading_dot}deps"
2595 + ac_config_commands="$ac_config_commands depfiles"
2597 - ac_config_commands="$ac_config_commands default-1"
2599 am_make=${MAKE-make}
2600 cat > confinc << 'END'
2606 # If we don't find an include directive, just comment out the code.
2607 echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2608 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
2613 # First try GNU make style include.
2614 @@ -2200,7 +2326,7 @@ echo "include confinc" > confmf
2615 # In particular we don't look at `^make:' because GNU make might
2616 # be invoked under some other name (usually "gmake"), in which
2617 # case it prints its new name instead of `make'.
2618 -if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
2619 +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
2623 @@ -2210,7 +2336,7 @@ if test "$am__include" = "#"; then
2624 echo '.include "confinc"' > confmf
2625 if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
2626 am__include=.include
2632 @@ -2220,6 +2346,27 @@ echo "$as_me:$LINENO: result: $_am_resul
2633 echo "${ECHO_T}$_am_result" >&6
2634 rm -f confinc confmf
2636 +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
2637 +if test "${enable_dependency_tracking+set}" = set; then
2638 + enableval="$enable_dependency_tracking"
2641 +if test "x$enable_dependency_tracking" != xno; then
2642 + am_depcomp="$ac_aux_dir/depcomp"
2643 + AMDEPBACKSLASH='\'
2647 +if test "x$enable_dependency_tracking" != xno; then
2658 depcc="$CXX" am_compiler_list=
2660 @@ -2239,18 +2386,32 @@ else
2661 # using a relative directory.
2662 cp "$am_depcomp" conftest.dir
2664 + # We will build objects and dependencies in a subdirectory because
2665 + # it helps to detect inapplicable dependency modes. For instance
2666 + # both Tru64's cc and ICC support -MD to output dependencies as a
2667 + # side effect of compilation, but ICC will put the dependencies in
2668 + # the current directory while Tru64 will put them in the object
2672 am_cv_CXX_dependencies_compiler_type=none
2673 if test "$am_compiler_list" = ""; then
2674 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
2676 for depmode in $am_compiler_list; do
2677 + # Setup a source with many dependencies, because some compilers
2678 + # like to wrap large dependency lists on column 80 (with \), and
2679 + # we should not choose a depcomp mode which is confused by this.
2681 # We need to recreate these files for each test, as the compiler may
2682 # overwrite some of them when testing with obscure command lines.
2683 # This happens at least with the AIX C compiler.
2684 - echo '#include "conftest.h"' > conftest.c
2685 - echo 'int i;' > conftest.h
2686 - echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
2687 + : > sub/conftest.c
2688 + for i in 1 2 3 4 5 6; do
2689 + echo '#include "conftst'$i'.h"' >> sub/conftest.c
2690 + : > sub/conftst$i.h
2692 + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2696 @@ -2268,13 +2429,20 @@ else
2697 # mode. It turns out that the SunPro C++ compiler does not properly
2698 # handle `-M -o', and we need to detect this.
2699 if depmode=$depmode \
2700 - source=conftest.c object=conftest.o \
2701 - depfile=conftest.Po tmpdepfile=conftest.TPo \
2702 - $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
2703 - grep conftest.h conftest.Po > /dev/null 2>&1 &&
2704 + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
2705 + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
2706 + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
2707 + >/dev/null 2>conftest.err &&
2708 + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
2709 + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
2710 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
2711 - am_cv_CXX_dependencies_compiler_type=$depmode
2713 + # icc doesn't choke on unknown options, it will just issue warnings
2714 + # (even with -Werror). So we grep stderr for any message
2715 + # that says an option was ignored.
2716 + if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
2717 + am_cv_CXX_dependencies_compiler_type=$depmode
2723 @@ -2287,7 +2455,19 @@ fi
2725 echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
2726 echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
2727 -CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type"
2728 +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
2733 + test "x$enable_dependency_tracking" != xno \
2734 + && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
2735 + am__fastdepCXX_TRUE=
2736 + am__fastdepCXX_FALSE='#'
2738 + am__fastdepCXX_TRUE='#'
2739 + am__fastdepCXX_FALSE=
2744 @@ -2323,7 +2503,6 @@ do
2745 # On the NeXT, cc -E runs the code through the compiler's parser,
2746 # not just through cpp. "Syntax error" is here to catch this case.
2747 cat >conftest.$ac_ext <<_ACEOF
2748 -#line $LINENO "configure"
2751 cat confdefs.h >>conftest.$ac_ext
2752 @@ -2334,7 +2513,7 @@ cat >>conftest.$ac_ext <<_ACEOF
2754 # include <assert.h>
2759 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
2760 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2761 @@ -2346,6 +2525,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
2762 (exit $ac_status); } >/dev/null; then
2763 if test -s conftest.err; then
2764 ac_cpp_err=$ac_cxx_preproc_warn_flag
2765 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
2769 @@ -2366,7 +2546,6 @@ rm -f conftest.err conftest.$ac_ext
2770 # OK, works on sane cases. Now check whether non-existent headers
2771 # can be detected and how.
2772 cat >conftest.$ac_ext <<_ACEOF
2773 -#line $LINENO "configure"
2776 cat confdefs.h >>conftest.$ac_ext
2777 @@ -2384,6 +2563,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
2778 (exit $ac_status); } >/dev/null; then
2779 if test -s conftest.err; then
2780 ac_cpp_err=$ac_cxx_preproc_warn_flag
2781 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
2785 @@ -2430,7 +2610,6 @@ do
2786 # On the NeXT, cc -E runs the code through the compiler's parser,
2787 # not just through cpp. "Syntax error" is here to catch this case.
2788 cat >conftest.$ac_ext <<_ACEOF
2789 -#line $LINENO "configure"
2792 cat confdefs.h >>conftest.$ac_ext
2793 @@ -2441,7 +2620,7 @@ cat >>conftest.$ac_ext <<_ACEOF
2795 # include <assert.h>
2800 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
2801 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
2802 @@ -2453,6 +2632,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
2803 (exit $ac_status); } >/dev/null; then
2804 if test -s conftest.err; then
2805 ac_cpp_err=$ac_cxx_preproc_warn_flag
2806 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
2810 @@ -2473,7 +2653,6 @@ rm -f conftest.err conftest.$ac_ext
2811 # OK, works on sane cases. Now check whether non-existent headers
2812 # can be detected and how.
2813 cat >conftest.$ac_ext <<_ACEOF
2814 -#line $LINENO "configure"
2817 cat confdefs.h >>conftest.$ac_ext
2818 @@ -2491,6 +2670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
2819 (exit $ac_status); } >/dev/null; then
2820 if test -s conftest.err; then
2821 ac_cpp_err=$ac_cxx_preproc_warn_flag
2822 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
2826 @@ -2551,7 +2731,6 @@ if test "${ac_cv_header_stdc+set}" = set
2827 echo $ECHO_N "(cached) $ECHO_C" >&6
2829 cat >conftest.$ac_ext <<_ACEOF
2830 -#line $LINENO "configure"
2833 cat confdefs.h >>conftest.$ac_ext
2834 @@ -2572,11 +2751,20 @@ main ()
2836 rm -f conftest.$ac_objext
2837 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2838 - (eval $ac_compile) 2>&5
2839 + (eval $ac_compile) 2>conftest.er1
2841 + grep -v '^ *+' conftest.er1 >conftest.err
2842 + rm -f conftest.er1
2843 + cat conftest.err >&5
2844 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2845 (exit $ac_status); } &&
2846 - { ac_try='test -s conftest.$ac_objext'
2847 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2848 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2849 + (eval $ac_try) 2>&5
2851 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2852 + (exit $ac_status); }; } &&
2853 + { ac_try='test -s conftest.$ac_objext'
2854 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2857 @@ -2589,12 +2777,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
2859 ac_cv_header_stdc=no
2861 -rm -f conftest.$ac_objext conftest.$ac_ext
2862 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2864 if test $ac_cv_header_stdc = yes; then
2865 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
2866 cat >conftest.$ac_ext <<_ACEOF
2867 -#line $LINENO "configure"
2870 cat confdefs.h >>conftest.$ac_ext
2871 @@ -2616,7 +2803,6 @@ fi
2872 if test $ac_cv_header_stdc = yes; then
2873 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
2874 cat >conftest.$ac_ext <<_ACEOF
2875 -#line $LINENO "configure"
2878 cat confdefs.h >>conftest.$ac_ext
2879 @@ -2641,7 +2827,6 @@ if test $ac_cv_header_stdc = yes; then
2882 cat >conftest.$ac_ext <<_ACEOF
2883 -#line $LINENO "configure"
2886 cat confdefs.h >>conftest.$ac_ext
2887 @@ -2653,9 +2838,9 @@ cat >>conftest.$ac_ext <<_ACEOF
2888 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
2890 # define ISLOWER(c) \
2891 - (('a' <= (c) && (c) <= 'i') \
2892 - || ('j' <= (c) && (c) <= 'r') \
2893 - || ('s' <= (c) && (c) <= 'z'))
2894 + (('a' <= (c) && (c) <= 'i') \
2895 + || ('j' <= (c) && (c) <= 'r') \
2896 + || ('s' <= (c) && (c) <= 'z'))
2897 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
2900 @@ -2666,7 +2851,7 @@ main ()
2902 for (i = 0; i < 256; i++)
2903 if (XOR (islower (i), ISLOWER (i))
2904 - || toupper (i) != TOUPPER (i))
2905 + || toupper (i) != TOUPPER (i))
2909 @@ -2691,7 +2876,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2911 ac_cv_header_stdc=no
2913 -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
2914 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
2918 @@ -2716,7 +2901,7 @@ fi
2921 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
2922 - inttypes.h stdint.h unistd.h
2923 + inttypes.h stdint.h unistd.h
2925 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
2926 echo "$as_me:$LINENO: checking for $ac_header" >&5
2927 @@ -2725,7 +2910,6 @@ if eval "test \"\${$as_ac_Header+set}\"
2928 echo $ECHO_N "(cached) $ECHO_C" >&6
2930 cat >conftest.$ac_ext <<_ACEOF
2931 -#line $LINENO "configure"
2934 cat confdefs.h >>conftest.$ac_ext
2935 @@ -2737,11 +2921,20 @@ $ac_includes_default
2937 rm -f conftest.$ac_objext
2938 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2939 - (eval $ac_compile) 2>&5
2940 + (eval $ac_compile) 2>conftest.er1
2942 + grep -v '^ *+' conftest.er1 >conftest.err
2943 + rm -f conftest.er1
2944 + cat conftest.err >&5
2945 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2946 (exit $ac_status); } &&
2947 - { ac_try='test -s conftest.$ac_objext'
2948 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2949 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2950 + (eval $ac_try) 2>&5
2952 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2953 + (exit $ac_status); }; } &&
2954 + { ac_try='test -s conftest.$ac_objext'
2955 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2958 @@ -2754,7 +2947,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
2960 eval "$as_ac_Header=no"
2962 -rm -f conftest.$ac_objext conftest.$ac_ext
2963 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
2965 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
2966 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
2967 @@ -2793,7 +2986,6 @@ else
2968 echo "$as_me:$LINENO: checking $ac_header usability" >&5
2969 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
2970 cat >conftest.$ac_ext <<_ACEOF
2971 -#line $LINENO "configure"
2974 cat confdefs.h >>conftest.$ac_ext
2975 @@ -2804,11 +2996,20 @@ $ac_includes_default
2977 rm -f conftest.$ac_objext
2978 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
2979 - (eval $ac_compile) 2>&5
2980 + (eval $ac_compile) 2>conftest.er1
2982 + grep -v '^ *+' conftest.er1 >conftest.err
2983 + rm -f conftest.er1
2984 + cat conftest.err >&5
2985 echo "$as_me:$LINENO: \$? = $ac_status" >&5
2986 (exit $ac_status); } &&
2987 - { ac_try='test -s conftest.$ac_objext'
2988 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
2989 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2990 + (eval $ac_try) 2>&5
2992 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
2993 + (exit $ac_status); }; } &&
2994 + { ac_try='test -s conftest.$ac_objext'
2995 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
2998 @@ -2821,7 +3022,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3000 ac_header_compiler=no
3002 -rm -f conftest.$ac_objext conftest.$ac_ext
3003 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3004 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3005 echo "${ECHO_T}$ac_header_compiler" >&6
3007 @@ -2829,7 +3030,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
3008 echo "$as_me:$LINENO: checking $ac_header presence" >&5
3009 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
3010 cat >conftest.$ac_ext <<_ACEOF
3011 -#line $LINENO "configure"
3014 cat confdefs.h >>conftest.$ac_ext
3015 @@ -2847,6 +3047,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
3016 (exit $ac_status); } >/dev/null; then
3017 if test -s conftest.err; then
3018 ac_cpp_err=$ac_cxx_preproc_warn_flag
3019 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
3023 @@ -2866,33 +3067,32 @@ echo "$as_me:$LINENO: result: $ac_header
3024 echo "${ECHO_T}$ac_header_preproc" >&6
3026 # So? What about this header?
3027 -case $ac_header_compiler:$ac_header_preproc in
3029 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
3031 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3032 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3033 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3034 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3037 -## ------------------------------------ ##
3038 -## Report this to bug-autoconf@gnu.org. ##
3039 -## ------------------------------------ ##
3042 - sed "s/^/$as_me: WARNING: /" >&2
3043 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3044 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3045 + ac_header_preproc=yes
3049 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3050 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3051 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3052 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3053 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3054 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3055 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3056 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3057 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3058 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3059 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3060 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3061 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3062 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3065 -## ------------------------------------ ##
3066 -## Report this to bug-autoconf@gnu.org. ##
3067 -## ------------------------------------ ##
3068 +## ---------------------------------- ##
3069 +## Report this to apachetop@webta.org ##
3070 +## ---------------------------------- ##
3073 sed "s/^/$as_me: WARNING: /" >&2
3074 @@ -2903,7 +3103,7 @@ echo $ECHO_N "checking for $ac_header...
3075 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3076 echo $ECHO_N "(cached) $ECHO_C" >&6
3078 - eval "$as_ac_Header=$ac_header_preproc"
3079 + eval "$as_ac_Header=\$ac_header_preproc"
3081 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
3082 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3083 @@ -2927,7 +3127,6 @@ if test "${ac_cv_c_const+set}" = set; th
3084 echo $ECHO_N "(cached) $ECHO_C" >&6
3086 cat >conftest.$ac_ext <<_ACEOF
3087 -#line $LINENO "configure"
3090 cat confdefs.h >>conftest.$ac_ext
3091 @@ -2990,11 +3189,20 @@ main ()
3093 rm -f conftest.$ac_objext
3094 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3095 - (eval $ac_compile) 2>&5
3096 + (eval $ac_compile) 2>conftest.er1
3098 + grep -v '^ *+' conftest.er1 >conftest.err
3099 + rm -f conftest.er1
3100 + cat conftest.err >&5
3101 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3102 (exit $ac_status); } &&
3103 - { ac_try='test -s conftest.$ac_objext'
3104 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3105 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3106 + (eval $ac_try) 2>&5
3108 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3109 + (exit $ac_status); }; } &&
3110 + { ac_try='test -s conftest.$ac_objext'
3111 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3114 @@ -3007,7 +3215,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3118 -rm -f conftest.$ac_objext conftest.$ac_ext
3119 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3121 echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
3122 echo "${ECHO_T}$ac_cv_c_const" >&6
3123 @@ -3025,7 +3233,6 @@ if test "${ac_cv_header_time+set}" = set
3124 echo $ECHO_N "(cached) $ECHO_C" >&6
3126 cat >conftest.$ac_ext <<_ACEOF
3127 -#line $LINENO "configure"
3130 cat confdefs.h >>conftest.$ac_ext
3131 @@ -3046,11 +3253,20 @@ return 0;
3133 rm -f conftest.$ac_objext
3134 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3135 - (eval $ac_compile) 2>&5
3136 + (eval $ac_compile) 2>conftest.er1
3138 + grep -v '^ *+' conftest.er1 >conftest.err
3139 + rm -f conftest.er1
3140 + cat conftest.err >&5
3141 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3142 (exit $ac_status); } &&
3143 - { ac_try='test -s conftest.$ac_objext'
3144 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3145 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3146 + (eval $ac_try) 2>&5
3148 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3149 + (exit $ac_status); }; } &&
3150 + { ac_try='test -s conftest.$ac_objext'
3151 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3154 @@ -3063,7 +3279,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3156 ac_cv_header_time=no
3158 -rm -f conftest.$ac_objext conftest.$ac_ext
3159 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3161 echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
3162 echo "${ECHO_T}$ac_cv_header_time" >&6
3163 @@ -3081,7 +3297,6 @@ if test "${ac_cv_struct_tm+set}" = set;
3164 echo $ECHO_N "(cached) $ECHO_C" >&6
3166 cat >conftest.$ac_ext <<_ACEOF
3167 -#line $LINENO "configure"
3170 cat confdefs.h >>conftest.$ac_ext
3171 @@ -3100,11 +3315,20 @@ struct tm *tp; tp->tm_sec;
3173 rm -f conftest.$ac_objext
3174 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3175 - (eval $ac_compile) 2>&5
3176 + (eval $ac_compile) 2>conftest.er1
3178 + grep -v '^ *+' conftest.er1 >conftest.err
3179 + rm -f conftest.er1
3180 + cat conftest.err >&5
3181 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3182 (exit $ac_status); } &&
3183 - { ac_try='test -s conftest.$ac_objext'
3184 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3185 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3186 + (eval $ac_try) 2>&5
3188 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3189 + (exit $ac_status); }; } &&
3190 + { ac_try='test -s conftest.$ac_objext'
3191 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3194 @@ -3117,7 +3341,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3196 ac_cv_struct_tm=sys/time.h
3198 -rm -f conftest.$ac_objext conftest.$ac_ext
3199 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3201 echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
3202 echo "${ECHO_T}$ac_cv_struct_tm" >&6
3203 @@ -3135,7 +3359,6 @@ if test "${ac_cv_type_off_t+set}" = set;
3204 echo $ECHO_N "(cached) $ECHO_C" >&6
3206 cat >conftest.$ac_ext <<_ACEOF
3207 -#line $LINENO "configure"
3210 cat confdefs.h >>conftest.$ac_ext
3211 @@ -3155,11 +3378,20 @@ if (sizeof (off_t))
3213 rm -f conftest.$ac_objext
3214 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3215 - (eval $ac_compile) 2>&5
3216 + (eval $ac_compile) 2>conftest.er1
3218 + grep -v '^ *+' conftest.er1 >conftest.err
3219 + rm -f conftest.er1
3220 + cat conftest.err >&5
3221 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3222 (exit $ac_status); } &&
3223 - { ac_try='test -s conftest.$ac_objext'
3224 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3225 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3226 + (eval $ac_try) 2>&5
3228 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3229 + (exit $ac_status); }; } &&
3230 + { ac_try='test -s conftest.$ac_objext'
3231 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3234 @@ -3172,7 +3404,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3238 -rm -f conftest.$ac_objext conftest.$ac_ext
3239 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3241 echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
3242 echo "${ECHO_T}$ac_cv_type_off_t" >&6
3243 @@ -3192,7 +3424,6 @@ if test "${ac_cv_type_size_t+set}" = set
3244 echo $ECHO_N "(cached) $ECHO_C" >&6
3246 cat >conftest.$ac_ext <<_ACEOF
3247 -#line $LINENO "configure"
3250 cat confdefs.h >>conftest.$ac_ext
3251 @@ -3212,11 +3443,20 @@ if (sizeof (size_t))
3253 rm -f conftest.$ac_objext
3254 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3255 - (eval $ac_compile) 2>&5
3256 + (eval $ac_compile) 2>conftest.er1
3258 + grep -v '^ *+' conftest.er1 >conftest.err
3259 + rm -f conftest.er1
3260 + cat conftest.err >&5
3261 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3262 (exit $ac_status); } &&
3263 - { ac_try='test -s conftest.$ac_objext'
3264 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3265 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3266 + (eval $ac_try) 2>&5
3268 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3269 + (exit $ac_status); }; } &&
3270 + { ac_try='test -s conftest.$ac_objext'
3271 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3274 @@ -3229,7 +3469,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3276 ac_cv_type_size_t=no
3278 -rm -f conftest.$ac_objext conftest.$ac_ext
3279 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3281 echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
3282 echo "${ECHO_T}$ac_cv_type_size_t" >&6
3283 @@ -3261,8 +3501,7 @@ else
3285 # IRIX 6.2 and later do not support large files by default,
3286 # so use the C compiler's -n32 option if that helps.
3287 - cat >conftest.$ac_ext <<_ACEOF
3288 -#line $LINENO "configure"
3289 + cat >conftest.$ac_ext <<_ACEOF
3292 cat confdefs.h >>conftest.$ac_ext
3293 @@ -3287,11 +3526,20 @@ main ()
3295 rm -f conftest.$ac_objext
3296 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3297 - (eval $ac_compile) 2>&5
3298 + (eval $ac_compile) 2>conftest.er1
3300 + grep -v '^ *+' conftest.er1 >conftest.err
3301 + rm -f conftest.er1
3302 + cat conftest.err >&5
3303 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3304 (exit $ac_status); } &&
3305 - { ac_try='test -s conftest.$ac_objext'
3306 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3307 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3308 + (eval $ac_try) 2>&5
3310 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3311 + (exit $ac_status); }; } &&
3312 + { ac_try='test -s conftest.$ac_objext'
3313 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3316 @@ -3303,15 +3551,24 @@ else
3317 sed 's/^/| /' conftest.$ac_ext >&5
3320 -rm -f conftest.$ac_objext
3321 +rm -f conftest.err conftest.$ac_objext
3323 rm -f conftest.$ac_objext
3324 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3325 - (eval $ac_compile) 2>&5
3326 + (eval $ac_compile) 2>conftest.er1
3328 + grep -v '^ *+' conftest.er1 >conftest.err
3329 + rm -f conftest.er1
3330 + cat conftest.err >&5
3331 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3332 (exit $ac_status); } &&
3333 - { ac_try='test -s conftest.$ac_objext'
3334 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3335 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3336 + (eval $ac_try) 2>&5
3338 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3339 + (exit $ac_status); }; } &&
3340 + { ac_try='test -s conftest.$ac_objext'
3341 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3344 @@ -3323,8 +3580,8 @@ else
3345 sed 's/^/| /' conftest.$ac_ext >&5
3348 -rm -f conftest.$ac_objext
3350 +rm -f conftest.err conftest.$ac_objext
3354 rm -f conftest.$ac_ext
3355 @@ -3344,7 +3601,6 @@ else
3357 ac_cv_sys_file_offset_bits=no
3358 cat >conftest.$ac_ext <<_ACEOF
3359 -#line $LINENO "configure"
3362 cat confdefs.h >>conftest.$ac_ext
3363 @@ -3369,11 +3625,20 @@ main ()
3365 rm -f conftest.$ac_objext
3366 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3367 - (eval $ac_compile) 2>&5
3368 + (eval $ac_compile) 2>conftest.er1
3370 + grep -v '^ *+' conftest.er1 >conftest.err
3371 + rm -f conftest.er1
3372 + cat conftest.err >&5
3373 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3374 (exit $ac_status); } &&
3375 - { ac_try='test -s conftest.$ac_objext'
3376 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3377 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3378 + (eval $ac_try) 2>&5
3380 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3381 + (exit $ac_status); }; } &&
3382 + { ac_try='test -s conftest.$ac_objext'
3383 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3386 @@ -3385,9 +3650,8 @@ else
3387 sed 's/^/| /' conftest.$ac_ext >&5
3390 -rm -f conftest.$ac_objext conftest.$ac_ext
3391 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3392 cat >conftest.$ac_ext <<_ACEOF
3393 -#line $LINENO "configure"
3396 cat confdefs.h >>conftest.$ac_ext
3397 @@ -3413,11 +3677,20 @@ main ()
3399 rm -f conftest.$ac_objext
3400 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3401 - (eval $ac_compile) 2>&5
3402 + (eval $ac_compile) 2>conftest.er1
3404 + grep -v '^ *+' conftest.er1 >conftest.err
3405 + rm -f conftest.er1
3406 + cat conftest.err >&5
3407 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3408 (exit $ac_status); } &&
3409 - { ac_try='test -s conftest.$ac_objext'
3410 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3411 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3412 + (eval $ac_try) 2>&5
3414 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3415 + (exit $ac_status); }; } &&
3416 + { ac_try='test -s conftest.$ac_objext'
3417 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3420 @@ -3429,7 +3702,7 @@ else
3421 sed 's/^/| /' conftest.$ac_ext >&5
3424 -rm -f conftest.$ac_objext conftest.$ac_ext
3425 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3429 @@ -3451,7 +3724,6 @@ else
3431 ac_cv_sys_large_files=no
3432 cat >conftest.$ac_ext <<_ACEOF
3433 -#line $LINENO "configure"
3436 cat confdefs.h >>conftest.$ac_ext
3437 @@ -3476,11 +3748,20 @@ main ()
3439 rm -f conftest.$ac_objext
3440 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3441 - (eval $ac_compile) 2>&5
3442 + (eval $ac_compile) 2>conftest.er1
3444 + grep -v '^ *+' conftest.er1 >conftest.err
3445 + rm -f conftest.er1
3446 + cat conftest.err >&5
3447 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3448 (exit $ac_status); } &&
3449 - { ac_try='test -s conftest.$ac_objext'
3450 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3451 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3452 + (eval $ac_try) 2>&5
3454 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3455 + (exit $ac_status); }; } &&
3456 + { ac_try='test -s conftest.$ac_objext'
3457 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3460 @@ -3492,9 +3773,8 @@ else
3461 sed 's/^/| /' conftest.$ac_ext >&5
3464 -rm -f conftest.$ac_objext conftest.$ac_ext
3465 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3466 cat >conftest.$ac_ext <<_ACEOF
3467 -#line $LINENO "configure"
3470 cat confdefs.h >>conftest.$ac_ext
3471 @@ -3520,11 +3800,20 @@ main ()
3473 rm -f conftest.$ac_objext
3474 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3475 - (eval $ac_compile) 2>&5
3476 + (eval $ac_compile) 2>conftest.er1
3478 + grep -v '^ *+' conftest.er1 >conftest.err
3479 + rm -f conftest.er1
3480 + cat conftest.err >&5
3481 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3482 (exit $ac_status); } &&
3483 - { ac_try='test -s conftest.$ac_objext'
3484 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3485 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3486 + (eval $ac_try) 2>&5
3488 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3489 + (exit $ac_status); }; } &&
3490 + { ac_try='test -s conftest.$ac_objext'
3491 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3494 @@ -3536,7 +3825,7 @@ else
3495 sed 's/^/| /' conftest.$ac_ext >&5
3498 -rm -f conftest.$ac_objext conftest.$ac_ext
3499 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3503 @@ -3571,7 +3860,6 @@ else
3504 echo "$as_me:$LINENO: checking $ac_header usability" >&5
3505 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
3506 cat >conftest.$ac_ext <<_ACEOF
3507 -#line $LINENO "configure"
3510 cat confdefs.h >>conftest.$ac_ext
3511 @@ -3582,11 +3870,20 @@ $ac_includes_default
3513 rm -f conftest.$ac_objext
3514 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3515 - (eval $ac_compile) 2>&5
3516 + (eval $ac_compile) 2>conftest.er1
3518 + grep -v '^ *+' conftest.er1 >conftest.err
3519 + rm -f conftest.er1
3520 + cat conftest.err >&5
3521 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3522 (exit $ac_status); } &&
3523 - { ac_try='test -s conftest.$ac_objext'
3524 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3525 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3526 + (eval $ac_try) 2>&5
3528 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3529 + (exit $ac_status); }; } &&
3530 + { ac_try='test -s conftest.$ac_objext'
3531 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3534 @@ -3599,7 +3896,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3536 ac_header_compiler=no
3538 -rm -f conftest.$ac_objext conftest.$ac_ext
3539 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3540 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3541 echo "${ECHO_T}$ac_header_compiler" >&6
3543 @@ -3607,7 +3904,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
3544 echo "$as_me:$LINENO: checking $ac_header presence" >&5
3545 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
3546 cat >conftest.$ac_ext <<_ACEOF
3547 -#line $LINENO "configure"
3550 cat confdefs.h >>conftest.$ac_ext
3551 @@ -3625,6 +3921,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
3552 (exit $ac_status); } >/dev/null; then
3553 if test -s conftest.err; then
3554 ac_cpp_err=$ac_cxx_preproc_warn_flag
3555 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
3559 @@ -3644,33 +3941,32 @@ echo "$as_me:$LINENO: result: $ac_header
3560 echo "${ECHO_T}$ac_header_preproc" >&6
3562 # So? What about this header?
3563 -case $ac_header_compiler:$ac_header_preproc in
3565 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
3567 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3568 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3569 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3570 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3573 -## ------------------------------------ ##
3574 -## Report this to bug-autoconf@gnu.org. ##
3575 -## ------------------------------------ ##
3578 - sed "s/^/$as_me: WARNING: /" >&2
3579 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3580 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3581 + ac_header_preproc=yes
3585 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3586 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3587 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3588 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3589 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3590 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3591 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3592 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3593 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3594 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3595 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3596 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3597 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3598 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3601 -## ------------------------------------ ##
3602 -## Report this to bug-autoconf@gnu.org. ##
3603 -## ------------------------------------ ##
3604 +## ---------------------------------- ##
3605 +## Report this to apachetop@webta.org ##
3606 +## ---------------------------------- ##
3609 sed "s/^/$as_me: WARNING: /" >&2
3610 @@ -3681,7 +3977,7 @@ echo $ECHO_N "checking for $ac_header...
3611 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3612 echo $ECHO_N "(cached) $ECHO_C" >&6
3614 - eval "$as_ac_Header=$ac_header_preproc"
3615 + eval "$as_ac_Header=\$ac_header_preproc"
3617 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
3618 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3619 @@ -3705,7 +4001,6 @@ else
3620 ac_cv_func_malloc_0_nonnull=no
3622 cat >conftest.$ac_ext <<_ACEOF
3623 -#line $LINENO "configure"
3626 cat confdefs.h >>conftest.$ac_ext
3627 @@ -3745,7 +4040,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3629 ac_cv_func_malloc_0_nonnull=no
3631 -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3632 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
3635 echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
3636 @@ -3761,7 +4056,14 @@ else
3637 #define HAVE_MALLOC 0
3640 - LIBOBJS="$LIBOBJS malloc.$ac_objext"
3642 + "malloc.$ac_objext" | \
3643 + *" malloc.$ac_objext" | \
3644 + "malloc.$ac_objext "* | \
3645 + *" malloc.$ac_objext "* ) ;;
3646 + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
3650 cat >>confdefs.h <<\_ACEOF
3651 #define malloc rpl_malloc
3652 @@ -3782,21 +4084,28 @@ if eval "test \"\${$as_ac_var+set}\" = s
3653 echo $ECHO_N "(cached) $ECHO_C" >&6
3655 cat >conftest.$ac_ext <<_ACEOF
3656 -#line $LINENO "configure"
3659 cat confdefs.h >>conftest.$ac_ext
3660 cat >>conftest.$ac_ext <<_ACEOF
3661 /* end confdefs.h. */
3662 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
3663 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
3664 +#define $ac_func innocuous_$ac_func
3666 /* System header to define __stub macros and hopefully few prototypes,
3667 which can conflict with char $ac_func (); below.
3668 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3669 <limits.h> exists even on freestanding compilers. */
3672 # include <limits.h>
3674 # include <assert.h>
3679 /* Override any gcc2 internal prototype to avoid an error. */
3682 @@ -3827,11 +4136,20 @@ return f != $ac_func;
3684 rm -f conftest.$ac_objext conftest$ac_exeext
3685 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3686 - (eval $ac_link) 2>&5
3687 + (eval $ac_link) 2>conftest.er1
3689 + grep -v '^ *+' conftest.er1 >conftest.err
3690 + rm -f conftest.er1
3691 + cat conftest.err >&5
3692 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3693 (exit $ac_status); } &&
3694 - { ac_try='test -s conftest$ac_exeext'
3695 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3696 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3697 + (eval $ac_try) 2>&5
3699 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3700 + (exit $ac_status); }; } &&
3701 + { ac_try='test -s conftest$ac_exeext'
3702 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3705 @@ -3844,7 +4162,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3707 eval "$as_ac_var=no"
3709 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3710 +rm -f conftest.err conftest.$ac_objext \
3711 + conftest$ac_exeext conftest.$ac_ext
3713 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
3714 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3715 @@ -3859,21 +4178,28 @@ if test "${ac_cv_func__doprnt+set}" = se
3716 echo $ECHO_N "(cached) $ECHO_C" >&6
3718 cat >conftest.$ac_ext <<_ACEOF
3719 -#line $LINENO "configure"
3722 cat confdefs.h >>conftest.$ac_ext
3723 cat >>conftest.$ac_ext <<_ACEOF
3724 /* end confdefs.h. */
3725 +/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
3726 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
3727 +#define _doprnt innocuous__doprnt
3729 /* System header to define __stub macros and hopefully few prototypes,
3730 which can conflict with char _doprnt (); below.
3731 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3732 <limits.h> exists even on freestanding compilers. */
3735 # include <limits.h>
3737 # include <assert.h>
3742 /* Override any gcc2 internal prototype to avoid an error. */
3745 @@ -3904,11 +4230,20 @@ return f != _doprnt;
3747 rm -f conftest.$ac_objext conftest$ac_exeext
3748 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3749 - (eval $ac_link) 2>&5
3750 + (eval $ac_link) 2>conftest.er1
3752 + grep -v '^ *+' conftest.er1 >conftest.err
3753 + rm -f conftest.er1
3754 + cat conftest.err >&5
3755 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3756 (exit $ac_status); } &&
3757 - { ac_try='test -s conftest$ac_exeext'
3758 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3759 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3760 + (eval $ac_try) 2>&5
3762 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3763 + (exit $ac_status); }; } &&
3764 + { ac_try='test -s conftest$ac_exeext'
3765 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3768 @@ -3921,7 +4256,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3770 ac_cv_func__doprnt=no
3772 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3773 +rm -f conftest.err conftest.$ac_objext \
3774 + conftest$ac_exeext conftest.$ac_ext
3776 echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
3777 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
3778 @@ -3953,21 +4289,28 @@ if eval "test \"\${$as_ac_var+set}\" = s
3779 echo $ECHO_N "(cached) $ECHO_C" >&6
3781 cat >conftest.$ac_ext <<_ACEOF
3782 -#line $LINENO "configure"
3785 cat confdefs.h >>conftest.$ac_ext
3786 cat >>conftest.$ac_ext <<_ACEOF
3787 /* end confdefs.h. */
3788 +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
3789 + For example, HP-UX 11i <limits.h> declares gettimeofday. */
3790 +#define $ac_func innocuous_$ac_func
3792 /* System header to define __stub macros and hopefully few prototypes,
3793 which can conflict with char $ac_func (); below.
3794 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
3795 <limits.h> exists even on freestanding compilers. */
3798 # include <limits.h>
3800 # include <assert.h>
3805 /* Override any gcc2 internal prototype to avoid an error. */
3808 @@ -3998,11 +4341,20 @@ return f != $ac_func;
3810 rm -f conftest.$ac_objext conftest$ac_exeext
3811 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3812 - (eval $ac_link) 2>&5
3813 + (eval $ac_link) 2>conftest.er1
3815 + grep -v '^ *+' conftest.er1 >conftest.err
3816 + rm -f conftest.er1
3817 + cat conftest.err >&5
3818 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3819 (exit $ac_status); } &&
3820 - { ac_try='test -s conftest$ac_exeext'
3821 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3822 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3823 + (eval $ac_try) 2>&5
3825 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3826 + (exit $ac_status); }; } &&
3827 + { ac_try='test -s conftest$ac_exeext'
3828 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3831 @@ -4015,7 +4367,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
3833 eval "$as_ac_var=no"
3835 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3836 +rm -f conftest.err conftest.$ac_objext \
3837 + conftest$ac_exeext conftest.$ac_ext
3839 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
3840 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
3841 @@ -4057,7 +4410,6 @@ else
3842 echo "$as_me:$LINENO: checking $ac_header usability" >&5
3843 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
3844 cat >conftest.$ac_ext <<_ACEOF
3845 -#line $LINENO "configure"
3848 cat confdefs.h >>conftest.$ac_ext
3849 @@ -4068,11 +4420,20 @@ $ac_includes_default
3851 rm -f conftest.$ac_objext
3852 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
3853 - (eval $ac_compile) 2>&5
3854 + (eval $ac_compile) 2>conftest.er1
3856 + grep -v '^ *+' conftest.er1 >conftest.err
3857 + rm -f conftest.er1
3858 + cat conftest.err >&5
3859 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3860 (exit $ac_status); } &&
3861 - { ac_try='test -s conftest.$ac_objext'
3862 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3863 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3864 + (eval $ac_try) 2>&5
3866 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3867 + (exit $ac_status); }; } &&
3868 + { ac_try='test -s conftest.$ac_objext'
3869 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3872 @@ -4085,7 +4446,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3874 ac_header_compiler=no
3876 -rm -f conftest.$ac_objext conftest.$ac_ext
3877 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
3878 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
3879 echo "${ECHO_T}$ac_header_compiler" >&6
3881 @@ -4093,7 +4454,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
3882 echo "$as_me:$LINENO: checking $ac_header presence" >&5
3883 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
3884 cat >conftest.$ac_ext <<_ACEOF
3885 -#line $LINENO "configure"
3888 cat confdefs.h >>conftest.$ac_ext
3889 @@ -4111,6 +4471,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
3890 (exit $ac_status); } >/dev/null; then
3891 if test -s conftest.err; then
3892 ac_cpp_err=$ac_cxx_preproc_warn_flag
3893 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
3897 @@ -4130,33 +4491,32 @@ echo "$as_me:$LINENO: result: $ac_header
3898 echo "${ECHO_T}$ac_header_preproc" >&6
3900 # So? What about this header?
3901 -case $ac_header_compiler:$ac_header_preproc in
3903 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
3905 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
3906 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
3907 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3908 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3911 -## ------------------------------------ ##
3912 -## Report this to bug-autoconf@gnu.org. ##
3913 -## ------------------------------------ ##
3916 - sed "s/^/$as_me: WARNING: /" >&2
3917 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
3918 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
3919 + ac_header_preproc=yes
3923 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
3924 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
3925 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3926 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3927 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
3928 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
3929 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
3930 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
3931 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
3932 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
3933 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
3934 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
3935 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
3936 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
3939 -## ------------------------------------ ##
3940 -## Report this to bug-autoconf@gnu.org. ##
3941 -## ------------------------------------ ##
3942 +## ---------------------------------- ##
3943 +## Report this to apachetop@webta.org ##
3944 +## ---------------------------------- ##
3947 sed "s/^/$as_me: WARNING: /" >&2
3948 @@ -4167,7 +4527,7 @@ echo $ECHO_N "checking for $ac_header...
3949 if eval "test \"\${$as_ac_Header+set}\" = set"; then
3950 echo $ECHO_N "(cached) $ECHO_C" >&6
3952 - eval "$as_ac_Header=$ac_header_preproc"
3953 + eval "$as_ac_Header=\$ac_header_preproc"
3955 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
3956 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
3957 @@ -4185,7 +4545,6 @@ else
3958 ac_func_search_save_LIBS=$LIBS
3959 ac_cv_search_pcre_compile=no
3960 cat >conftest.$ac_ext <<_ACEOF
3961 -#line $LINENO "configure"
3964 cat confdefs.h >>conftest.$ac_ext
3965 @@ -4209,11 +4568,20 @@ pcre_compile ();
3967 rm -f conftest.$ac_objext conftest$ac_exeext
3968 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
3969 - (eval $ac_link) 2>&5
3970 + (eval $ac_link) 2>conftest.er1
3972 + grep -v '^ *+' conftest.er1 >conftest.err
3973 + rm -f conftest.er1
3974 + cat conftest.err >&5
3975 echo "$as_me:$LINENO: \$? = $ac_status" >&5
3976 (exit $ac_status); } &&
3977 - { ac_try='test -s conftest$ac_exeext'
3978 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
3979 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3980 + (eval $ac_try) 2>&5
3982 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
3983 + (exit $ac_status); }; } &&
3984 + { ac_try='test -s conftest$ac_exeext'
3985 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
3988 @@ -4225,12 +4593,12 @@ else
3989 sed 's/^/| /' conftest.$ac_ext >&5
3992 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
3993 +rm -f conftest.err conftest.$ac_objext \
3994 + conftest$ac_exeext conftest.$ac_ext
3995 if test "$ac_cv_search_pcre_compile" = no; then
3996 for ac_lib in pcre; do
3997 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
3998 cat >conftest.$ac_ext <<_ACEOF
3999 -#line $LINENO "configure"
4002 cat confdefs.h >>conftest.$ac_ext
4003 @@ -4254,11 +4622,20 @@ pcre_compile ();
4005 rm -f conftest.$ac_objext conftest$ac_exeext
4006 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4007 - (eval $ac_link) 2>&5
4008 + (eval $ac_link) 2>conftest.er1
4010 + grep -v '^ *+' conftest.er1 >conftest.err
4011 + rm -f conftest.er1
4012 + cat conftest.err >&5
4013 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4014 (exit $ac_status); } &&
4015 - { ac_try='test -s conftest$ac_exeext'
4016 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4017 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4018 + (eval $ac_try) 2>&5
4020 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4021 + (exit $ac_status); }; } &&
4022 + { ac_try='test -s conftest$ac_exeext'
4023 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4026 @@ -4271,7 +4648,8 @@ else
4027 sed 's/^/| /' conftest.$ac_ext >&5
4030 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4031 +rm -f conftest.err conftest.$ac_objext \
4032 + conftest$ac_exeext conftest.$ac_ext
4035 LIBS=$ac_func_search_save_LIBS
4036 @@ -4322,7 +4700,6 @@ else
4037 echo "$as_me:$LINENO: checking $ac_header usability" >&5
4038 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
4039 cat >conftest.$ac_ext <<_ACEOF
4040 -#line $LINENO "configure"
4043 cat confdefs.h >>conftest.$ac_ext
4044 @@ -4333,11 +4710,20 @@ $ac_includes_default
4046 rm -f conftest.$ac_objext
4047 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4048 - (eval $ac_compile) 2>&5
4049 + (eval $ac_compile) 2>conftest.er1
4051 + grep -v '^ *+' conftest.er1 >conftest.err
4052 + rm -f conftest.er1
4053 + cat conftest.err >&5
4054 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4055 (exit $ac_status); } &&
4056 - { ac_try='test -s conftest.$ac_objext'
4057 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4058 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4059 + (eval $ac_try) 2>&5
4061 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4062 + (exit $ac_status); }; } &&
4063 + { ac_try='test -s conftest.$ac_objext'
4064 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4067 @@ -4350,7 +4736,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
4069 ac_header_compiler=no
4071 -rm -f conftest.$ac_objext conftest.$ac_ext
4072 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4073 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
4074 echo "${ECHO_T}$ac_header_compiler" >&6
4076 @@ -4358,7 +4744,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
4077 echo "$as_me:$LINENO: checking $ac_header presence" >&5
4078 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
4079 cat >conftest.$ac_ext <<_ACEOF
4080 -#line $LINENO "configure"
4083 cat confdefs.h >>conftest.$ac_ext
4084 @@ -4376,6 +4761,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
4085 (exit $ac_status); } >/dev/null; then
4086 if test -s conftest.err; then
4087 ac_cpp_err=$ac_cxx_preproc_warn_flag
4088 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
4092 @@ -4395,33 +4781,32 @@ echo "$as_me:$LINENO: result: $ac_header
4093 echo "${ECHO_T}$ac_header_preproc" >&6
4095 # So? What about this header?
4096 -case $ac_header_compiler:$ac_header_preproc in
4098 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
4100 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
4101 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
4102 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
4103 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
4106 -## ------------------------------------ ##
4107 -## Report this to bug-autoconf@gnu.org. ##
4108 -## ------------------------------------ ##
4111 - sed "s/^/$as_me: WARNING: /" >&2
4112 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
4113 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
4114 + ac_header_preproc=yes
4118 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
4119 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
4120 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
4121 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
4122 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
4123 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
4124 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
4125 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
4126 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
4127 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
4128 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
4129 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
4130 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
4131 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
4134 -## ------------------------------------ ##
4135 -## Report this to bug-autoconf@gnu.org. ##
4136 -## ------------------------------------ ##
4137 +## ---------------------------------- ##
4138 +## Report this to apachetop@webta.org ##
4139 +## ---------------------------------- ##
4142 sed "s/^/$as_me: WARNING: /" >&2
4143 @@ -4432,7 +4817,7 @@ echo $ECHO_N "checking for $ac_header...
4144 if eval "test \"\${$as_ac_Header+set}\" = set"; then
4145 echo $ECHO_N "(cached) $ECHO_C" >&6
4147 - eval "$as_ac_Header=$ac_header_preproc"
4148 + eval "$as_ac_Header=\$ac_header_preproc"
4150 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
4151 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4152 @@ -4450,7 +4835,6 @@ else
4153 ac_func_search_save_LIBS=$LIBS
4154 ac_cv_search_FAMOpen=no
4155 cat >conftest.$ac_ext <<_ACEOF
4156 -#line $LINENO "configure"
4159 cat confdefs.h >>conftest.$ac_ext
4160 @@ -4474,11 +4858,20 @@ FAMOpen ();
4162 rm -f conftest.$ac_objext conftest$ac_exeext
4163 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4164 - (eval $ac_link) 2>&5
4165 + (eval $ac_link) 2>conftest.er1
4167 + grep -v '^ *+' conftest.er1 >conftest.err
4168 + rm -f conftest.er1
4169 + cat conftest.err >&5
4170 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4171 (exit $ac_status); } &&
4172 - { ac_try='test -s conftest$ac_exeext'
4173 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4174 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4175 + (eval $ac_try) 2>&5
4177 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4178 + (exit $ac_status); }; } &&
4179 + { ac_try='test -s conftest$ac_exeext'
4180 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4183 @@ -4490,12 +4883,12 @@ else
4184 sed 's/^/| /' conftest.$ac_ext >&5
4187 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4188 +rm -f conftest.err conftest.$ac_objext \
4189 + conftest$ac_exeext conftest.$ac_ext
4190 if test "$ac_cv_search_FAMOpen" = no; then
4191 for ac_lib in fam; do
4192 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4193 cat >conftest.$ac_ext <<_ACEOF
4194 -#line $LINENO "configure"
4197 cat confdefs.h >>conftest.$ac_ext
4198 @@ -4519,11 +4912,20 @@ FAMOpen ();
4200 rm -f conftest.$ac_objext conftest$ac_exeext
4201 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4202 - (eval $ac_link) 2>&5
4203 + (eval $ac_link) 2>conftest.er1
4205 + grep -v '^ *+' conftest.er1 >conftest.err
4206 + rm -f conftest.er1
4207 + cat conftest.err >&5
4208 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4209 (exit $ac_status); } &&
4210 - { ac_try='test -s conftest$ac_exeext'
4211 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4212 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4213 + (eval $ac_try) 2>&5
4215 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4216 + (exit $ac_status); }; } &&
4217 + { ac_try='test -s conftest$ac_exeext'
4218 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4221 @@ -4536,7 +4938,8 @@ else
4222 sed 's/^/| /' conftest.$ac_ext >&5
4225 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4226 +rm -f conftest.err conftest.$ac_objext \
4227 + conftest$ac_exeext conftest.$ac_ext
4230 LIBS=$ac_func_search_save_LIBS
4231 @@ -4587,7 +4990,6 @@ else
4232 echo "$as_me:$LINENO: checking $ac_header usability" >&5
4233 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
4234 cat >conftest.$ac_ext <<_ACEOF
4235 -#line $LINENO "configure"
4238 cat confdefs.h >>conftest.$ac_ext
4239 @@ -4598,11 +5000,20 @@ $ac_includes_default
4241 rm -f conftest.$ac_objext
4242 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4243 - (eval $ac_compile) 2>&5
4244 + (eval $ac_compile) 2>conftest.er1
4246 + grep -v '^ *+' conftest.er1 >conftest.err
4247 + rm -f conftest.er1
4248 + cat conftest.err >&5
4249 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4250 (exit $ac_status); } &&
4251 - { ac_try='test -s conftest.$ac_objext'
4252 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4253 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4254 + (eval $ac_try) 2>&5
4256 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4257 + (exit $ac_status); }; } &&
4258 + { ac_try='test -s conftest.$ac_objext'
4259 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4262 @@ -4615,7 +5026,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
4264 ac_header_compiler=no
4266 -rm -f conftest.$ac_objext conftest.$ac_ext
4267 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
4268 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
4269 echo "${ECHO_T}$ac_header_compiler" >&6
4271 @@ -4623,7 +5034,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
4272 echo "$as_me:$LINENO: checking $ac_header presence" >&5
4273 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
4274 cat >conftest.$ac_ext <<_ACEOF
4275 -#line $LINENO "configure"
4278 cat confdefs.h >>conftest.$ac_ext
4279 @@ -4641,6 +5051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
4280 (exit $ac_status); } >/dev/null; then
4281 if test -s conftest.err; then
4282 ac_cpp_err=$ac_cxx_preproc_warn_flag
4283 + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
4287 @@ -4660,33 +5071,32 @@ echo "$as_me:$LINENO: result: $ac_header
4288 echo "${ECHO_T}$ac_header_preproc" >&6
4290 # So? What about this header?
4291 -case $ac_header_compiler:$ac_header_preproc in
4293 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
4295 { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
4296 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
4297 - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
4298 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
4301 -## ------------------------------------ ##
4302 -## Report this to bug-autoconf@gnu.org. ##
4303 -## ------------------------------------ ##
4306 - sed "s/^/$as_me: WARNING: /" >&2
4307 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
4308 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
4309 + ac_header_preproc=yes
4313 { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
4314 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
4315 - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
4316 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
4317 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
4318 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
4319 + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
4320 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
4321 + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
4322 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
4323 { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
4324 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
4325 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
4326 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
4329 -## ------------------------------------ ##
4330 -## Report this to bug-autoconf@gnu.org. ##
4331 -## ------------------------------------ ##
4332 +## ---------------------------------- ##
4333 +## Report this to apachetop@webta.org ##
4334 +## ---------------------------------- ##
4337 sed "s/^/$as_me: WARNING: /" >&2
4338 @@ -4697,7 +5107,7 @@ echo $ECHO_N "checking for $ac_header...
4339 if eval "test \"\${$as_ac_Header+set}\" = set"; then
4340 echo $ECHO_N "(cached) $ECHO_C" >&6
4342 - eval "$as_ac_Header=$ac_header_preproc"
4343 + eval "$as_ac_Header=\$ac_header_preproc"
4345 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
4346 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
4347 @@ -4715,7 +5125,6 @@ else
4348 ac_func_search_save_LIBS=$LIBS
4349 ac_cv_search_adns_submit=no
4350 cat >conftest.$ac_ext <<_ACEOF
4351 -#line $LINENO "configure"
4354 cat confdefs.h >>conftest.$ac_ext
4355 @@ -4739,11 +5148,20 @@ adns_submit ();
4357 rm -f conftest.$ac_objext conftest$ac_exeext
4358 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4359 - (eval $ac_link) 2>&5
4360 + (eval $ac_link) 2>conftest.er1
4362 + grep -v '^ *+' conftest.er1 >conftest.err
4363 + rm -f conftest.er1
4364 + cat conftest.err >&5
4365 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4366 (exit $ac_status); } &&
4367 - { ac_try='test -s conftest$ac_exeext'
4368 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4369 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4370 + (eval $ac_try) 2>&5
4372 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4373 + (exit $ac_status); }; } &&
4374 + { ac_try='test -s conftest$ac_exeext'
4375 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4378 @@ -4755,12 +5173,12 @@ else
4379 sed 's/^/| /' conftest.$ac_ext >&5
4382 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4383 +rm -f conftest.err conftest.$ac_objext \
4384 + conftest$ac_exeext conftest.$ac_ext
4385 if test "$ac_cv_search_adns_submit" = no; then
4386 for ac_lib in adns; do
4387 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4388 cat >conftest.$ac_ext <<_ACEOF
4389 -#line $LINENO "configure"
4392 cat confdefs.h >>conftest.$ac_ext
4393 @@ -4784,11 +5202,20 @@ adns_submit ();
4395 rm -f conftest.$ac_objext conftest$ac_exeext
4396 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4397 - (eval $ac_link) 2>&5
4398 + (eval $ac_link) 2>conftest.er1
4400 + grep -v '^ *+' conftest.er1 >conftest.err
4401 + rm -f conftest.er1
4402 + cat conftest.err >&5
4403 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4404 (exit $ac_status); } &&
4405 - { ac_try='test -s conftest$ac_exeext'
4406 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4407 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4408 + (eval $ac_try) 2>&5
4410 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4411 + (exit $ac_status); }; } &&
4412 + { ac_try='test -s conftest$ac_exeext'
4413 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4416 @@ -4801,7 +5228,8 @@ else
4417 sed 's/^/| /' conftest.$ac_ext >&5
4420 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4421 +rm -f conftest.err conftest.$ac_objext \
4422 + conftest$ac_exeext conftest.$ac_ext
4425 LIBS=$ac_func_search_save_LIBS
4426 @@ -4844,7 +5272,6 @@ else
4427 ac_func_search_save_LIBS=$LIBS
4428 ac_cv_search_socket=no
4429 cat >conftest.$ac_ext <<_ACEOF
4430 -#line $LINENO "configure"
4433 cat confdefs.h >>conftest.$ac_ext
4434 @@ -4868,11 +5295,20 @@ socket ();
4436 rm -f conftest.$ac_objext conftest$ac_exeext
4437 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4438 - (eval $ac_link) 2>&5
4439 + (eval $ac_link) 2>conftest.er1
4441 + grep -v '^ *+' conftest.er1 >conftest.err
4442 + rm -f conftest.er1
4443 + cat conftest.err >&5
4444 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4445 (exit $ac_status); } &&
4446 - { ac_try='test -s conftest$ac_exeext'
4447 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4448 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4449 + (eval $ac_try) 2>&5
4451 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4452 + (exit $ac_status); }; } &&
4453 + { ac_try='test -s conftest$ac_exeext'
4454 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4457 @@ -4884,12 +5320,12 @@ else
4458 sed 's/^/| /' conftest.$ac_ext >&5
4461 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4462 +rm -f conftest.err conftest.$ac_objext \
4463 + conftest$ac_exeext conftest.$ac_ext
4464 if test "$ac_cv_search_socket" = no; then
4465 for ac_lib in socket; do
4466 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4467 cat >conftest.$ac_ext <<_ACEOF
4468 -#line $LINENO "configure"
4471 cat confdefs.h >>conftest.$ac_ext
4472 @@ -4913,11 +5349,20 @@ socket ();
4474 rm -f conftest.$ac_objext conftest$ac_exeext
4475 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4476 - (eval $ac_link) 2>&5
4477 + (eval $ac_link) 2>conftest.er1
4479 + grep -v '^ *+' conftest.er1 >conftest.err
4480 + rm -f conftest.er1
4481 + cat conftest.err >&5
4482 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4483 (exit $ac_status); } &&
4484 - { ac_try='test -s conftest$ac_exeext'
4485 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4486 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4487 + (eval $ac_try) 2>&5
4489 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4490 + (exit $ac_status); }; } &&
4491 + { ac_try='test -s conftest$ac_exeext'
4492 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4495 @@ -4930,7 +5375,8 @@ else
4496 sed 's/^/| /' conftest.$ac_ext >&5
4499 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4500 +rm -f conftest.err conftest.$ac_objext \
4501 + conftest$ac_exeext conftest.$ac_ext
4504 LIBS=$ac_func_search_save_LIBS
4505 @@ -4950,7 +5396,6 @@ else
4506 ac_func_search_save_LIBS=$LIBS
4507 ac_cv_search_inet_addr=no
4508 cat >conftest.$ac_ext <<_ACEOF
4509 -#line $LINENO "configure"
4512 cat confdefs.h >>conftest.$ac_ext
4513 @@ -4974,11 +5419,20 @@ inet_addr ();
4515 rm -f conftest.$ac_objext conftest$ac_exeext
4516 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4517 - (eval $ac_link) 2>&5
4518 + (eval $ac_link) 2>conftest.er1
4520 + grep -v '^ *+' conftest.er1 >conftest.err
4521 + rm -f conftest.er1
4522 + cat conftest.err >&5
4523 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4524 (exit $ac_status); } &&
4525 - { ac_try='test -s conftest$ac_exeext'
4526 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4527 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4528 + (eval $ac_try) 2>&5
4530 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4531 + (exit $ac_status); }; } &&
4532 + { ac_try='test -s conftest$ac_exeext'
4533 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4536 @@ -4990,12 +5444,12 @@ else
4537 sed 's/^/| /' conftest.$ac_ext >&5
4540 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4541 +rm -f conftest.err conftest.$ac_objext \
4542 + conftest$ac_exeext conftest.$ac_ext
4543 if test "$ac_cv_search_inet_addr" = no; then
4544 for ac_lib in nsl; do
4545 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4546 cat >conftest.$ac_ext <<_ACEOF
4547 -#line $LINENO "configure"
4550 cat confdefs.h >>conftest.$ac_ext
4551 @@ -5019,11 +5473,20 @@ inet_addr ();
4553 rm -f conftest.$ac_objext conftest$ac_exeext
4554 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4555 - (eval $ac_link) 2>&5
4556 + (eval $ac_link) 2>conftest.er1
4558 + grep -v '^ *+' conftest.er1 >conftest.err
4559 + rm -f conftest.er1
4560 + cat conftest.err >&5
4561 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4562 (exit $ac_status); } &&
4563 - { ac_try='test -s conftest$ac_exeext'
4564 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4565 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4566 + (eval $ac_try) 2>&5
4568 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4569 + (exit $ac_status); }; } &&
4570 + { ac_try='test -s conftest$ac_exeext'
4571 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4574 @@ -5036,7 +5499,8 @@ else
4575 sed 's/^/| /' conftest.$ac_ext >&5
4578 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4579 +rm -f conftest.err conftest.$ac_objext \
4580 + conftest$ac_exeext conftest.$ac_ext
4583 LIBS=$ac_func_search_save_LIBS
4584 @@ -5056,7 +5520,6 @@ else
4585 ac_func_search_save_LIBS=$LIBS
4586 ac_cv_search_attron=no
4587 cat >conftest.$ac_ext <<_ACEOF
4588 -#line $LINENO "configure"
4591 cat confdefs.h >>conftest.$ac_ext
4592 @@ -5080,11 +5543,20 @@ attron ();
4594 rm -f conftest.$ac_objext conftest$ac_exeext
4595 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4596 - (eval $ac_link) 2>&5
4597 + (eval $ac_link) 2>conftest.er1
4599 + grep -v '^ *+' conftest.er1 >conftest.err
4600 + rm -f conftest.er1
4601 + cat conftest.err >&5
4602 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4603 (exit $ac_status); } &&
4604 - { ac_try='test -s conftest$ac_exeext'
4605 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4606 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4607 + (eval $ac_try) 2>&5
4609 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4610 + (exit $ac_status); }; } &&
4611 + { ac_try='test -s conftest$ac_exeext'
4612 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4615 @@ -5096,12 +5568,12 @@ else
4616 sed 's/^/| /' conftest.$ac_ext >&5
4619 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4620 +rm -f conftest.err conftest.$ac_objext \
4621 + conftest$ac_exeext conftest.$ac_ext
4622 if test "$ac_cv_search_attron" = no; then
4623 for ac_lib in ncurses; do
4624 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4625 cat >conftest.$ac_ext <<_ACEOF
4626 -#line $LINENO "configure"
4629 cat confdefs.h >>conftest.$ac_ext
4630 @@ -5125,11 +5597,20 @@ attron ();
4632 rm -f conftest.$ac_objext conftest$ac_exeext
4633 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4634 - (eval $ac_link) 2>&5
4635 + (eval $ac_link) 2>conftest.er1
4637 + grep -v '^ *+' conftest.er1 >conftest.err
4638 + rm -f conftest.er1
4639 + cat conftest.err >&5
4640 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4641 (exit $ac_status); } &&
4642 - { ac_try='test -s conftest$ac_exeext'
4643 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4644 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4645 + (eval $ac_try) 2>&5
4647 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4648 + (exit $ac_status); }; } &&
4649 + { ac_try='test -s conftest$ac_exeext'
4650 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4653 @@ -5142,7 +5623,8 @@ else
4654 sed 's/^/| /' conftest.$ac_ext >&5
4657 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4658 +rm -f conftest.err conftest.$ac_objext \
4659 + conftest$ac_exeext conftest.$ac_ext
4662 LIBS=$ac_func_search_save_LIBS
4663 @@ -5162,7 +5644,6 @@ else
4664 ac_func_search_save_LIBS=$LIBS
4665 ac_cv_search_tgetstr=no
4666 cat >conftest.$ac_ext <<_ACEOF
4667 -#line $LINENO "configure"
4670 cat confdefs.h >>conftest.$ac_ext
4671 @@ -5186,11 +5667,20 @@ tgetstr ();
4673 rm -f conftest.$ac_objext conftest$ac_exeext
4674 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4675 - (eval $ac_link) 2>&5
4676 + (eval $ac_link) 2>conftest.er1
4678 + grep -v '^ *+' conftest.er1 >conftest.err
4679 + rm -f conftest.er1
4680 + cat conftest.err >&5
4681 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4682 (exit $ac_status); } &&
4683 - { ac_try='test -s conftest$ac_exeext'
4684 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4685 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4686 + (eval $ac_try) 2>&5
4688 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4689 + (exit $ac_status); }; } &&
4690 + { ac_try='test -s conftest$ac_exeext'
4691 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4694 @@ -5202,12 +5692,12 @@ else
4695 sed 's/^/| /' conftest.$ac_ext >&5
4698 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4699 +rm -f conftest.err conftest.$ac_objext \
4700 + conftest$ac_exeext conftest.$ac_ext
4701 if test "$ac_cv_search_tgetstr" = no; then
4702 for ac_lib in termcap; do
4703 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4704 cat >conftest.$ac_ext <<_ACEOF
4705 -#line $LINENO "configure"
4708 cat confdefs.h >>conftest.$ac_ext
4709 @@ -5231,11 +5721,20 @@ tgetstr ();
4711 rm -f conftest.$ac_objext conftest$ac_exeext
4712 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4713 - (eval $ac_link) 2>&5
4714 + (eval $ac_link) 2>conftest.er1
4716 + grep -v '^ *+' conftest.er1 >conftest.err
4717 + rm -f conftest.er1
4718 + cat conftest.err >&5
4719 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4720 (exit $ac_status); } &&
4721 - { ac_try='test -s conftest$ac_exeext'
4722 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4723 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4724 + (eval $ac_try) 2>&5
4726 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4727 + (exit $ac_status); }; } &&
4728 + { ac_try='test -s conftest$ac_exeext'
4729 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4732 @@ -5248,7 +5747,8 @@ else
4733 sed 's/^/| /' conftest.$ac_ext >&5
4736 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4737 +rm -f conftest.err conftest.$ac_objext \
4738 + conftest$ac_exeext conftest.$ac_ext
4741 LIBS=$ac_func_search_save_LIBS
4742 @@ -5268,7 +5768,6 @@ else
4743 ac_func_search_save_LIBS=$LIBS
4744 ac_cv_search_mvprintw=no
4745 cat >conftest.$ac_ext <<_ACEOF
4746 -#line $LINENO "configure"
4749 cat confdefs.h >>conftest.$ac_ext
4750 @@ -5292,11 +5791,20 @@ mvprintw ();
4752 rm -f conftest.$ac_objext conftest$ac_exeext
4753 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4754 - (eval $ac_link) 2>&5
4755 + (eval $ac_link) 2>conftest.er1
4757 + grep -v '^ *+' conftest.er1 >conftest.err
4758 + rm -f conftest.er1
4759 + cat conftest.err >&5
4760 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4761 (exit $ac_status); } &&
4762 - { ac_try='test -s conftest$ac_exeext'
4763 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4764 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4765 + (eval $ac_try) 2>&5
4767 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4768 + (exit $ac_status); }; } &&
4769 + { ac_try='test -s conftest$ac_exeext'
4770 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4773 @@ -5308,12 +5816,12 @@ else
4774 sed 's/^/| /' conftest.$ac_ext >&5
4777 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4778 +rm -f conftest.err conftest.$ac_objext \
4779 + conftest$ac_exeext conftest.$ac_ext
4780 if test "$ac_cv_search_mvprintw" = no; then
4781 for ac_lib in curses ncurses ; do
4782 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4783 cat >conftest.$ac_ext <<_ACEOF
4784 -#line $LINENO "configure"
4787 cat confdefs.h >>conftest.$ac_ext
4788 @@ -5337,11 +5845,20 @@ mvprintw ();
4790 rm -f conftest.$ac_objext conftest$ac_exeext
4791 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4792 - (eval $ac_link) 2>&5
4793 + (eval $ac_link) 2>conftest.er1
4795 + grep -v '^ *+' conftest.er1 >conftest.err
4796 + rm -f conftest.er1
4797 + cat conftest.err >&5
4798 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4799 (exit $ac_status); } &&
4800 - { ac_try='test -s conftest$ac_exeext'
4801 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4802 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4803 + (eval $ac_try) 2>&5
4805 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4806 + (exit $ac_status); }; } &&
4807 + { ac_try='test -s conftest$ac_exeext'
4808 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4811 @@ -5354,7 +5871,8 @@ else
4812 sed 's/^/| /' conftest.$ac_ext >&5
4815 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4816 +rm -f conftest.err conftest.$ac_objext \
4817 + conftest$ac_exeext conftest.$ac_ext
4820 LIBS=$ac_func_search_save_LIBS
4821 @@ -5382,7 +5900,6 @@ else
4822 ac_func_search_save_LIBS=$LIBS
4823 ac_cv_search_readline=no
4824 cat >conftest.$ac_ext <<_ACEOF
4825 -#line $LINENO "configure"
4828 cat confdefs.h >>conftest.$ac_ext
4829 @@ -5406,11 +5923,20 @@ readline ();
4831 rm -f conftest.$ac_objext conftest$ac_exeext
4832 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4833 - (eval $ac_link) 2>&5
4834 + (eval $ac_link) 2>conftest.er1
4836 + grep -v '^ *+' conftest.er1 >conftest.err
4837 + rm -f conftest.er1
4838 + cat conftest.err >&5
4839 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4840 (exit $ac_status); } &&
4841 - { ac_try='test -s conftest$ac_exeext'
4842 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4843 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4844 + (eval $ac_try) 2>&5
4846 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4847 + (exit $ac_status); }; } &&
4848 + { ac_try='test -s conftest$ac_exeext'
4849 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4852 @@ -5422,12 +5948,12 @@ else
4853 sed 's/^/| /' conftest.$ac_ext >&5
4856 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4857 +rm -f conftest.err conftest.$ac_objext \
4858 + conftest$ac_exeext conftest.$ac_ext
4859 if test "$ac_cv_search_readline" = no; then
4860 for ac_lib in readline; do
4861 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
4862 cat >conftest.$ac_ext <<_ACEOF
4863 -#line $LINENO "configure"
4866 cat confdefs.h >>conftest.$ac_ext
4867 @@ -5451,11 +5977,20 @@ readline ();
4869 rm -f conftest.$ac_objext conftest$ac_exeext
4870 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
4871 - (eval $ac_link) 2>&5
4872 + (eval $ac_link) 2>conftest.er1
4874 + grep -v '^ *+' conftest.er1 >conftest.err
4875 + rm -f conftest.er1
4876 + cat conftest.err >&5
4877 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4878 (exit $ac_status); } &&
4879 - { ac_try='test -s conftest$ac_exeext'
4880 + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
4881 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4882 + (eval $ac_try) 2>&5
4884 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
4885 + (exit $ac_status); }; } &&
4886 + { ac_try='test -s conftest$ac_exeext'
4887 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
4890 @@ -5468,7 +6003,8 @@ else
4891 sed 's/^/| /' conftest.$ac_ext >&5
4894 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
4895 +rm -f conftest.err conftest.$ac_objext \
4896 + conftest$ac_exeext conftest.$ac_ext
4899 LIBS=$ac_func_search_save_LIBS
4900 @@ -5530,13 +6066,13 @@ _ACEOF
4901 # `set' does not quote correctly, so add quotes (double-quote
4902 # substitution turns \\\\ into \\, and sed turns \\ into \).
4905 - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
4907 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
4910 # `set' quotes correctly as required by POSIX, so do not add quotes.
4912 - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
4913 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
4917 @@ -5566,13 +6102,13 @@ test "x$exec_prefix" = xNONE && exec_pre
4918 # trailing colons and then remove the whole line if VPATH becomes empty
4919 # (actually we leave an empty line to preserve line numbers).
4920 if test "x$srcdir" = x.; then
4921 - ac_vpsub='/^[ ]*VPATH[ ]*=/{
4922 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
4923 s/:*\$(srcdir):*/:/;
4924 s/:*\${srcdir}:*/:/;
4926 -s/^\([^=]*=[ ]*\):*/\1/;
4927 +s/^\([^=]*=[ ]*\):*/\1/;
4934 @@ -5583,7 +6119,7 @@ ac_ltlibobjs=
4935 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
4936 # 1. Remove the extension, and $U if already installed.
4937 ac_i=`echo "$ac_i" |
4938 - sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
4939 + sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
4941 ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
4942 ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
4943 @@ -5593,6 +6129,20 @@ LIBOBJS=$ac_libobjs
4944 LTLIBOBJS=$ac_ltlibobjs
4947 +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
4948 + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
4949 +Usually this means the macro was only invoked conditionally." >&5
4950 +echo "$as_me: error: conditional \"AMDEP\" was never defined.
4951 +Usually this means the macro was only invoked conditionally." >&2;}
4952 + { (exit 1); exit 1; }; }
4954 +if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
4955 + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
4956 +Usually this means the macro was only invoked conditionally." >&5
4957 +echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
4958 +Usually this means the macro was only invoked conditionally." >&2;}
4959 + { (exit 1); exit 1; }; }
4962 : ${CONFIG_STATUS=./config.status}
4963 ac_clean_files_save=$ac_clean_files
4964 @@ -5627,9 +6177,10 @@ if test -n "${ZSH_VERSION+set}" && (emul
4965 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
4968 +DUALCASE=1; export DUALCASE # for MKS sh
4970 # Support unset when possible.
4971 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
4972 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
4976 @@ -5648,7 +6199,7 @@ for as_var in \
4977 LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
4978 LC_TELEPHONE LC_TIME
4980 - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
4981 + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
4982 eval $as_var=C; export $as_var
4985 @@ -5827,16 +6378,17 @@ rm -f conf$$ conf$$.exe conf$$.file
4986 if mkdir -p . 2>/dev/null; then
4989 + test -d ./-p && rmdir ./-p
4993 as_executable_p="test -f"
4995 # Sed expression to map a string onto a valid CPP name.
4996 -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
4997 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
4999 # Sed expression to map a string onto a valid variable name.
5000 -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
5001 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
5005 @@ -5863,7 +6415,7 @@ _ASBOX
5008 This file was extended by apachetop $as_me 0.12.6, which was
5009 -generated by GNU Autoconf 2.57. Invocation command line was
5010 +generated by GNU Autoconf 2.59. Invocation command line was
5012 CONFIG_FILES = $CONFIG_FILES
5013 CONFIG_HEADERS = $CONFIG_HEADERS
5014 @@ -5907,9 +6459,9 @@ Usage: $0 [OPTIONS] [FILE]...
5015 -d, --debug don't remove temporary files
5016 --recheck update $as_me by reconfiguring in the same conditions
5017 --file=FILE[:TEMPLATE]
5018 - instantiate the configuration file FILE
5019 + instantiate the configuration file FILE
5020 --header=FILE[:TEMPLATE]
5021 - instantiate the configuration header FILE
5022 + instantiate the configuration header FILE
5024 Configuration files:
5026 @@ -5926,11 +6478,10 @@ _ACEOF
5027 cat >>$CONFIG_STATUS <<_ACEOF
5029 apachetop config.status 0.12.6
5030 -configured by $0, generated by GNU Autoconf 2.57,
5031 +configured by $0, generated by GNU Autoconf 2.59,
5032 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
5034 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
5035 -Free Software Foundation, Inc.
5036 +Copyright (C) 2003 Free Software Foundation, Inc.
5037 This config.status script is free software; the Free Software Foundation
5038 gives unlimited permission to copy, distribute and modify it."
5040 @@ -6025,8 +6576,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
5041 # INIT-COMMANDS section.
5044 -AMDEP_TRUE="$AMDEP_TRUE"
5045 -ac_aux_dir="$ac_aux_dir"
5046 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
5050 @@ -6041,7 +6591,7 @@ do
5051 "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
5052 "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
5053 "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
5054 - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
5055 + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
5056 "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
5057 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
5058 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
5059 @@ -6131,10 +6681,9 @@ s,@LIBS@,$LIBS,;t t
5060 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
5061 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
5062 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
5063 +s,@CYGPATH_W@,$CYGPATH_W,;t t
5064 s,@PACKAGE@,$PACKAGE,;t t
5065 s,@VERSION@,$VERSION,;t t
5066 -s,@EXEEXT@,$EXEEXT,;t t
5067 -s,@OBJEXT@,$OBJEXT,;t t
5068 s,@ACLOCAL@,$ACLOCAL,;t t
5069 s,@AUTOCONF@,$AUTOCONF,;t t
5070 s,@AUTOMAKE@,$AUTOMAKE,;t t
5071 @@ -6142,21 +6691,28 @@ s,@AUTOHEADER@,$AUTOHEADER,;t t
5072 s,@MAKEINFO@,$MAKEINFO,;t t
5073 s,@AMTAR@,$AMTAR,;t t
5074 s,@install_sh@,$install_sh,;t t
5075 +s,@STRIP@,$STRIP,;t t
5076 +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
5077 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
5079 s,@SET_MAKE@,$SET_MAKE,;t t
5080 -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
5081 -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
5082 -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
5083 -s,@DEPDIR@,$DEPDIR,;t t
5084 +s,@am__leading_dot@,$am__leading_dot,;t t
5086 s,@CXXFLAGS@,$CXXFLAGS,;t t
5087 s,@LDFLAGS@,$LDFLAGS,;t t
5088 s,@CPPFLAGS@,$CPPFLAGS,;t t
5089 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
5090 +s,@EXEEXT@,$EXEEXT,;t t
5091 +s,@OBJEXT@,$OBJEXT,;t t
5092 +s,@DEPDIR@,$DEPDIR,;t t
5093 s,@am__include@,$am__include,;t t
5094 s,@am__quote@,$am__quote,;t t
5095 +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
5096 +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
5097 +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
5098 s,@CXXDEPMODE@,$CXXDEPMODE,;t t
5099 +s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
5100 +s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
5101 s,@CXXCPP@,$CXXCPP,;t t
5102 s,@EGREP@,$EGREP,;t t
5103 s,@LIBOBJS@,$LIBOBJS,;t t
5104 @@ -6191,9 +6747,9 @@ _ACEOF
5106 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
5107 if test -z "$ac_sed_cmds"; then
5108 - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
5109 + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
5111 - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
5112 + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
5114 ac_sed_frag=`expr $ac_sed_frag + 1`
5116 @@ -6211,21 +6767,21 @@ for ac_file in : $CONFIG_FILES; do test
5117 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
5119 - | *:- | *:-:* ) # input from stdin
5121 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5122 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5124 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5125 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5126 *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5127 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5128 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5129 * ) ac_file_in=$ac_file.in ;;
5132 # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
5133 ac_dir=`(dirname "$ac_file") 2>/dev/null ||
5134 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5135 - X"$ac_file" : 'X\(//\)[^/]' \| \
5136 - X"$ac_file" : 'X\(//\)$' \| \
5137 - X"$ac_file" : 'X\(/\)' \| \
5138 - . : '\(.\)' 2>/dev/null ||
5139 + X"$ac_file" : 'X\(//\)[^/]' \| \
5140 + X"$ac_file" : 'X\(//\)$' \| \
5141 + X"$ac_file" : 'X\(/\)' \| \
5142 + . : '\(.\)' 2>/dev/null ||
5144 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5145 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5146 @@ -6241,10 +6797,10 @@ echo X"$ac_file" |
5147 as_dirs="$as_dir $as_dirs"
5148 as_dir=`(dirname "$as_dir") 2>/dev/null ||
5149 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5150 - X"$as_dir" : 'X\(//\)[^/]' \| \
5151 - X"$as_dir" : 'X\(//\)$' \| \
5152 - X"$as_dir" : 'X\(/\)' \| \
5153 - . : '\(.\)' 2>/dev/null ||
5154 + X"$as_dir" : 'X\(//\)[^/]' \| \
5155 + X"$as_dir" : 'X\(//\)$' \| \
5156 + X"$as_dir" : 'X\(/\)' \| \
5157 + . : '\(.\)' 2>/dev/null ||
5159 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5160 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5161 @@ -6282,12 +6838,45 @@ case $srcdir in
5162 ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
5163 ac_top_srcdir=$ac_top_builddir$srcdir ;;
5165 -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
5167 -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
5168 -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
5169 -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
5170 -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
5172 +# Do not use `cd foo && pwd` to compute absolute paths, because
5173 +# the directories may not exist.
5175 +.) ac_abs_builddir="$ac_dir";;
5178 + .) ac_abs_builddir=`pwd`;;
5179 + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
5180 + *) ac_abs_builddir=`pwd`/"$ac_dir";;
5183 +case $ac_abs_builddir in
5184 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
5186 + case ${ac_top_builddir}. in
5187 + .) ac_abs_top_builddir=$ac_abs_builddir;;
5188 + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
5189 + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
5192 +case $ac_abs_builddir in
5193 +.) ac_abs_srcdir=$ac_srcdir;;
5195 + case $ac_srcdir in
5196 + .) ac_abs_srcdir=$ac_abs_builddir;;
5197 + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
5198 + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
5201 +case $ac_abs_builddir in
5202 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
5204 + case $ac_top_srcdir in
5205 + .) ac_abs_top_srcdir=$ac_abs_builddir;;
5206 + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
5207 + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
5213 @@ -6295,11 +6884,6 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a
5214 *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
5217 - if test x"$ac_file" != x-; then
5218 - { echo "$as_me:$LINENO: creating $ac_file" >&5
5219 -echo "$as_me: creating $ac_file" >&6;}
5222 # Let's still pretend it is `configure' which instantiates (i.e., don't
5223 # use $as_me), people would be surprised to read:
5224 # /* config.h. Generated by config.status. */
5225 @@ -6309,7 +6893,7 @@ echo "$as_me: creating $ac_file" >&6;}
5226 configure_input="$ac_file. "
5228 configure_input=$configure_input"Generated from `echo $ac_file_in |
5229 - sed 's,.*/,,'` by configure."
5230 + sed 's,.*/,,'` by configure."
5232 # First look for the input files in the build tree, otherwise in the
5234 @@ -6318,26 +6902,32 @@ echo "$as_me: creating $ac_file" >&6;}
5236 -) echo $tmp/stdin ;;
5238 - # Absolute (can't be DOS-style, as IFS=:)
5239 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5240 + # Absolute (can't be DOS-style, as IFS=:)
5241 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5242 echo "$as_me: error: cannot find input file: $f" >&2;}
5243 { (exit 1); exit 1; }; }
5247 - if test -f "$f"; then
5250 - elif test -f "$srcdir/$f"; then
5255 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5256 + if test -f "$f"; then
5259 + elif test -f "$srcdir/$f"; then
5264 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5265 echo "$as_me: error: cannot find input file: $f" >&2;}
5266 { (exit 1); exit 1; }; }
5270 done` || { (exit 1); exit 1; }
5272 + if test x"$ac_file" != x-; then
5273 + { echo "$as_me:$LINENO: creating $ac_file" >&5
5274 +echo "$as_me: creating $ac_file" >&6;}
5278 cat >>$CONFIG_STATUS <<_ACEOF
5280 @@ -6377,12 +6967,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF
5281 # NAME is the cpp macro being defined and VALUE is the value it is being given.
5283 # ac_d sets the value in "#define NAME VALUE" lines.
5284 -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
5285 -ac_dB='[ ].*$,\1#\2'
5286 +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
5287 +ac_dB='[ ].*$,\1#\2'
5290 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
5291 -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
5292 +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
5293 ac_uB='$,\1#\2define\3'
5296 @@ -6391,11 +6981,11 @@ for ac_file in : $CONFIG_HEADERS; do tes
5297 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
5299 - | *:- | *:-:* ) # input from stdin
5301 - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5302 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5304 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5305 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5306 *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
5307 - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5308 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
5309 * ) ac_file_in=$ac_file.in ;;
5312 @@ -6409,28 +6999,29 @@ echo "$as_me: creating $ac_file" >&6;}
5314 -) echo $tmp/stdin ;;
5316 - # Absolute (can't be DOS-style, as IFS=:)
5317 - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5318 + # Absolute (can't be DOS-style, as IFS=:)
5319 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5320 echo "$as_me: error: cannot find input file: $f" >&2;}
5321 { (exit 1); exit 1; }; }
5323 + # Do quote $f, to prevent DOS paths from being IFS'd.
5326 - if test -f "$f"; then
5329 - elif test -f "$srcdir/$f"; then
5334 - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5335 + if test -f "$f"; then
5338 + elif test -f "$srcdir/$f"; then
5343 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
5344 echo "$as_me: error: cannot find input file: $f" >&2;}
5345 { (exit 1); exit 1; }; }
5349 done` || { (exit 1); exit 1; }
5350 # Remove the trailing spaces.
5351 - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
5352 + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
5356 @@ -6453,9 +7044,9 @@ s/[\\&,]/\\&/g
5360 -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
5361 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
5363 -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
5364 +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
5367 # If some macros were called several times there might be several times
5368 @@ -6469,13 +7060,13 @@ rm -f confdef2sed.sed
5369 # example, in the case of _POSIX_SOURCE, which is predefined and required
5370 # on some systems where configure will not decide to define it.
5371 cat >>conftest.undefs <<\_ACEOF
5372 -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
5373 +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
5376 # Break up conftest.defines because some shells have a limit on the size
5377 # of here documents, and old seds have small limits too (100 cmds).
5378 echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
5379 -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
5380 +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
5381 echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
5382 echo ' :' >>$CONFIG_STATUS
5384 @@ -6484,7 +7075,7 @@ do
5385 # Write a limited-size here document to $tmp/defines.sed.
5386 echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
5387 # Speed up: don't consider the non `#define' lines.
5388 - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
5389 + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
5390 # Work around the forget-to-reset-the-flag bug.
5391 echo 't clr' >>$CONFIG_STATUS
5392 echo ': clr' >>$CONFIG_STATUS
5393 @@ -6511,7 +7102,7 @@ do
5394 # Write a limited-size here document to $tmp/undefs.sed.
5395 echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
5396 # Speed up: don't consider the non `#undef'
5397 - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
5398 + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
5399 # Work around the forget-to-reset-the-flag bug.
5400 echo 't clr' >>$CONFIG_STATUS
5401 echo ': clr' >>$CONFIG_STATUS
5402 @@ -6545,10 +7136,10 @@ echo "$as_me: $ac_file is unchanged" >&6
5404 ac_dir=`(dirname "$ac_file") 2>/dev/null ||
5405 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5406 - X"$ac_file" : 'X\(//\)[^/]' \| \
5407 - X"$ac_file" : 'X\(//\)$' \| \
5408 - X"$ac_file" : 'X\(/\)' \| \
5409 - . : '\(.\)' 2>/dev/null ||
5410 + X"$ac_file" : 'X\(//\)[^/]' \| \
5411 + X"$ac_file" : 'X\(//\)$' \| \
5412 + X"$ac_file" : 'X\(/\)' \| \
5413 + . : '\(.\)' 2>/dev/null ||
5415 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5416 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5417 @@ -6564,10 +7155,10 @@ echo X"$ac_file" |
5418 as_dirs="$as_dir $as_dirs"
5419 as_dir=`(dirname "$as_dir") 2>/dev/null ||
5420 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5421 - X"$as_dir" : 'X\(//\)[^/]' \| \
5422 - X"$as_dir" : 'X\(//\)$' \| \
5423 - X"$as_dir" : 'X\(/\)' \| \
5424 - . : '\(.\)' 2>/dev/null ||
5425 + X"$as_dir" : 'X\(//\)[^/]' \| \
5426 + X"$as_dir" : 'X\(//\)$' \| \
5427 + X"$as_dir" : 'X\(/\)' \| \
5428 + . : '\(.\)' 2>/dev/null ||
5430 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5431 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5432 @@ -6587,13 +7178,29 @@ echo "$as_me: error: cannot create direc
5436 - # Run the commands associated with the file.
5438 - config.h ) # update the timestamp
5439 -echo timestamp >"./stamp-h1"
5441 +# Compute $ac_file's index in $config_headers.
5443 +for _am_header in $config_headers :; do
5444 + case $_am_header in
5445 + $ac_file | $ac_file:* )
5448 + _am_stamp_count=`expr $_am_stamp_count + 1` ;;
5451 +echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
5452 +$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5453 + X$ac_file : 'X\(//\)[^/]' \| \
5454 + X$ac_file : 'X\(//\)$' \| \
5455 + X$ac_file : 'X\(/\)' \| \
5456 + . : '\(.\)' 2>/dev/null ||
5458 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5459 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5460 + /^X\(\/\/\)$/{ s//\1/; q; }
5461 + /^X\(\/\).*/{ s//\1/; q; }
5462 + s/.*/./; q'`/stamp-h$_am_stamp_count
5465 cat >>$CONFIG_STATUS <<\_ACEOF
5467 @@ -6605,16 +7212,41 @@ for ac_file in : $CONFIG_COMMANDS; do te
5468 ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
5469 ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
5470 $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5471 - X"$ac_dest" : 'X\(//\)[^/]' \| \
5472 - X"$ac_dest" : 'X\(//\)$' \| \
5473 - X"$ac_dest" : 'X\(/\)' \| \
5474 - . : '\(.\)' 2>/dev/null ||
5475 + X"$ac_dest" : 'X\(//\)[^/]' \| \
5476 + X"$ac_dest" : 'X\(//\)$' \| \
5477 + X"$ac_dest" : 'X\(/\)' \| \
5478 + . : '\(.\)' 2>/dev/null ||
5480 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5481 /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5482 /^X\(\/\/\)$/{ s//\1/; q; }
5483 /^X\(\/\).*/{ s//\1/; q; }
5485 + { if $as_mkdir_p; then
5486 + mkdir -p "$ac_dir"
5490 + while test ! -d "$as_dir"; do
5491 + as_dirs="$as_dir $as_dirs"
5492 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
5493 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5494 + X"$as_dir" : 'X\(//\)[^/]' \| \
5495 + X"$as_dir" : 'X\(//\)$' \| \
5496 + X"$as_dir" : 'X\(/\)' \| \
5497 + . : '\(.\)' 2>/dev/null ||
5499 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5500 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5501 + /^X\(\/\/\)$/{ s//\1/; q; }
5502 + /^X\(\/\).*/{ s//\1/; q; }
5505 + test ! -n "$as_dirs" || mkdir $as_dirs
5506 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
5507 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
5508 + { (exit 1); exit 1; }; }; }
5512 if test "$ac_dir" != .; then
5513 @@ -6640,25 +7272,75 @@ case $srcdir in
5514 ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
5515 ac_top_srcdir=$ac_top_builddir$srcdir ;;
5517 -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
5519 -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
5520 -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
5521 -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
5522 -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
5524 +# Do not use `cd foo && pwd` to compute absolute paths, because
5525 +# the directories may not exist.
5527 +.) ac_abs_builddir="$ac_dir";;
5530 + .) ac_abs_builddir=`pwd`;;
5531 + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
5532 + *) ac_abs_builddir=`pwd`/"$ac_dir";;
5535 +case $ac_abs_builddir in
5536 +.) ac_abs_top_builddir=${ac_top_builddir}.;;
5538 + case ${ac_top_builddir}. in
5539 + .) ac_abs_top_builddir=$ac_abs_builddir;;
5540 + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
5541 + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
5544 +case $ac_abs_builddir in
5545 +.) ac_abs_srcdir=$ac_srcdir;;
5547 + case $ac_srcdir in
5548 + .) ac_abs_srcdir=$ac_abs_builddir;;
5549 + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
5550 + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
5553 +case $ac_abs_builddir in
5554 +.) ac_abs_top_srcdir=$ac_top_srcdir;;
5556 + case $ac_top_srcdir in
5557 + .) ac_abs_top_srcdir=$ac_abs_builddir;;
5558 + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
5559 + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
5564 { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
5565 echo "$as_me: executing $ac_dest commands" >&6;}
5568 -test x"$AMDEP_TRUE" != x"" ||
5569 -for mf in $CONFIG_FILES; do
5571 - Makefile) dirpart=.;;
5572 - */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
5575 + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
5576 + # Strip MF so we end up with the name of the file.
5577 + mf=`echo "$mf" | sed -e 's/:.*$//'`
5578 + # Check whether this is an Automake generated Makefile or not.
5579 + # We used to match only the files named `Makefile.in', but
5580 + # some people rename them; so instead we look at the file content.
5581 + # Grep'ing the first line is not enough: some people post-process
5582 + # each Makefile.in and add a new line on top of each file to say so.
5583 + # So let's grep whole file.
5584 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
5585 + dirpart=`(dirname "$mf") 2>/dev/null ||
5586 +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5587 + X"$mf" : 'X\(//\)[^/]' \| \
5588 + X"$mf" : 'X\(//\)$' \| \
5589 + X"$mf" : 'X\(/\)' \| \
5590 + . : '\(.\)' 2>/dev/null ||
5592 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5593 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5594 + /^X\(\/\/\)$/{ s//\1/; q; }
5595 + /^X\(\/\).*/{ s//\1/; q; }
5600 grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
5601 # Extract the definition of DEP_FILES from the Makefile without
5603 @@ -6683,8 +7365,43 @@ for mf in $CONFIG_FILES; do
5604 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
5605 # Make sure the directory exists.
5606 test -f "$dirpart/$file" && continue
5607 - fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
5608 - $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
5609 + fdir=`(dirname "$file") 2>/dev/null ||
5610 +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5611 + X"$file" : 'X\(//\)[^/]' \| \
5612 + X"$file" : 'X\(//\)$' \| \
5613 + X"$file" : 'X\(/\)' \| \
5614 + . : '\(.\)' 2>/dev/null ||
5616 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5617 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5618 + /^X\(\/\/\)$/{ s//\1/; q; }
5619 + /^X\(\/\).*/{ s//\1/; q; }
5621 + { if $as_mkdir_p; then
5622 + mkdir -p $dirpart/$fdir
5624 + as_dir=$dirpart/$fdir
5626 + while test ! -d "$as_dir"; do
5627 + as_dirs="$as_dir $as_dirs"
5628 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
5629 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
5630 + X"$as_dir" : 'X\(//\)[^/]' \| \
5631 + X"$as_dir" : 'X\(//\)$' \| \
5632 + X"$as_dir" : 'X\(/\)' \| \
5633 + . : '\(.\)' 2>/dev/null ||
5635 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
5636 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
5637 + /^X\(\/\/\)$/{ s//\1/; q; }
5638 + /^X\(\/\).*/{ s//\1/; q; }
5641 + test ! -n "$as_dirs" || mkdir $as_dirs
5642 + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
5643 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
5644 + { (exit 1); exit 1; }; }; }
5646 # echo "creating $dirpart/$file"
5647 echo '# dummy' > "$dirpart/$file"
5649 diff -Naurp apachetop.orig/man/Makefile.in apachetop/man/Makefile.in
5650 --- apachetop.orig/man/Makefile.in 2009-07-16 21:43:27.000000000 +0000
5651 +++ apachetop/man/Makefile.in 2009-07-16 21:46:39.000000000 +0000
5653 -# Makefile.in generated automatically by automake 1.5 from Makefile.am.
5654 +# Makefile.in generated by automake 1.7.9 from Makefile.am.
5655 +# @configure_input@
5657 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
5658 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
5659 # Free Software Foundation, Inc.
5660 # This Makefile.in is free software; the Free Software Foundation
5661 # gives unlimited permission to copy and/or distribute it,
5669 top_srcdir = @top_srcdir@
5672 -exec_prefix = @exec_prefix@
5675 -sbindir = @sbindir@
5676 -libexecdir = @libexecdir@
5677 -datadir = @datadir@
5678 -sysconfdir = @sysconfdir@
5679 -sharedstatedir = @sharedstatedir@
5680 -localstatedir = @localstatedir@
5682 -infodir = @infodir@
5684 -includedir = @includedir@
5685 -oldincludedir = /usr/include
5686 pkgdatadir = $(datadir)/@PACKAGE@
5687 pkglibdir = $(libdir)/@PACKAGE@
5688 pkgincludedir = $(includedir)/@PACKAGE@
5691 -ACLOCAL = @ACLOCAL@
5692 -AUTOCONF = @AUTOCONF@
5693 -AUTOMAKE = @AUTOMAKE@
5694 -AUTOHEADER = @AUTOHEADER@
5696 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
5698 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
5699 -INSTALL_DATA = @INSTALL_DATA@
5700 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
5701 +install_sh_DATA = $(install_sh) -c -m 644
5702 +install_sh_PROGRAM = $(install_sh) -c
5703 +install_sh_SCRIPT = $(install_sh) -c
5704 INSTALL_HEADER = $(INSTALL_DATA)
5705 -transform = @program_transform_name@
5706 +transform = $(program_transform_name)
5710 NORMAL_UNINSTALL = :
5713 +ACLOCAL = @ACLOCAL@
5714 +AMDEP_FALSE = @AMDEP_FALSE@
5715 +AMDEP_TRUE = @AMDEP_TRUE@
5717 +AUTOCONF = @AUTOCONF@
5718 +AUTOHEADER = @AUTOHEADER@
5719 +AUTOMAKE = @AUTOMAKE@
5721 +CPPFLAGS = @CPPFLAGS@
5724 +CXXDEPMODE = @CXXDEPMODE@
5725 CXXFLAGS = @CXXFLAGS@
5726 +CYGPATH_W = @CYGPATH_W@
5734 HAVE_READLINE = @HAVE_READLINE@
5735 +INSTALL_DATA = @INSTALL_DATA@
5736 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
5737 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
5738 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
5739 +LDFLAGS = @LDFLAGS@
5740 +LIBOBJS = @LIBOBJS@
5742 +LTLIBOBJS = @LTLIBOBJS@
5743 +MAKEINFO = @MAKEINFO@
5746 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
5747 +PACKAGE_NAME = @PACKAGE_NAME@
5748 +PACKAGE_STRING = @PACKAGE_STRING@
5749 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
5750 +PACKAGE_VERSION = @PACKAGE_VERSION@
5751 +PATH_SEPARATOR = @PATH_SEPARATOR@
5752 +SET_MAKE = @SET_MAKE@
5756 +ac_ct_CXX = @ac_ct_CXX@
5757 +ac_ct_STRIP = @ac_ct_STRIP@
5758 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
5759 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
5760 am__include = @am__include@
5761 +am__leading_dot = @am__leading_dot@
5762 am__quote = @am__quote@
5764 +build_alias = @build_alias@
5765 +datadir = @datadir@
5766 +exec_prefix = @exec_prefix@
5767 +host_alias = @host_alias@
5768 +includedir = @includedir@
5769 +infodir = @infodir@
5770 install_sh = @install_sh@
5772 +libexecdir = @libexecdir@
5773 +localstatedir = @localstatedir@
5775 +oldincludedir = @oldincludedir@
5777 +program_transform_name = @program_transform_name@
5778 +sbindir = @sbindir@
5779 +sharedstatedir = @sharedstatedir@
5780 +sysconfdir = @sysconfdir@
5781 +target_alias = @target_alias@
5783 man_MANS = apachetop.1
5785 @@ -76,6 +111,7 @@ EXTRA_DIST = $(man_MANS)
5787 MAINTAINERCLEANFILES = Makefile.in
5789 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5790 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
5791 CONFIG_HEADER = $(top_builddir)/config.h
5792 CONFIG_CLEAN_FILES =
5793 @@ -83,7 +119,7 @@ DIST_SOURCES =
5797 -DIST_COMMON = Makefile.am Makefile.in
5798 +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
5802 @@ -91,9 +127,7 @@ $(srcdir)/Makefile.in: Makefile.am $(t
5803 cd $(top_srcdir) && \
5804 $(AUTOMAKE) --gnu man/Makefile
5805 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
5806 - cd $(top_builddir) && \
5807 - CONFIG_HEADERS= CONFIG_LINKS= \
5808 - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
5809 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
5812 man1dir = $(mandir)/man1
5813 @@ -111,6 +145,10 @@ install-man1: $(man1_MANS) $(man_MANS)
5814 if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
5815 else file=$$i; fi; \
5816 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
5821 inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
5822 inst=`echo $$inst | sed -e 's/^.*\///'`; \
5823 inst=`echo $$inst | sed '$(transform)'`.$$ext; \
5824 @@ -128,6 +166,10 @@ uninstall-man1:
5826 for i in $$list; do \
5827 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
5832 inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
5833 inst=`echo $$inst | sed -e 's/^.*\///'`; \
5834 inst=`echo $$inst | sed '$(transform)'`.$$ext; \
5835 @@ -137,6 +179,8 @@ uninstall-man1:
5842 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
5844 @@ -144,15 +188,26 @@ top_distdir = ..
5845 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
5847 distdir: $(DISTFILES)
5848 - @for file in $(DISTFILES); do \
5849 - if test -f $$file; then d=.; else d=$(srcdir); fi; \
5850 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
5851 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
5852 + list='$(DISTFILES)'; for file in $$list; do \
5854 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
5855 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
5857 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
5858 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
5859 if test "$$dir" != "$$file" && test "$$dir" != "."; then \
5860 - $(mkinstalldirs) "$(distdir)/$$dir"; \
5862 + $(mkinstalldirs) "$(distdir)$$dir"; \
5866 if test -d $$d/$$file; then \
5867 - cp -pR $$d/$$file $(distdir) \
5869 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
5870 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
5872 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
5874 test -f $(distdir)/$$file \
5875 || cp -p $$d/$$file $(distdir)/$$file \
5876 @@ -165,7 +220,6 @@ all-am: Makefile $(MANS)
5879 $(mkinstalldirs) $(DESTDIR)$(man1dir)
5882 install-exec: install-exec-am
5883 install-data: install-data-am
5884 @@ -177,6 +231,7 @@ install-am: all-am
5885 installcheck: installcheck-am
5887 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
5888 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
5889 `test -z '$(STRIP)' || \
5890 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
5891 mostlyclean-generic:
5892 @@ -184,7 +239,7 @@ mostlyclean-generic:
5896 - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
5897 + -rm -f $(CONFIG_CLEAN_FILES)
5899 maintainer-clean-generic:
5900 @echo "This command is intended for maintainers to use"
5901 @@ -195,7 +250,7 @@ clean: clean-am
5902 clean-am: clean-generic mostlyclean-am
5904 distclean: distclean-am
5907 distclean-am: clean-am distclean-generic
5910 @@ -217,13 +272,21 @@ install-man: install-man1
5913 maintainer-clean: maintainer-clean-am
5916 maintainer-clean-am: distclean-am maintainer-clean-generic
5918 mostlyclean: mostlyclean-am
5920 mostlyclean-am: mostlyclean-generic
5930 uninstall-am: uninstall-info-am uninstall-man
5932 uninstall-man: uninstall-man1
5933 @@ -234,8 +297,8 @@ uninstall-man: uninstall-man1
5934 install-exec-am install-info install-info-am install-man \
5935 install-man1 install-strip installcheck installcheck-am \
5936 installdirs maintainer-clean maintainer-clean-generic \
5937 - mostlyclean mostlyclean-generic uninstall uninstall-am \
5938 - uninstall-info-am uninstall-man uninstall-man1
5939 + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
5940 + uninstall-am uninstall-info-am uninstall-man uninstall-man1
5942 # Tell versions [3.59,3.63) of GNU make to not export all variables.
5943 # Otherwise a system limit (for SysV at least) may be exceeded.
5944 diff -Naurp apachetop.orig/man/apachetop.1 apachetop/man/apachetop.1
5945 --- apachetop.orig/man/apachetop.1 2009-07-16 21:43:27.000000000 +0000
5946 +++ apachetop/man/apachetop.1 2009-07-16 21:46:39.000000000 +0000
5947 @@ -51,4 +51,4 @@ apachetop -f /var/logs/httpd/access.log
5949 Chris Elsworth <chris@shagged.org>
5951 -http://clueful.shagged.org/apachetop/
5952 +http://www.webta.org/projects/apachetop/
5953 diff -Naurp apachetop.orig/src/Makefile.in apachetop/src/Makefile.in
5954 --- apachetop.orig/src/Makefile.in 2009-07-16 21:43:27.000000000 +0000
5955 +++ apachetop/src/Makefile.in 2009-07-16 21:46:39.000000000 +0000
5957 -# Makefile.in generated automatically by automake 1.5 from Makefile.am.
5958 +# Makefile.in generated by automake 1.7.9 from Makefile.am.
5959 +# @configure_input@
5961 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
5962 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
5963 # Free Software Foundation, Inc.
5964 # This Makefile.in is free software; the Free Software Foundation
5965 # gives unlimited permission to copy and/or distribute it,
5973 top_srcdir = @top_srcdir@
5976 -exec_prefix = @exec_prefix@
5979 -sbindir = @sbindir@
5980 -libexecdir = @libexecdir@
5981 -datadir = @datadir@
5982 -sysconfdir = @sysconfdir@
5983 -sharedstatedir = @sharedstatedir@
5984 -localstatedir = @localstatedir@
5986 -infodir = @infodir@
5988 -includedir = @includedir@
5989 -oldincludedir = /usr/include
5990 pkgdatadir = $(datadir)/@PACKAGE@
5991 pkglibdir = $(libdir)/@PACKAGE@
5992 pkgincludedir = $(includedir)/@PACKAGE@
5995 -ACLOCAL = @ACLOCAL@
5996 -AUTOCONF = @AUTOCONF@
5997 -AUTOMAKE = @AUTOMAKE@
5998 -AUTOHEADER = @AUTOHEADER@
6000 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
6002 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
6003 -INSTALL_DATA = @INSTALL_DATA@
6004 -INSTALL_SCRIPT = @INSTALL_SCRIPT@
6005 +install_sh_DATA = $(install_sh) -c -m 644
6006 +install_sh_PROGRAM = $(install_sh) -c
6007 +install_sh_SCRIPT = $(install_sh) -c
6008 INSTALL_HEADER = $(INSTALL_DATA)
6009 -transform = @program_transform_name@
6010 +transform = $(program_transform_name)
6014 NORMAL_UNINSTALL = :
6017 +ACLOCAL = @ACLOCAL@
6018 +AMDEP_FALSE = @AMDEP_FALSE@
6019 +AMDEP_TRUE = @AMDEP_TRUE@
6021 +AUTOCONF = @AUTOCONF@
6022 +AUTOHEADER = @AUTOHEADER@
6023 +AUTOMAKE = @AUTOMAKE@
6025 +CPPFLAGS = @CPPFLAGS@
6028 +CXXDEPMODE = @CXXDEPMODE@
6029 CXXFLAGS = @CXXFLAGS@
6030 +CYGPATH_W = @CYGPATH_W@
6038 HAVE_READLINE = @HAVE_READLINE@
6039 +INSTALL_DATA = @INSTALL_DATA@
6040 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
6041 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
6042 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
6043 +LDFLAGS = @LDFLAGS@
6044 +LIBOBJS = @LIBOBJS@
6046 +LTLIBOBJS = @LTLIBOBJS@
6047 +MAKEINFO = @MAKEINFO@
6050 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
6051 +PACKAGE_NAME = @PACKAGE_NAME@
6052 +PACKAGE_STRING = @PACKAGE_STRING@
6053 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
6054 +PACKAGE_VERSION = @PACKAGE_VERSION@
6055 +PATH_SEPARATOR = @PATH_SEPARATOR@
6056 +SET_MAKE = @SET_MAKE@
6060 +ac_ct_CXX = @ac_ct_CXX@
6061 +ac_ct_STRIP = @ac_ct_STRIP@
6062 +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
6063 +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
6064 am__include = @am__include@
6065 +am__leading_dot = @am__leading_dot@
6066 am__quote = @am__quote@
6068 +build_alias = @build_alias@
6069 +datadir = @datadir@
6070 +exec_prefix = @exec_prefix@
6071 +host_alias = @host_alias@
6072 +includedir = @includedir@
6073 +infodir = @infodir@
6074 install_sh = @install_sh@
6076 +libexecdir = @libexecdir@
6077 +localstatedir = @localstatedir@
6079 +oldincludedir = @oldincludedir@
6081 +program_transform_name = @program_transform_name@
6082 +sbindir = @sbindir@
6083 +sharedstatedir = @sharedstatedir@
6084 +sysconfdir = @sysconfdir@
6085 +target_alias = @target_alias@
6087 bin_PROGRAMS = apachetop
6089 @@ -84,6 +119,7 @@ noinst_HEADERS = apachetop.h log.h ohtbl
6091 MAINTAINERCLEANFILES = Makefile.in
6093 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6094 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
6095 CONFIG_HEADER = $(top_builddir)/config.h
6096 CONFIG_CLEAN_FILES =
6097 @@ -99,18 +135,15 @@ apachetop_LDADD = $(LDADD)
6098 apachetop_DEPENDENCIES =
6102 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
6103 -CPPFLAGS = @CPPFLAGS@
6104 -LDFLAGS = @LDFLAGS@
6106 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
6107 -@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/apachetop.Po $(DEPDIR)/display.Po \
6108 -@AMDEP_TRUE@ $(DEPDIR)/filters.Po $(DEPDIR)/hits_circle.Po \
6109 -@AMDEP_TRUE@ $(DEPDIR)/inlines.Po $(DEPDIR)/log.Po \
6110 -@AMDEP_TRUE@ $(DEPDIR)/map.Po $(DEPDIR)/ohtbl.Po \
6111 -@AMDEP_TRUE@ $(DEPDIR)/queue.Po $(DEPDIR)/resolver.Po \
6112 -@AMDEP_TRUE@ $(DEPDIR)/timed_circle.Po
6113 +am__depfiles_maybe = depfiles
6114 +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apachetop.Po ./$(DEPDIR)/display.Po \
6115 +@AMDEP_TRUE@ ./$(DEPDIR)/filters.Po ./$(DEPDIR)/hits_circle.Po \
6116 +@AMDEP_TRUE@ ./$(DEPDIR)/inlines.Po ./$(DEPDIR)/log.Po \
6117 +@AMDEP_TRUE@ ./$(DEPDIR)/map.Po ./$(DEPDIR)/ohtbl.Po \
6118 +@AMDEP_TRUE@ ./$(DEPDIR)/queue.Po ./$(DEPDIR)/resolver.Po \
6119 +@AMDEP_TRUE@ ./$(DEPDIR)/timed_circle.Po
6120 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
6121 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
6123 @@ -119,7 +152,7 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXF
6124 DIST_SOURCES = $(apachetop_SOURCES)
6125 HEADERS = $(noinst_HEADERS)
6127 -DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
6128 +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.in Makefile.am
6129 SOURCES = $(apachetop_SOURCES)
6132 @@ -130,9 +163,8 @@ $(srcdir)/Makefile.in: Makefile.am $(t
6133 cd $(top_srcdir) && \
6134 $(AUTOMAKE) --gnu src/Makefile
6135 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
6136 - cd $(top_builddir) && \
6137 - CONFIG_HEADERS= CONFIG_LINKS= \
6138 - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
6139 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
6140 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
6141 install-binPROGRAMS: $(bin_PROGRAMS)
6143 $(mkinstalldirs) $(DESTDIR)$(bindir)
6144 @@ -140,16 +172,16 @@ install-binPROGRAMS: $(bin_PROGRAMS)
6145 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
6148 - f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
6149 - echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
6150 - $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
6151 + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
6152 + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
6153 + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
6157 uninstall-binPROGRAMS:
6158 @$(NORMAL_UNINSTALL)
6159 @list='$(bin_PROGRAMS)'; for p in $$list; do \
6160 - f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
6161 + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
6162 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
6163 rm -f $(DESTDIR)$(bindir)/$$f; \
6165 @@ -166,82 +198,120 @@ mostlyclean-compile:
6169 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/apachetop.Po@am__quote@
6170 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/display.Po@am__quote@
6171 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filters.Po@am__quote@
6172 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hits_circle.Po@am__quote@
6173 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inlines.Po@am__quote@
6174 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/log.Po@am__quote@
6175 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/map.Po@am__quote@
6176 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ohtbl.Po@am__quote@
6177 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/queue.Po@am__quote@
6178 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/resolver.Po@am__quote@
6179 -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/timed_circle.Po@am__quote@
6183 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apachetop.Po@am__quote@
6184 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display.Po@am__quote@
6185 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters.Po@am__quote@
6186 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hits_circle.Po@am__quote@
6187 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inlines.Po@am__quote@
6188 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
6189 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Po@am__quote@
6190 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ohtbl.Po@am__quote@
6191 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue.Po@am__quote@
6192 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolver.Po@am__quote@
6193 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timed_circle.Po@am__quote@
6196 -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
6197 -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
6198 -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
6199 - $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
6200 +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
6201 +@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
6202 +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
6203 +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
6204 +@am__fastdepCXX_TRUE@ fi
6205 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
6206 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
6207 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
6208 +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
6211 -@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
6212 -@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
6213 -@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
6214 - $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
6215 -CXXDEPMODE = @CXXDEPMODE@
6216 +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
6217 +@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
6218 +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
6219 +@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
6220 +@am__fastdepCXX_TRUE@ fi
6221 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
6222 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
6223 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
6224 +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
6235 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
6236 - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
6237 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
6238 unique=`for i in $$list; do \
6239 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6241 $(AWK) ' { files[$$0] = 1; } \
6242 END { for (i in files) print i; }'`; \
6243 - mkid -fID $$unique $(LISP)
6244 + mkid -fID $$unique
6246 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6247 $(TAGS_FILES) $(LISP)
6250 - list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
6251 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
6252 unique=`for i in $$list; do \
6253 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6255 $(AWK) ' { files[$$0] = 1; } \
6256 END { for (i in files) print i; }'`; \
6257 - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
6258 - || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
6259 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
6260 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
6264 +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
6265 + $(TAGS_FILES) $(LISP)
6268 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
6269 + unique=`for i in $$list; do \
6270 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
6272 + $(AWK) ' { files[$$0] = 1; } \
6273 + END { for (i in files) print i; }'`; \
6274 + test -z "$(CTAGS_ARGS)$$tags$$unique" \
6275 + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
6279 - here=`CDPATH=: && cd $(top_builddir) && pwd` \
6280 + here=`$(am__cd) $(top_builddir) && pwd` \
6281 && cd $(top_srcdir) \
6282 && gtags -i $(GTAGS_ARGS) $$here
6285 - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
6287 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
6288 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
6291 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
6293 distdir: $(DISTFILES)
6294 - @for file in $(DISTFILES); do \
6295 - if test -f $$file; then d=.; else d=$(srcdir); fi; \
6296 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
6297 + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
6298 + list='$(DISTFILES)'; for file in $$list; do \
6300 + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
6301 + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
6303 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
6304 dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
6305 if test "$$dir" != "$$file" && test "$$dir" != "."; then \
6306 - $(mkinstalldirs) "$(distdir)/$$dir"; \
6308 + $(mkinstalldirs) "$(distdir)$$dir"; \
6312 if test -d $$d/$$file; then \
6313 - cp -pR $$d/$$file $(distdir) \
6315 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
6316 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
6318 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
6320 test -f $(distdir)/$$file \
6321 || cp -p $$d/$$file $(distdir)/$$file \
6322 @@ -254,7 +324,6 @@ all-am: Makefile $(PROGRAMS) $(HEADERS)
6325 $(mkinstalldirs) $(DESTDIR)$(bindir)
6328 install-exec: install-exec-am
6329 install-data: install-data-am
6330 @@ -266,6 +335,7 @@ install-am: all-am
6331 installcheck: installcheck-am
6333 $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
6334 + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
6335 `test -z '$(STRIP)' || \
6336 echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
6337 mostlyclean-generic:
6338 @@ -273,7 +343,7 @@ mostlyclean-generic:
6342 - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
6343 + -rm -f $(CONFIG_CLEAN_FILES)
6345 maintainer-clean-generic:
6346 @echo "This command is intended for maintainers to use"
6347 @@ -284,9 +354,10 @@ clean: clean-am
6348 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
6350 distclean: distclean-am
6352 -distclean-am: clean-am distclean-compile distclean-depend \
6353 - distclean-generic distclean-tags
6354 + -rm -rf ./$(DEPDIR)
6356 +distclean-am: clean-am distclean-compile distclean-generic \
6361 @@ -307,25 +378,34 @@ install-man:
6364 maintainer-clean: maintainer-clean-am
6366 + -rm -rf ./$(DEPDIR)
6368 maintainer-clean-am: distclean-am maintainer-clean-generic
6370 mostlyclean: mostlyclean-am
6372 mostlyclean-am: mostlyclean-compile mostlyclean-generic
6382 uninstall-am: uninstall-binPROGRAMS uninstall-info-am
6384 -.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
6385 - clean-generic distclean distclean-compile distclean-depend \
6386 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
6387 + clean-generic ctags distclean distclean-compile \
6388 distclean-generic distclean-tags distdir dvi dvi-am info \
6389 info-am install install-am install-binPROGRAMS install-data \
6390 install-data-am install-exec install-exec-am install-info \
6391 install-info-am install-man install-strip installcheck \
6392 installcheck-am installdirs maintainer-clean \
6393 maintainer-clean-generic mostlyclean mostlyclean-compile \
6394 - mostlyclean-generic tags uninstall uninstall-am \
6395 - uninstall-binPROGRAMS uninstall-info-am
6396 + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
6397 + uninstall-am uninstall-binPROGRAMS uninstall-info-am
6399 # Tell versions [3.59,3.63) of GNU make to not export all variables.
6400 # Otherwise a system limit (for SysV at least) may be exceeded.
6401 diff -Naurp apachetop.orig/src/apachetop.cc apachetop/src/apachetop.cc
6402 --- apachetop.orig/src/apachetop.cc 2009-07-16 21:43:27.000000000 +0000
6403 +++ apachetop/src/apachetop.cc 2009-07-16 21:46:39.000000000 +0000
6404 @@ -208,8 +208,14 @@ int main(int argc, char *argv[])
6405 /* if no files have been specified, we'll use DEFAULT_LOGFILE */
6406 if (cf.input_count == 0)
6408 - if (new_file(DEFAULT_LOGFILE, SEEK_TO_END) != -1)
6409 + if (new_file(DEFAULT_LOGFILE, SEEK_TO_END) != -1)
6413 + if (new_file("/var/log/apache/access.log", SEEK_TO_END) != -1)
6418 /* if it's still zero, fail */
6419 if (cf.input_count == 0)
6420 @@ -1007,7 +1013,11 @@ int new_file(char *filename, bool do_see
6422 if (do_seek_to_end) lseek(fd, 0, SEEK_END);
6424 - if (this_file->filename) free(this_file->filename);
6426 + * skx: This causes crashes since the realloc above doesn't
6427 + * NULL set the memory.
6428 + * if (this_file->filename) free(this_file->filename);
6431 this_file->inode = sb.st_ino;
6432 this_file->filename = strdup(realfile);
6433 diff -Naurp apachetop.orig/src/apachetop.h apachetop/src/apachetop.h
6434 --- apachetop.orig/src/apachetop.h 2009-07-16 21:43:27.000000000 +0000
6435 +++ apachetop/src/apachetop.h 2009-07-16 21:46:39.000000000 +0000
6437 # include "config.h"
6440 +#undef _FILE_OFFSET_BITS
6441 +#undef _LARGE_FILES
6442 +#define _FILE_OFFSET_BITS 64
6443 +#define _LARGE_FILES 1
6448 @@ -248,7 +253,7 @@ struct gstat {
6450 /* this can be overridden from config.h via ./configure --with-logfile .. */
6451 #ifndef DEFAULT_LOGFILE
6452 -# define DEFAULT_LOGFILE "/var/httpd/apache_log"
6453 +# define DEFAULT_LOGFILE "/var/log/apache2/access.log"
6455 #define DEFAULT_CIRCLE_SIZE 30
6456 #define DEFAULT_CIRCLE_MODE TIMED_CIRCLE
6457 diff -Naurp apachetop.orig/src/hits_circle.cc apachetop/src/hits_circle.cc
6458 --- apachetop.orig/src/hits_circle.cc 2009-07-16 21:43:27.000000000 +0000
6459 +++ apachetop/src/hits_circle.cc 2009-07-16 21:46:39.000000000 +0000
6462 #include "apachetop.h"
6464 -extern map *hm, *um, *rm;
6465 +extern map *hm, *um, *rm, *im;
6467 int Hits_Circle::create(unsigned int passed_size)
6469 @@ -48,7 +48,7 @@ int Hits_Circle::insert(struct logbits l
6470 hm->sub_ref(posptr->host_pos);
6471 um->sub_ref(posptr->url_pos);
6472 rm->sub_ref(posptr->ref_pos);
6474 + im->sub_ref(posptr->ip_pos);
6477 /* maintain some stats */
6478 diff -Naurp apachetop.orig/src/log.cc apachetop/src/log.cc
6479 --- apachetop.orig/src/log.cc 2009-07-16 21:43:27.000000000 +0000
6480 +++ apachetop/src/log.cc 2009-07-16 21:46:39.000000000 +0000
6481 @@ -365,7 +365,8 @@ void collect_dns_responses()
6482 lb->want_host = false;
6483 lb->want_ip = false;
6484 delete lb->dns_query;
6486 + lb->dns_query = NULL;
6488 if (answer->status == adns_s_ok)
6490 /* we have a reply */
6491 diff -Naurp apachetop.orig/src/map.cc apachetop/src/map.cc
6492 --- apachetop.orig/src/map.cc 2009-07-16 21:43:27.000000000 +0000
6493 +++ apachetop/src/map.cc 2009-07-16 21:46:39.000000000 +0000
6494 @@ -41,7 +41,6 @@ int map::destroy(void)
6498 - tab_hash->destroy();
6502 @@ -99,7 +98,7 @@ int map::insert(char *string)
6503 * particular entry is incremented */
6506 -// dprintf("%d Found %p %d for %s\n", time(NULL), this, x, string);
6507 +// dprintf("%d Found %p %d %d for %s\n", time(NULL), this, x, tab[x].refcount, string);
6511 @@ -188,10 +187,22 @@ char *map::reverse(int pos)
6513 void map::sub_ref(int pos)
6515 -// dprintf("%d subref %p %d for %s\n",
6516 -// time(NULL), this, pos, tab[pos].string);
6517 +// dprintf("%d subref %p %d %d for %s\n",
6518 +// time(NULL), this, pos, tab[pos].refcount, tab[pos].string);
6520 + /* -1 means no/invalid position, can happen with ip map */
6521 + if (pos < 0) return;
6523 - if (tab[pos].refcount > 0)
6524 + if (tab[pos].refcount > 0) {
6525 tab[pos].refcount--;
6527 + if ((tab[pos].refcount == 0) && (tab[pos].string)) {
6528 + /* remove from hash */
6529 + tab_hash->remove(tab[pos].string);
6531 + /* remove from table */
6532 + free(tab[pos].string);
6533 + tab[pos].string = NULL;
6534 + tab[pos].time = 0;
6538 diff -Naurp apachetop.orig/src/resolver.h apachetop/src/resolver.h
6539 --- apachetop.orig/src/resolver.h 2009-07-16 21:43:27.000000000 +0000
6540 +++ apachetop/src/resolver.h 2009-07-16 21:46:39.000000000 +0000
6541 @@ -10,8 +10,8 @@ enum resolver_action
6545 - Resolver::Resolver(void);
6546 - Resolver::~Resolver(void);
6549 int add_request(char *request, enum resolver_action act);
6552 diff -Naurp apachetop.orig/src/timed_circle.cc apachetop/src/timed_circle.cc
6553 --- apachetop.orig/src/timed_circle.cc 2009-07-16 21:43:27.000000000 +0000
6554 +++ apachetop/src/timed_circle.cc 2009-07-16 21:46:39.000000000 +0000
6556 extern time_t now; /* global ApacheTop-wide to save on time() calls */
6557 extern struct gstat gstats;
6559 -extern map *hm, *um, *rm;
6560 +extern map *hm, *um, *rm, *im;
6562 int Timed_Circle::create(unsigned int size)
6564 @@ -92,6 +92,7 @@ void Timed_Circle::resetbucketstats(cons
6565 if (hit->host_pos) hm->sub_ref(hit->host_pos);
6566 if (hit->url_pos) um->sub_ref(hit->url_pos);
6567 if (hit->ref_pos) rm->sub_ref(hit->ref_pos);
6568 + if (hit->ip_pos) im->sub_ref(hit->ip_pos);
6571 /* start at the beginning of the HIT array */
6572 @@ -144,6 +145,7 @@ int Timed_Circle::insert(struct logbits
6573 if (hit->host_pos) hm->sub_ref(hit->host_pos);
6574 if (hit->url_pos) um->sub_ref(hit->url_pos);
6575 if (hit->ref_pos) rm->sub_ref(hit->ref_pos);
6576 + if (hit->ip_pos) im->sub_ref(hit->ip_pos);
6578 /* store the data itself */
6579 memcpy(hit, &lb, sizeof(lb));