3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- httpd-2.0.47/./configure.in~configure 2003-05-21 00:46:00.000000000 -0400
7 +++ httpd-2.0.47/./configure.in 2004-01-26 19:43:04.000000000 -0500
9 dnl Use ./buildconf to produce a configure script
13 -AC_INIT(ABOUT_APACHE)
16 +AC_CONFIG_SRCDIR([ABOUT_APACHE])
18 AC_CONFIG_HEADER(include/ap_config_auto.h)
19 AC_CONFIG_AUX_DIR(build)
21 dnl shared library support for these packages doesn't currently
22 dnl work on some platforms
25 +AC_CANONICAL_TARGET([])
30 APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
33 - dnl This is a hack -- we should be using AC_TRY_RUN instead
34 + dnl This is a hack -- we should be using AC_RUN_IFELSE([AC_LANG_SOURCE([[]])],[],[],[]) instead
35 ap_platform_runtime_link_flag="-R"
36 dnl solaris 8 and above don't have a thundering herd
37 dnl not sure about rev's before this one.
39 dnl ## Check for typedefs, structures, and compiler characteristics.
42 -if test "$ac_cv_prog_gcc" = "yes"; then
43 +if test "$ac_cv_c_compiler_gnu" = "yes"; then
44 APR_ADDTO(NOTEST_CPPFLAGS,-DAP_HAVE_DESIGNATED_INITIALIZER)
49 dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
50 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
51 -[AC_TRY_COMPILE([#include <sys/types.h>
52 -#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
53 - ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
54 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
55 +#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
56 if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
57 AC_DEFINE(HAVE_GMTOFF)
60 dnl Ensure that docs/conf is created.
61 test -d docs/conf||$mkdir_p docs/conf
63 -AC_OUTPUT($APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,[true],[
64 +AC_CONFIG_FILES([$APACHE_OUTPUT_FILES docs/conf/httpd-std.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk])
65 +AC_CONFIG_COMMANDS([default],[[true]],[[
71 --- httpd-2.0.47/./srclib/apr/configure.in~configure 2003-06-11 11:20:33.000000000 -0400
72 +++ httpd-2.0.47/./srclib/apr/configure.in 2004-01-26 19:39:34.000000000 -0500
74 dnl Process this file with autoconf to produce a configure script.
75 dnl Use ./buildconf to prepare build files and run autoconf for APR.
77 -AC_INIT(build/apr_common.m4)
79 +AC_CONFIG_SRCDIR([build/apr_common.m4])
80 AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
81 AC_CONFIG_AUX_DIR(build)
85 APR_CONFIG_NICE(config.nice)
88 +AC_CANONICAL_TARGET([])
89 echo "Configuring APR library"
90 echo "Platform: $host"
93 dnl Linux is silly as it has pthread_rwlock_init defined
94 dnl but keeps the pthread_rwlock_t structure hidden unless
95 dnl special things are defined.
96 - AC_TRY_COMPILE([#include <sys/types.h>
97 -#include <pthread.h>],
98 - [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
99 - ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
100 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
101 +#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
102 if test "$ac_cv_struct_pthread_rw" = "no"; then
103 - AC_TRY_COMPILE([#define _XOPEN_SOURCE 500
104 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
107 #include <sys/types.h>
108 -#include <pthread.h>],
109 - [pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;],
110 - ac_cv_struct_pthread_rw=yes, ac_cv_struct_pthread_rw=no)
111 +#include <pthread.h>]], [[pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;]])],[ac_cv_struct_pthread_rw=yes],[ac_cv_struct_pthread_rw=no])
112 if test "$ac_cv_struct_pthread_rw" = "yes"; then
113 APR_ADDTO(CPPFLAGS, [-D_XOPEN_SOURCE=500 -D_BSD_SOURCE])
114 APR_ADDTO(CPPFLAGS, [-D_SVID_SOURCE])
116 if test "$ac_cv_func_mmap" = "yes" &&
117 test "$ac_cv_file__dev_zero" = "yes"; then
118 AC_MSG_CHECKING(for mmap that can map /dev/zero)
120 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
121 #include <sys/types.h>
122 #include <sys/stat.h>
128 - }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
129 + }]])],[],[ac_cv_file__dev_zero=no],[ac_cv_file__dev_zero=no])
131 AC_MSG_RESULT($ac_cv_file__dev_zero)
136 AC_CHECK_FUNCS(sigaction, [ have_sigaction="1" ], [ have_sigaction="0" ])
138 +AC_CHECK_DECLS([sys_siglist])
141 AC_CHECK_FUNCS(fork, [ fork="1" ], [ fork="0" ])
143 @@ -936,12 +934,11 @@
144 # being included by itself. Check for <netinet/tcp.h> manually,
145 # including another header file first.
146 AC_CACHE_CHECK([for netinet/tcp.h], [apr_cv_hdr_netinet_tcp_h],
148 -[#ifdef HAVE_NETINET_IN_H
149 +[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#ifdef HAVE_NETINET_IN_H
150 #include <netinet/in.h>
152 #include <netinet/tcp.h>
153 -], [apr_cv_hdr_netinet_tcp_h=yes], [apr_cv_hdr_netinet_tcp_h=no])])
154 +]])],[apr_cv_hdr_netinet_tcp_h=yes],[apr_cv_hdr_netinet_tcp_h=no])])
155 if test "$apr_cv_hdr_netinet_tcp_h" = "yes"; then
157 AC_DEFINE([HAVE_NETINET_TCP_H], 1, [Defined if netinet/tcp.h is present])
158 @@ -1012,7 +1009,7 @@
159 if test "x$ac_cv_sizeof_voidp" != "x"; then
160 voidp_size=$ac_cv_sizeof_voidp
162 - AC_ERROR([Cannot determine size of void*])
163 + AC_MSG_ERROR([Cannot determine size of void*])
166 dnl Checks for integer size
167 @@ -1351,7 +1348,7 @@
170 AC_CACHE_CHECK(struct rlimit,ac_cv_struct_rlimit,[
172 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
173 #include <sys/types.h>
174 #include <sys/time.h>
175 #include <sys/resource.h>
176 @@ -1361,10 +1358,10 @@
181 - ac_cv_struct_rlimit=yes ], [
182 - ac_cv_struct_rlimit=no ], [
183 - ac_cv_struct_rlimit=no ] ) ] )
185 + ac_cv_struct_rlimit=yes ],[
186 + ac_cv_struct_rlimit=no ],[
187 + ac_cv_struct_rlimit=no ]) ] )
189 test "x$ac_cv_struct_rlimit" = xyes && struct_rlimit=1
190 AC_SUBST(struct_rlimit)
191 @@ -1378,7 +1375,7 @@
193 # Some systems return ENOSYS from sem_open.
194 AC_CACHE_CHECK(for working sem_open,ac_cv_func_sem_open,[
196 +AC_RUN_IFELSE([AC_LANG_SOURCE([[
200 @@ -1397,22 +1394,21 @@
202 sem_unlink(sem_name);
204 -}], [ac_cv_func_sem_open=yes], [ac_cv_func_sem_open=no],
205 -[ac_cv_func_sem_open=no])])
206 +}]])],[ac_cv_func_sem_open=yes],[ac_cv_func_sem_open=no],[ac_cv_func_sem_open=no])])
208 # It's stupid, but not all platforms have union semun, even those that need it.
209 AC_MSG_CHECKING(for union semun in sys/sem.h)
211 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
212 #include <sys/types.h>
218 semctl(0, 0, 0, arg);
219 -], [have_union_semun="1" union_semun=yes ]
221 +]])],[have_union_semun="1" union_semun=yes
226 AC_MSG_RESULT([$msg])
227 AC_SUBST(have_union_semun)
229 @@ -1434,7 +1430,7 @@
230 # Linux and older versions of AIX have this problem.
231 APR_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED func:pthread_mutexattr_setpshared, [
232 AC_CACHE_CHECK([for working PROCESS_SHARED locks], apr_cv_process_shared_works, [
234 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
235 #include <sys/types.h>
238 @@ -1452,7 +1448,7 @@
239 if (pthread_mutex_destroy(&mutex))
242 - }], [apr_cv_process_shared_works=yes], [apr_cv_process_shared_works=no])])
243 + }]])],[apr_cv_process_shared_works=yes],[apr_cv_process_shared_works=no],[])])
244 # Override detection of pthread_mutexattr_setpshared
245 ac_cv_func_pthread_mutexattr_setpshared=$apr_cv_process_shared_works])
247 @@ -1461,15 +1457,15 @@
248 if test "$ac_cv_func_pthread_mutexattr_setrobust_np" = "no"; then
249 AC_CACHE_CHECK([for pthread_mutexattr_setrobust_np with _POSIX_THREAD_PRIO_INHERIT],
250 [apr_cv_setrobust_with_prio_inherit], [
251 - AC_TRY_COMPILE([#define _POSIX_THREAD_PRIO_INHERIT
252 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _POSIX_THREAD_PRIO_INHERIT
253 #include <sys/types.h>
254 -#include <pthread.h>],[
255 +#include <pthread.h>]], [[
258 pthread_mutexattr_t attr;
259 pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST_NP);
261 - }], [apr_cv_setrobust_with_prio_inherit=yes], [apr_cv_setrobust_with_prio_inherit=no])])
262 + }]])],[apr_cv_setrobust_with_prio_inherit=yes],[apr_cv_setrobust_with_prio_inherit=no])])
263 if test "$apr_cv_setrobust_with_prio_inherit" = "yes"; then
264 ac_cv_func_pthread_mutexattr_setrobust_np=yes
265 APR_ADDTO(CPPFLAGS, -D_POSIX_THREAD_PRIO_INHERIT)
266 @@ -1637,7 +1633,7 @@
267 if test -r "$apr_devrandom"; then
270 - AC_ERROR([$apr_devrandom not found or unreadable.])
271 + AC_MSG_ERROR([$apr_devrandom not found or unreadable.])
275 @@ -1673,9 +1669,8 @@
276 dnl ----------------------------- Checking for Time Support
277 echo "${nl}Checking for Time Support..."
278 AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
279 -[AC_TRY_COMPILE([#include <sys/types.h>
280 -#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
281 - ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
282 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
283 +#include <time.h>]], [[struct tm tm; tm.tm_gmtoff;]])],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])])
285 if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
286 AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
287 @@ -1684,14 +1679,14 @@
288 dnl ----------------------------- Checking for Networking Support
289 echo "${nl}Checking for Networking support..."
290 AC_MSG_CHECKING(for in_addr in netinet/in.h)
292 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
293 #include <sys/types.h>
294 #include <netinet/in.h>
298 arg.s_addr = htonl(INADDR_ANY);
299 -], [ have_in_addr="1"
300 -msg=yes ] , [ have_in_addr="0"
301 +]])],[ have_in_addr="1"
302 +msg=yes ],[ have_in_addr="0"
304 AC_MSG_RESULT([$msg])
306 @@ -1898,12 +1893,13 @@
307 dir=include/arch/unix
308 test -d $dir || $MKDIR $dir
312 $MAKEFILE1 $MAKEFILE2 $MAKEFILE3
318 +AC_CONFIG_COMMANDS([default],[[
319 for i in $SAVE_FILES; do
320 if cmp -s $i $i.save 2>/dev/null; then
322 @@ -1912,7 +1908,8 @@
330 dnl ----------------------------- Fixup Makefiles for VPATH support
332 --- httpd-2.0.47/./srclib/pcre/configure.in~configure 2002-03-20 01:56:34.000000000 -0500
333 +++ httpd-2.0.47/./srclib/pcre/configure.in 2004-01-26 19:43:27.000000000 -0500
335 dnl This is required at the start; the name is the name of a file
336 dnl it should be seeing, to verify it is in the same directory.
340 +AC_CONFIG_SRCDIR([dftables.c])
342 dnl Arrange to build config.h from config.in. Note that pcre.h is
343 dnl built differently, as it is just a "substitution" file.
345 AC_SUBST(PCRE_POSIXLIB_VERSION)
347 dnl This must be last; it determines what files are written as well as config.h
348 -AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config,[chmod a+x pcre-config])
349 +AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config])
350 +AC_CONFIG_COMMANDS([default],[[chmod a+x pcre-config]],[[]])
352 --- httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in~configure 2001-07-08 22:31:04.000000000 -0400
353 +++ httpd-2.0.47/./srclib/apr-util/xml/expat/configure.in 2004-01-26 19:39:34.000000000 -0500
355 dnl in the file COPYING that comes with this distribution.
358 -AC_INIT(Makefile.in)
360 +AC_CONFIG_SRCDIR([Makefile.in])
361 AC_CONFIG_AUX_DIR(conftools)
366 AC_CONFIG_HEADER(config.h)
369 +AC_CANONICAL_TARGET([])
370 case "$host_alias" in
372 # Use a custom made libtool replacement
375 AC_CHECK_FUNCS(memmove bcopy)
377 -AC_OUTPUT(Makefile lib/Makefile lib/expat.h)
378 +AC_CONFIG_FILES([Makefile lib/Makefile lib/expat.h])
380 --- httpd-2.0.47/./srclib/apr-util/configure.in~configure 2003-06-12 03:27:10.000000000 -0400
381 +++ httpd-2.0.47/./srclib/apr-util/configure.in 2004-01-26 19:39:34.000000000 -0500
383 dnl Process this file with autoconf to produce a configure script
387 -AC_INIT(export_vars.sh.in)
390 +AC_CONFIG_SRCDIR([export_vars.sh.in])
392 AC_CONFIG_HEADER(include/private/apu_config.h)
393 AC_CONFIG_AUX_DIR(build)
399 +AC_CANONICAL_TARGET([])
402 dnl compute the top directory of the build
403 @@ -191,13 +192,15 @@
405 dnl everthing is done.
406 MAKEFILES="Makefile buckets/Makefile crypto/Makefile dbm/Makefile dbm/sdbm/Makefile encoding/Makefile hooks/Makefile ldap/Makefile uri/Makefile xml/Makefile misc/Makefile strmatch/Makefile xlate/Makefile $test_Makefile"
411 include/private/apu_select_dbm.h
417 +AC_CONFIG_COMMANDS([default],[[
422 --- httpd-2.0.47/acinclude.m4~configure 2002-11-29 06:05:57.000000000 -0500
423 +++ httpd-2.0.47/acinclude.m4 2004-01-26 19:39:34.000000000 -0500
425 dnl AC_HELP_STRING, so let's try to call it if we can.
426 dnl Note: this define must be on one line so that it can be properly returned
427 dnl as the help string.
428 -AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
429 +AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
431 dnl APACHE_SUBST(VARIABLE)
432 dnl Makes VARIABLE available in generated files
433 dnl (do not use @variable@ in Makefiles, but $(variable))
434 -AC_DEFUN(APACHE_SUBST,[
435 +AC_DEFUN([APACHE_SUBST],[
436 APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1"
440 dnl APACHE_FAST_OUTPUT(FILENAME)
441 dnl Perform substitutions on FILENAME (Makefiles only)
442 -AC_DEFUN(APACHE_FAST_OUTPUT,[
443 +AC_DEFUN([APACHE_FAST_OUTPUT],[
444 APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1"
447 dnl APACHE_GEN_CONFIG_VARS
448 dnl Creates config_vars.mk
449 -AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
450 +AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
451 APACHE_SUBST(abs_srcdir)
453 APACHE_SUBST(sbindir)
454 @@ -104,14 +104,14 @@
456 dnl APACHE_GEN_MAKEFILES
457 dnl Creates Makefiles
458 -AC_DEFUN(APACHE_GEN_MAKEFILES,[
459 +AC_DEFUN([APACHE_GEN_MAKEFILES],[
460 $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES
463 dnl ## APACHE_OUTPUT(file)
464 dnl ## adds "file" to the list of files generated by AC_OUTPUT
465 dnl ## This macro can be used several times.
466 -AC_DEFUN(APACHE_OUTPUT, [
467 +AC_DEFUN([APACHE_OUTPUT], [
468 APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1"
473 dnl If rlim_t is not defined, define it to int
475 -AC_DEFUN(APACHE_TYPE_RLIM_T, [
476 +AC_DEFUN([APACHE_TYPE_RLIM_T], [
477 AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
479 #include <sys/types.h>
483 dnl APACHE_MODPATH_INIT(modpath)
484 -AC_DEFUN(APACHE_MODPATH_INIT,[
485 +AC_DEFUN([APACHE_MODPATH_INIT],[
487 modpath_current=modules/$1
490 > $modpath_current/modules.mk
493 -AC_DEFUN(APACHE_MODPATH_FINISH,[
494 +AC_DEFUN([APACHE_MODPATH_FINISH],[
495 echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk
496 echo "static = $modpath_static" >> $modpath_current/modules.mk
497 echo "shared = $modpath_shared" >> $modpath_current/modules.mk
501 dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]])
502 -AC_DEFUN(APACHE_MODPATH_ADD,[
503 +AC_DEFUN([APACHE_MODPATH_ADD],[
504 if test -z "$3"; then
508 dnl setting. otherwise, fall under the "all" setting.
509 dnl explicit yes/no always overrides.
511 -AC_DEFUN(APACHE_MODULE,[
512 +AC_DEFUN([APACHE_MODULE],[
513 AC_MSG_CHECKING(whether to enable mod_$1)
514 define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl
515 AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),,enable_$1=ifelse($5,,maybe-all,$5))
518 dnl APACHE_LAYOUT(configlayout, layoutname)
520 -AC_DEFUN(APACHE_LAYOUT,[
521 +AC_DEFUN([APACHE_LAYOUT],[
522 if test ! -f $srcdir/config.layout; then
523 echo "** Error: Layout file $srcdir/config.layout not found"
524 echo "** Error: Cannot use undefined layout '$LAYOUT'"
527 dnl APACHE_ENABLE_LAYOUT
529 -AC_DEFUN(APACHE_ENABLE_LAYOUT,[
530 +AC_DEFUN([APACHE_ENABLE_LAYOUT],[
531 AC_ARG_ENABLE(layout,
532 [ --enable-layout=LAYOUT],[
536 dnl APACHE_ENABLE_MODULES
538 -AC_DEFUN(APACHE_ENABLE_MODULES,[
539 +AC_DEFUN([APACHE_ENABLE_MODULES],[
540 module_selection=default
547 -AC_DEFUN(APACHE_REQUIRE_CXX,[
548 +AC_DEFUN([APACHE_REQUIRE_CXX],[
549 if test -z "$apache_cxx_done"; then
553 dnl and then AC_TRY_LINK to test the libraries directly for the version,
554 dnl but that will require someone who knows how to program openssl.
556 -AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[
557 +AC_DEFUN([APACHE_CHECK_SSL_TOOLKIT],[
558 if test "x$ap_ssltk_base" = "x"; then
559 AC_MSG_CHECKING(for SSL/TLS toolkit base)
561 @@ -499,14 +499,14 @@
562 dnl apache will use while generating scripts like autoconf and apxs and
563 dnl the default config file.
565 -AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[
566 +AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[
567 APR_EXPAND_VAR(exp_$1, [$]$1)
569 APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix})
573 -AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[
574 +AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[
575 APACHE_SUBST_EXPANDED_ARG(exec_prefix)
576 APACHE_SUBST_EXPANDED_ARG(bindir)
577 APACHE_SUBST_EXPANDED_ARG(sbindir)
578 --- httpd-2.0.47/srclib/apr/build/apr_common.m4~configure 2003-04-05 16:42:20.000000000 -0500
579 +++ httpd-2.0.47/srclib/apr/build/apr_common.m4 2004-01-26 19:39:34.000000000 -0500
582 dnl Saves a snapshot of the configure command-line for later reuse
584 -AC_DEFUN(APR_CONFIG_NICE,[
585 +AC_DEFUN([APR_CONFIG_NICE],[
591 dnl APR_MKDIR_P_CHECK(fallback-mkdir-p)
592 dnl checks whether mkdir -p works
593 -AC_DEFUN(APR_MKDIR_P_CHECK,[
594 +AC_DEFUN([APR_MKDIR_P_CHECK],[
595 AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
596 test -d conftestdir && rm -rf conftestdir
597 mkdir -p conftestdir/somedir >/dev/null 2>&1
599 dnl Trying to optimize this is left as an exercise to the reader who wants
600 dnl to put up with more autoconf craziness. I give up.
602 -AC_DEFUN(APR_SUBDIR_CONFIG, [
603 +AC_DEFUN([APR_SUBDIR_CONFIG], [
604 # save our work to this point; this allows the sub-package to use it
609 dnl Stores the variable (usually a Makefile macro) for later restoration
611 -AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[
612 +AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[
613 apr_ste_save_$1="$$1"
617 dnl and restoring the original variable contents. This makes it possible
618 dnl for a user to override configure when it does something stupid.
620 -AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[
621 +AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[
622 if test "x$apr_ste_save_$1" = "x"; then
627 dnl Set variable iff it's currently null
629 -AC_DEFUN(APR_SETIFNULL,[
630 +AC_DEFUN([APR_SETIFNULL],[
631 if test -z "$$1"; then
632 echo " setting $1 to \"$2\""
636 dnl Set variable no matter what
638 -AC_DEFUN(APR_SETVAR,[
639 +AC_DEFUN([APR_SETVAR],[
640 echo " forcing $1 to \"$2\""
645 dnl Add value to variable
647 -AC_DEFUN(APR_ADDTO,[
648 +AC_DEFUN([APR_ADDTO],[
649 if test "x$$1" = "x"; then
650 echo " setting $1 to \"$2\""
654 dnl Remove a value from a variable
656 -AC_DEFUN(APR_REMOVEFROM,[
657 +AC_DEFUN([APR_REMOVEFROM],[
658 if test "x$$1" = "x$2"; then
663 dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] )
665 -AC_DEFUN(APR_CHECK_DEFINE_FILES,[
666 +AC_DEFUN([APR_CHECK_DEFINE_FILES],[
667 AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
672 dnl APR_CHECK_DEFINE(symbol, header_file)
674 -AC_DEFUN(APR_CHECK_DEFINE,[
675 +AC_DEFUN([APR_CHECK_DEFINE],[
676 AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[
677 AC_EGREP_CPP(YES_IS_DEFINED, [
681 dnl APR_CHECK_APR_DEFINE( symbol )
683 -AC_DEFUN(APR_CHECK_APR_DEFINE,[
684 +AC_DEFUN([APR_CHECK_APR_DEFINE],[
685 apr_old_cppflags=$CPPFLAGS
686 CPPFLAGS="$CPPFLAGS $INCLUDES"
687 AC_EGREP_CPP(YES_IS_DEFINED, [
692 -define(APR_IFALLYES,[dnl
693 +define([APR_IFALLYES],[dnl
695 for ac_spec in $1; do
696 ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'`
697 @@ -364,14 +364,14 @@
701 -define(APR_BEGIN_DECISION,[dnl
702 +define([APR_BEGIN_DECISION],[dnl
703 ac_decision_item='$1'
704 ac_decision_msg='FAILED'
709 -define(APR_DECIDE,[dnl
710 +define([APR_DECIDE],[dnl
718 -define(APR_DECISION_OVERRIDE,[dnl
719 +define([APR_DECISION_OVERRIDE],[dnl
721 for ac_item in $1; do
722 eval "ac_decision_this=\$ac_decision_${ac_item}"
723 @@ -391,13 +391,13 @@
727 -define(APR_DECISION_FORCE,[dnl
728 +define([APR_DECISION_FORCE],[dnl
730 eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\""
734 -define(APR_END_DECISION,[dnl
735 +define([APR_END_DECISION],[dnl
736 if test ".$ac_decision" = .; then
737 echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2
740 dnl A variant of AC_CHECK_SIZEOF which allows the checking of
741 dnl sizes of non-builtin types
743 -AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED,
744 +AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED],
745 [changequote(<<,>>)dnl
746 dnl The name to #define
747 define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl
749 dnl Tries a compile test with warnings activated so that the result
750 dnl is false if the code doesn't compile cleanly.
752 -AC_DEFUN(APR_TRY_COMPILE_NO_WARNING,
753 +AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
754 [if test "x$CFLAGS_WARN" = "x"; then
761 -AC_DEFUN(APR_CHECK_STRERROR_R_RC,[
762 +AC_DEFUN([APR_CHECK_STRERROR_R_RC],[
763 AC_MSG_CHECKING(for type of return code from strerror_r)
767 dnl Decide which of a couple of flavors of crypt_r() is necessary for
770 -AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[
771 +AC_DEFUN([APR_CHECK_CRYPT_R_STYLE],[
772 AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[
774 ac_cv_crypt_r_style=none
776 dnl structure on this platform. Single UNIX Spec says d_ino,
777 dnl BSD uses d_fileno. Undef to find the real beast.
779 -AC_DEFUN(APR_CHECK_DIRENT_INODE, [
780 +AC_DEFUN([APR_CHECK_DIRENT_INODE], [
781 AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [
782 apr_cv_dirent_inode=no
785 dnl Note that this is worthless without DT_xxx macros, so
786 dnl look for one while we are at it.
788 -AC_DEFUN(APR_CHECK_DIRENT_TYPE,[
789 +AC_DEFUN([APR_CHECK_DIRENT_TYPE],[
790 AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[
791 apr_cv_dirent_type=no
794 dnl within each iteration.
797 -define({APR_COMMA_ARGS},{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
798 -define({APR_FOREACH},
799 +define([{APR_COMMA_ARGS}],{patsubst([$}{1],[[}apr_whitespace{]+],[,])})
800 +define([{APR_FOREACH}],
803 $}{2)$}{1[]APR_FOREACH([$}{1],
805 dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of
806 dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no.
808 -AC_DEFUN(APR_FLAG_HEADERS,[
809 +AC_DEFUN([APR_FLAG_HEADERS],[
814 dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET
817 -AC_DEFUN(APR_FLAG_FUNCS,[
818 +AC_DEFUN([APR_FLAG_FUNCS],[
823 dnl APR_EXPAND_VAR(fraz, $baz)
824 dnl $fraz is now "1/2/3"
826 -AC_DEFUN(APR_EXPAND_VAR,[
827 +AC_DEFUN([APR_EXPAND_VAR],[
830 while test "x${ap_cur}" != "x${ap_last}";
832 dnl orig_path="${prefix}/bar"
833 dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix)
834 dnl $final_path now contains "bar"
835 -AC_DEFUN(APR_PATH_RELATIVE,[
836 +AC_DEFUN([APR_PATH_RELATIVE],[
837 ap_stripped=`echo $2 | sed -e "s#^$3##"`
838 # check if the stripping was successful
839 if test "x$2" != "x${ap_stripped}"; then
840 @@ -744,12 +744,12 @@
841 dnl Note: this define must be on one line so that it can be properly returned
842 dnl as the help string. When using this macro with a multi-line RHS, ensure
843 dnl that you surround the macro invocation with []s
844 -AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])])
845 +AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])])
848 dnl APR_LAYOUT(configlayout, layoutname [, extravars])
850 -AC_DEFUN(APR_LAYOUT,[
851 +AC_DEFUN([APR_LAYOUT],[
852 if test ! -f $srcdir/config.layout; then
853 echo "** Error: Layout file $srcdir/config.layout not found"
854 echo "** Error: Cannot use undefined layout '$LAYOUT'"
857 dnl APR_ENABLE_LAYOUT(default layout name [, extra vars])
859 -AC_DEFUN(APR_ENABLE_LAYOUT,[
860 +AC_DEFUN([APR_ENABLE_LAYOUT],[
861 AC_ARG_ENABLE(layout,
862 [ --enable-layout=LAYOUT],[
865 dnl a reimplementation of autoconf's argument parser,
866 dnl used here to allow us to co-exist layouts and argument based
868 -AC_DEFUN(APR_PARSE_ARGUMENTS,[
869 +AC_DEFUN([APR_PARSE_ARGUMENTS],[
875 dnl Determine what program we can use to generate .deps-style dependencies
877 -AC_DEFUN(APR_CHECK_DEPEND,[
878 +AC_DEFUN([APR_CHECK_DEPEND],[
879 dnl Try to determine what depend program we can use
880 dnl All GCC-variants should have -MM.
881 dnl If not, then we can check on those, too.
882 --- httpd-2.0.47/srclib/apr/build/find_apr.m4~configure 2002-11-05 17:09:19.000000000 -0500
883 +++ httpd-2.0.47/srclib/apr/build/find_apr.m4 2004-01-26 19:39:34.000000000 -0500
885 dnl value of apr_config to fetch any necessary build/link information.
888 -AC_DEFUN(APR_FIND_APR, [
889 +AC_DEFUN([APR_FIND_APR], [
892 if test "$ac_cv_emxos2" = "yes"; then
893 --- httpd-2.0.47/srclib/apr-util/build/find_apu.m4~configure 2002-11-05 17:13:42.000000000 -0500
894 +++ httpd-2.0.47/srclib/apr-util/build/find_apu.m4 2004-01-26 19:39:34.000000000 -0500
896 dnl value of apu_config to fetch any necessary build/link information.
899 -AC_DEFUN(APR_FIND_APU, [
900 +AC_DEFUN([APR_FIND_APU], [
903 AC_MSG_CHECKING(for APR-util)