Use three-argument form of AC_DEFINE everywhere; remove acconfig.h

and the warning message from autoconf 2.5x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100540 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 20336ef..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Define this if struct tm has a field tm_gmtoff */
-#undef HAVE_GMTOFF
-
-/* Define this if we are building with OpenSSL */
-#undef HAVE_OPENSSL
-
-/* Define this if we are building with SSL-C */
-#undef HAVE_SSLC

diff --git a/acinclude.m4 b/acinclude.m4
index 8bf220e93adc1ca209b85747f9d8945a0e2b5013..5de3ddf417740ce1ea72dbb82749feb58b99fd74 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -445,9 +445,9 @@ if test "x$ap_ssltk_configured" = "x"; then
   dnl Adjust apache's configuration based on what we found above.
   dnl (a) define preprocessor symbols
   if test "$ap_ssltk_type" = "openssl"; then
-    AC_DEFINE(HAVE_OPENSSL)
+    AC_DEFINE(HAVE_OPENSSL, 1, [Define if SSL is supported using OpenSSL])
   else
-    AC_DEFINE(HAVE_SSLC)
+    AC_DEFINE(HAVE_SSLC, 1, [Define if SSL is supported using SSL-C])
   fi
   dnl (b) hook up include paths
   if test "x$ap_ssltk_inc" != "x"; then

diff --git a/configure.in b/configure.in
index 6a5030556fb8ba44974de5a30d1b7b921c406bf5..4bc70ac71e389a66e3f41c4e5a30684020a6788f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -313,7 +313,7 @@ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 #include <time.h>], [struct tm tm; tm.tm_gmtoff;],
   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, 1, [Define if struct tm has a tm_gmtoff field])
 fi
 
 dnl ## Set up any appropriate OS-specific environment variables for apachectl