projects
/
manu
/
suphp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use CFLAGS instead of CPPFLAGS and append to existing values
[manu/suphp.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
dbb9f9f
..
86b104a
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,12
+1,12
@@
# Process this file with autoconf to produce a configure script.
# Initialize
# Process this file with autoconf to produce a configure script.
# Initialize
-AC_INIT([suPHP], [0.
6
.1], [sebastian.marsching@suphp.org], [suphp])
+AC_INIT([suPHP], [0.
7
.1], [sebastian.marsching@suphp.org], [suphp])
# Auxiliary tools
AC_CONFIG_AUX_DIR([config])
# Auxiliary tools
AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE([suPHP], [0.
6.0-pre
1])
+AM_INIT_AUTOMAKE([suPHP], [0.
7.
1])
# Check for right directory
AC_CONFIG_SRCDIR([src/Application.cpp])
# Config headers for automake
# Check for right directory
AC_CONFIG_SRCDIR([src/Application.cpp])
# Config headers for automake
@@
-66,7
+66,7
@@
if test -n "$APXS"; then
| cut -f2 -d"/" \
| cut -f1 -d" "`
major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
| cut -f2 -d"/" \
| cut -f1 -d" "`
major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
- if test "$major_version" = "2.0"; then
+ if test "$major_version" = "2.0"
-o "$major_version" = "2.2"
; then
APACHE_VERSION_2=true
APACHE_VERSION_1_3=false
else
APACHE_VERSION_2=true
APACHE_VERSION_1_3=false
else
@@
-101,6
+101,8
@@
dnl For Apache 2.x APR is needed
if test x"${apr_found}" = xyes ; then \
APR_INCLUDEDIR=`${apr_config} --includedir`
AC_SUBST([APR_INCLUDEDIR])
if test x"${apr_found}" = xyes ; then \
APR_INCLUDEDIR=`${apr_config} --includedir`
AC_SUBST([APR_INCLUDEDIR])
+ APR_CPPFLAGS=`${apr_config} --cppflags`
+ AC_SUBST([APR_CPPFLAGS])
else
AC_MSG_ERROR([APR is needed to build mod_suphp for Apache 2.x but was not found])
fi
else
AC_MSG_ERROR([APR is needed to build mod_suphp for Apache 2.x but was not found])
fi