summaryrefslogtreecommitdiff
path: root/sapi/apache/config.m4
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-06-08 06:14:58 +0000
committerSascha Schumann <sas@php.net>2000-06-08 06:14:58 +0000
commite49ad341bd898b31bdb03ae7f032f476297418a1 (patch)
treec0f303487eb6986fd4a11d10ab9dae690b737560 /sapi/apache/config.m4
parentb4e48b952ef8c76f8652f2ca7935a6d852cea306 (diff)
downloadphp-git-e49ad341bd898b31bdb03ae7f032f476297418a1.tar.gz
Wipe out acconfig.h.in and rewrite some checks to use PHP_ARG_ENABLE.
Diffstat (limited to 'sapi/apache/config.m4')
-rw-r--r--sapi/apache/config.m432
1 files changed, 16 insertions, 16 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index e6530b5d3a..8b838f46b4 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -43,8 +43,8 @@ AC_ARG_WITH(apxs,
PHP_APXS_BROKEN=yes
fi
STRONGHOLD=
- AC_DEFINE(HAVE_AP_CONFIG_H)
- AC_DEFINE(HAVE_AP_COMPAT_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
+ AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
@@ -74,7 +74,7 @@ AC_ARG_WITH(apache,
AC_MSG_RESULT(yes - Apache 1.2.x)
STRONGHOLD=
if test -f $withval/src/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
fi
# For Apache 2.0.x
elif test -f $withval/src/include/httpd.h &&
@@ -91,16 +91,16 @@ AC_ARG_WITH(apache,
AC_MSG_RESULT(yes - Apache 2.0.X)
STRONGHOLD=
if test -f $withval/src/include/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
fi
if test -f $withval/src/include/ap_compat.h; then
- AC_DEFINE(HAVE_AP_COMPAT_H)
+ AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
if test ! -f $withval/src/include/ap_config_auto.h; then
AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
fi
else
if test -f $withval/src/include/compat.h; then
- AC_DEFINE(HAVE_OLD_COMPAT_H)
+ AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
fi
fi
# For Apache 1.3.x
@@ -117,16 +117,16 @@ AC_ARG_WITH(apache,
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
if test -f $withval/src/include/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
fi
if test -f $withval/src/include/ap_compat.h; then
- AC_DEFINE(HAVE_AP_COMPAT_H)
+ AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
if test ! -f $withval/src/include/ap_config_auto.h; then
AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
fi
else
if test -f $withval/src/include/compat.h; then
- AC_DEFINE(HAVE_OLD_COMPAT_H)
+ AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
fi
fi
# Also for Apache 1.3.x
@@ -143,16 +143,16 @@ AC_ARG_WITH(apache,
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=
if test -f $withval/src/include/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
fi
if test -f $withval/src/include/ap_compat.h; then
- AC_DEFINE(HAVE_AP_COMPAT_H)
+ AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
if test ! -f $withval/src/include/ap_config_auto.h; then
AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
fi
else
if test -f $withval/src/include/compat.h; then
- AC_DEFINE(HAVE_OLD_COMPAT_H)
+ AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
fi
fi
# For StrongHold 2.2
@@ -165,16 +165,16 @@ AC_ARG_WITH(apache,
STRONGHOLD=-DSTRONGHOLD=1
AC_MSG_RESULT(yes - StrongHold)
if test -f $withval/apache/ap_config.h; then
- AC_DEFINE(HAVE_AP_CONFIG_H)
+ AC_DEFINE(HAVE_AP_CONFIG_H,1,[ ])
fi
if test -f $withval/src/ap_compat.h; then
- AC_DEFINE(HAVE_AP_COMPAT_H)
+ AC_DEFINE(HAVE_AP_COMPAT_H,1,[ ])
if test ! -f $withval/src/include/ap_config_auto.h; then
AC_MSG_ERROR(Please run Apache\'s configure or src/Configure program once and try again)
fi
else
if test -f $withval/src/compat.h; then
- AC_DEFINE(HAVE_OLD_COMPAT_H)
+ AC_DEFINE(HAVE_OLD_COMPAT_H,1,[ ])
fi
fi
else
@@ -208,7 +208,7 @@ AC_ARG_WITH(mod_charset,
[ --with-mod_charset Enable transfer tables for mod_charset (Rus Apache).],
[
AC_MSG_RESULT(yes)
- AC_DEFINE(USE_TRANSFER_TABLES)
+ AC_DEFINE(USE_TRANSFER_TABLES,1,[ ])
],[
AC_MSG_RESULT(no)
])