manoj 99/12/19 19:09:51
Modified: src acconfig.h.in acinclude.m4 configure.in
src/main config.m4
src/modules/mpm config.m4
src/regex config.m4
Removed: src/main config.h.stub
src/modules/mpm config.h.stub
src/regex config.h.stub
Log:
Eliminate the .h.stub files; AC_DEFINE can generate the necessary
#defines in the config header for us.
Revision Changes Path
1.4 +0 -5 apache-2.0/src/acconfig.h.in
Index: acconfig.h.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/acconfig.h.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- acconfig.h.in 1999/12/01 01:16:00 1.3
+++ acconfig.h.in 1999/12/20 03:09:43 1.4
@@ -1,8 +1,3 @@
/* symbols defined by autoconf's configure script that aren't taken care
* of by autoheader */
-/* Define if EAGAIN is present on this system */
-#undef HAVE_EAGAIN
-
-/* Define if arguments to select() aren't what we expect */
-#undef SELECT_NEEDS_CAST
1.7 +4 -2 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -u -r1.6 -r1.7
--- acinclude.m4 1999/12/09 01:13:08 1.6
+++ acinclude.m4 1999/12/20 03:09:43 1.7
@@ -58,7 +58,8 @@
#endif
], ac_cv_define_$1=yes, ac_cv_define_$1=no))
if test "$ac_cv_define_$1" = "yes" ; then
- AC_DEFINE(HAVE_$1)
+ AC_DEFINE(HAVE_$1,,
+ [Define if the macro "$1" is defined on this system])
fi
])
@@ -75,7 +76,8 @@
])
])
if test "$ac_ac_type_rlim_t" = "no" ; then
- AC_DEFINE(rlim_t, int)
+ AC_DEFINE(rlim_t, int,
+ [Define to 'int' if <sys/resource.h> doesn't define it for us])
fi
])
1.11 +2 -1 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -u -r1.10 -r1.11
--- configure.in 1999/12/20 01:54:39 1.10
+++ configure.in 1999/12/20 03:09:43 1.11
@@ -100,7 +100,8 @@
-o "$ac_cv_func_select_arg234" != "fd_set *" \
-o "$ac_cv_func_select_arg5" != "struct timeval *" ; then
- AC_DEFINE(SELECT_NEEDS_CAST)
+ AC_DEFINE(SELECT_NEEDS_CAST,,
+ [Define if arguments to select() aren't what we expect])
fi
AM_PROG_LIBTOOL
1.4 +12 -5 apache-2.0/src/main/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/config.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- config.m4 1999/12/10 20:22:07 1.3
+++ config.m4 1999/12/20 03:09:48 1.4
@@ -1,5 +1,7 @@
dnl ## Check for libraries
+AC_DEFUN(APACHE_DEFINE_HAVE_CRYPT, [
+])
AC_CHECK_LIB(nsl, gethostname, [
AC_ADD_LIBRARY(nsl) ], [])
@@ -11,10 +13,14 @@
AC_CHECK_LIB(crypt, crypt, [
AC_ADD_LIBRARY(crypt)
- AC_DEFINE(HAVE_CRYPT)], [])
-
-AC_CHECK_LIB(c, crypt, [
- AC_DEFINE(HAVE_CRYPT)], [])
+ apache_have_crypt=1
+], [
+ AC_CHECK_LIB(c, crypt, [
+ apache_have_crypt=1], [])
+])
+if test "$apache_have_crypt" = "1" ; then
+ AC_DEFINE(HAVE_CRYPT,,[Define if this platform has crypt()])
+fi
dnl ## Check for header files
@@ -37,7 +43,8 @@
ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
- AC_DEFINE(HAVE_GMTOFF)
+ AC_DEFINE(HAVE_GMTOFF,,
+ [Define if struct tm has a tm_gmtoff member])
fi
dnl ## Check for library functions
1.4 +6 -3 apache-2.0/src/modules/mpm/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -u -r1.3 -r1.4
--- config.m4 1999/12/05 19:36:42 1.3
+++ config.m4 1999/12/20 03:09:50 1.4
@@ -29,10 +29,12 @@
AC_MSG_CHECKING(which shared memory mechanism to use)
if test "$ac_cv_func_shmget" = "yes" ; then
- AC_DEFINE(USE_SHMGET_SCOREBOARD)
+ AC_DEFINE(USE_SHMGET_SCOREBOARD,,
+ [Define if MPMs should use shmget to implement their shared
memory])
AC_MSG_RESULT(shmget)
elif test "$ac_cv_func_mmap" = "yes" ; then
- AC_DEFINE(USE_MMAP_SCOREBOARD)
+ AC_DEFINE(USE_MMAP_SCOREBOARD,,
+ [Define if MPMs should use mmap to implement their shared
memory])
AC_MSG_RESULT(mmap)
else
AC_MSG_ERROR(No known shared memory system)
@@ -55,5 +57,6 @@
])
dnl User threads libraries need pthread.h included everywhere
- AC_DEFINE(PTHREAD_EVERYWHERE)
+ AC_DEFINE(PTHREAD_EVERYWHERE,,
+ [Define if all code should have #include <pthread.h>])
])
1.3 +1 -1 apache-2.0/src/regex/config.m4
Index: config.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/regex/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- config.m4 1999/12/01 01:16:32 1.2
+++ config.m4 1999/12/20 03:09:51 1.3
@@ -7,7 +7,7 @@
if test $apache_cv_hsregex = yes; then
REGEX_LIB=regex/libregex.la
REGEX_DIR=regex
- AC_DEFINE(USE_HSREGEX)
+ AC_DEFINE(USE_HSREGEX,, [Define this if HS regex will be used])
APACHE_OUTPUT(regex/Makefile)
fi
AC_MSG_RESULT($apache_cv_hsregex)
