manoj 99/12/05 21:01:33
Modified: src/modules/standard config.m4 Log: Add strucutre to autoconf-config system to allow modules to specify config tests to run if they are enabled. Revision Changes Path 1.9 +8 -6 apache-2.0/src/modules/standard/config.m4 Index: config.m4 =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/config.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -u -r1.8 -r1.9 --- config.m4 1999/12/06 04:44:07 1.8 +++ config.m4 1999/12/06 05:01:32 1.9 @@ -6,18 +6,19 @@ STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la" ]) -dnl AC_DEFUN(modulename, modulestructname, defaultonoroff) +dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros) dnl XXX - Need to add help text to --enable-module flags -dnl XXX - Need to add support for per-module config +dnl XXX - Need to allow --enable-module to fail if optional config fails AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [ AC_MSG_CHECKING([whether to enable mod_$1]) AC_ARG_ENABLE(patsubst([$1], _, -), [ --enable-]patsubst([$1], _, -), [], [enable_$1=]ifelse([$3], , no, [$3])) + AC_MSG_RESULT([$enable_$1]) if test "$enable_[$1]" != "no" ; then + ifelse([$4], , :, [$4]) MODLIST="$MODLIST ifelse([$2], , [$1], [$2])" STANDARD_MODULE([$1]) fi - AC_MSG_RESULT([$enable_$1]) ]) APACHE_CHECK_STANDARD_MODULE(mmap_static, , no) @@ -49,9 +50,10 @@ APACHE_CHECK_STANDARD_MODULE(expires, , no) APACHE_CHECK_STANDARD_MODULE(headers, , no) -AC_CHECK_HEADERS(sys/times.h) -AC_CHECK_FUNCS(times) -APACHE_CHECK_STANDARD_MODULE(usertrack, , no) +APACHE_CHECK_STANDARD_MODULE(usertrack, , no, [ + AC_CHECK_HEADERS(sys/times.h) + AC_CHECK_FUNCS(times) +]) APACHE_CHECK_STANDARD_MODULE(unique_id, , no) APACHE_CHECK_STANDARD_MODULE(so, , no)