Hello community,
here is the log from the commit of package mod_mono
checked in at Thu Aug 3 00:29:05 CEST 2006.
--------
--- mod_mono/mod_mono.changes 2006-04-07 23:17:44.000000000 +0200
+++ mod_mono/mod_mono.changes 2006-08-03 00:01:44.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Aug 1 03:33:28 CEST 2006 - wberrier@suse.de
+
+- Added some patches to build against apache 2.2.2
+- Removed xsp from build deps
+- Update to 1.1.16.1
+- src/mod_mono.c: when using autoapplications, pass all the options that
+ don't have an explicit alias to XXGLOBAL, which is the internal name
+ used for the mod-mono-server instance that will create new applications
+ on demand. Using XXGLOBAL as an identifier is forbidden now.
+- src/mod_mono.c: allow setting MonoDebug when using automatic
+ applications. Before this fix, no mod-mono-server would be started.
+ Fixes bug #78672.
+
+-------------------------------------------------------------------
Old:
----
mod_mono-1.1.13.5.tar.gz
New:
----
mod_mono-1.1.16.1.tar.gz
mod_mono-apache222-63267.patch
mod_mono-cppflags-63272.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mod_mono.spec ++++++
--- /var/tmp/diff_new_pack.79Fnbj/_old 2006-08-03 00:28:35.000000000 +0200
+++ /var/tmp/diff_new_pack.79Fnbj/_new 2006-08-03 00:28:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mod_mono (Version 1.1.13.5)
+# spec file for package mod_mono (Version 1.1.16.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: mod_mono
-BuildRequires: apache2-devel libapr-util1-devel mono-devel pcre-devel xsp
+BuildRequires: apache2-devel libapr-util1-devel mono-devel
URL: http://go-mono.com/
%define prefix /usr
%define gnome_prefix /opt/gnome
@@ -20,10 +20,12 @@
Group: Productivity/Networking/Web/Servers
Autoreqprov: on
Requires: gnome-filesystem xsp
-Version: 1.1.13.5
+Version: 1.1.16.1
Release: 1
Summary: Run ASP.NET Pages on Unix with Apache and Mono
Source: %{name}-%{version}.tar.gz
+Patch0: mod_mono-apache222-63267.patch
+Patch1: mod_mono-cppflags-63272.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -34,12 +36,13 @@
%prep
%setup
+%patch0
+%patch1
%build
# Necessary when building with apr 1.2.x instead of the apr that comes with httpd
export CPPFLAGS="-I/usr/include/apr-1"
autoreconf -fi
-#
./configure --prefix=%{prefix} \
--libdir=%{prefix}/%_lib \
--mandir=%{prefix}/share/man \
@@ -62,6 +65,17 @@
%{prefix}/share/man/man8/mod_mono.8.gz
%changelog -n mod_mono
+* Tue Aug 01 2006 - wberrier@suse.de
+- Added some patches to build against apache 2.2.2
+- Removed xsp from build deps
+- Update to 1.1.16.1
+- src/mod_mono.c: when using autoapplications, pass all the options that
+ don't have an explicit alias to XXGLOBAL, which is the internal name
+ used for the mod-mono-server instance that will create new applications
+ on demand. Using XXGLOBAL as an identifier is forbidden now.
+- src/mod_mono.c: allow setting MonoDebug when using automatic
+ applications. Before this fix, no mod-mono-server would be started.
+ Fixes bug #78672.
* Fri Apr 07 2006 - wberrier@novell.com
- Update to 1.1.13.5, minor bug fix release
-Fix DoS (Critical fix for iFolder)
++++++ mod_mono-1.1.13.5.tar.gz -> mod_mono-1.1.16.1.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.1.13.5/ChangeLog new/mod_mono-1.1.16.1/ChangeLog
--- old/mod_mono-1.1.13.5/ChangeLog 2006-04-07 22:35:35.000000000 +0200
+++ new/mod_mono-1.1.16.1/ChangeLog 2006-07-20 09:49:48.000000000 +0200
@@ -1,3 +1,16 @@
+2006-07-20 Gonzalo Paniagua Javier
+
+ * src/mod_mono.c: when using autoapplications, pass all the options that
+ don't have an explicit alias to XXGLOBAL, which is the internal name
+ used for the mod-mono-server instance that will create new applications
+ on demand. Using XXGLOBAL as an identifier is forbidden now.
+
+2006-07-13 Gonzalo Paniagua Javier
+
+ * src/mod_mono.c: allow setting MonoDebug when using automatic
+ applications. Before this fix, no mod-mono-server would be started.
+ Fixes bug #78672.
+
2006-04-07 Gonzalo Paniagua Javier
* src/mod_mono.c: reuse the memory allocated when mod-mono-server reads
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.1.13.5/configure new/mod_mono-1.1.16.1/configure
--- old/mod_mono-1.1.13.5/configure 2006-04-07 22:35:53.000000000 +0200
+++ new/mod_mono-1.1.16.1/configure 2006-07-20 09:50:00.000000000 +0200
@@ -1817,7 +1817,7 @@
# Define the identity of the package.
PACKAGE=mod_mono
- VERSION=1.1.13.5
+ VERSION=1.1.16.1
cat >>confdefs.h <<_ACEOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.1.13.5/configure.in new/mod_mono-1.1.16.1/configure.in
--- old/mod_mono-1.1.13.5/configure.in 2006-04-07 22:35:35.000000000 +0200
+++ new/mod_mono-1.1.16.1/configure.in 2006-07-20 09:49:48.000000000 +0200
@@ -1,5 +1,5 @@
AC_INIT(src/mod_mono.c)
-AM_INIT_AUTOMAKE(mod_mono, 1.1.13.5)
+AM_INIT_AUTOMAKE(mod_mono, 1.1.16.1)
AM_CONFIG_HEADER(include/mod_mono_config.h:config.in)
AC_PROG_CC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mod_mono-1.1.13.5/src/mod_mono.c new/mod_mono-1.1.16.1/src/mod_mono.c
--- old/mod_mono-1.1.13.5/src/mod_mono.c 2006-04-07 22:35:35.000000000 +0200
+++ new/mod_mono-1.1.16.1/src/mod_mono.c 2006-07-20 09:49:48.000000000 +0200
@@ -6,7 +6,7 @@
* Gonzalo Paniagua Javier
*
* Copyright (c) 2002 Daniel Lopez Ridruejo
- * (c) 2002-2005 Novell, Inc.
+ * (c) 2002-2006 Novell, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -134,6 +134,7 @@
return apr_pstrdup (cmd->pool, "Conflicting values for MonoAutoApplication.");
sconfig->auto_app = FALSE;
+ /* TODO: Copiar de 'XXGLOBAL' a 'default' */
} else if (!strcasecmp (value, "enabled")) {
if (sconfig->auto_app_set && sconfig->auto_app != TRUE)
return apr_pstrdup (cmd->pool, "Conflicting values for MonoAutoApplication.");
@@ -178,7 +179,7 @@
server->listen_address = NULL;
server->max_cpu_time = NULL;
server->max_memory = NULL;
- server->debug = "False";
+ server->debug = NULL;
server->env_vars = NULL;
server->status = FORK_NONE;
server->is_virtual = is_virtual;
@@ -211,20 +212,43 @@
offset = (unsigned long) cmd->info;
DEBUG_PRINT (1, "store_config %lu '%s' '%s'", offset, first, second);
config = ap_get_module_config (cmd->server->module_config, &mono_module);
- if (!config->auto_app_set)
- config->auto_app = FALSE; /* disable autoapp if there's any other application */
-
if (second == NULL) {
+ if (config->auto_app) {
+ idx = search_for_alias ("XXGLOBAL", config);
+ ptr = (char *) &config->servers [idx];
+ ptr += offset;
+ value = first;
+
+ /* MonoApplications/AddMonoApplications are accumulative */
+ if (offset == APR_OFFSETOF (xsp_data, applications))
+ prev_value = *((char **) ptr);
+
+ if (prev_value != NULL) {
+ new_value = apr_pstrcat (cmd->pool, prev_value, ",", value, NULL);
+ } else {
+ new_value = apr_pstrdup (cmd->pool, value);
+ }
+
+ *((char **) ptr) = new_value;
+ return NULL;
+ }
alias = "default";
- if (cmd->server->is_virtual) alias = cmd->server->server_hostname;
+ if (cmd->server->is_virtual)
+ alias = cmd->server->server_hostname;
value = first;
is_default = 1;
} else {
+ if (!strcmp (first, "XXGLOBAL"))
+ return apr_pstrdup (cmd->pool, "XXGLOBAL is a reserved application identifier.");
alias = first;
value = second;
is_default = (!strcmp (alias, "default"));
}
+ /* Disable autoapp if there's any other application. MonoDebug is excluded. */
+ if (!config->auto_app_set)
+ config->auto_app = FALSE;
+
idx = search_for_alias (alias, config);
if (idx == -1)
idx = add_xsp_server (cmd->pool, alias, config, is_default, cmd->server->is_virtual);
@@ -1117,7 +1141,7 @@
memset (argv, 0, sizeof (char *) * MAXARGS);
argi = 0;
argv [argi++] = config->executable_path;
- if (!strcasecmp (config->debug, "True"))
+ if (config->debug && !strcasecmp (config->debug, "True"))
argv [argi++] = "--debug";
argv [argi++] = config->server_path;
@@ -1395,6 +1419,7 @@
idx = search_for_alias (NULL, config);
DEBUG_PRINT (2, "idx = %d", idx);
+
if (idx < 0) {
DEBUG_PRINT (2, "Alias not found. Checking for auto-applications.");
if (config->auto_app)
++++++ mod_mono-apache222-63267.patch ++++++
Index: configure.in
===================================================================
--- configure.in (revision 63266)
+++ configure.in (working copy)
@@ -47,24 +47,20 @@
dnl AC_MSG_RESULT($enable_old_module)
# check for --with-apxs
-AC_MSG_CHECKING(for --with-apxs)
AC_ARG_WITH(apxs, [ --with-apxs=PATH Path to apxs],
[
if test -x "$withval"
then
- AC_MSG_RESULT([$withval executable, good])
APXS=$withval
else
echo
AC_MSG_ERROR([$withval not found or not executable])
fi
-],
-AC_MSG_RESULT(no))
+],)
# check for --with-apr-config
# apr-config - at least in debian apr include directory is different
APR_INCLUDES=""
-AC_MSG_CHECKING(for --with-apr-config)
AC_ARG_WITH(apr-config,
[ --with-apr-config=PATH Path to apr-config (apache 2.0). You may use
this option when apr-config is not in the same
@@ -84,98 +80,109 @@
AC_MSG_ERROR([$withval not found or not executable])
fi
fi
-],
-AC_MSG_RESULT(not specified))
+],)
-# if no apxs found yet, check /usr/local/apache/sbin
-# since it's the default Apache location
if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs2 in /usr/local/apache/sbin)
- if test -x /usr/local/apache/sbin/apxs2; then
- APXS=/usr/local/apache/sbin/apxs2
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
-fi
+ for mydir in /usr/local/apache2/sbin \
+ /usr/local/apache2/bin \
+ /usr/local/apache/sbin \
+ /usr/local/apache/bin \
+ /usr/sbin \
+ /usr/bin
+ do
+ AC_MSG_CHECKING(for apxs2 in $mydir)
+ A1="$mydir/apxs2"
+ if test -x "$A1" ; then
+ APXS="$A1"
+ AC_MSG_RESULT($APXS)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
-if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin)
- if test -x /usr/local/apache/sbin/apxs; then
- APXS=/usr/local/apache/sbin/apxs
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
+ AC_MSG_CHECKING(for apxs in $mydir)
+ A2="$mydir/apxs"
+ if test -x "$A2" ; then
+ APXS="$A2"
+ AC_MSG_RESULT($APXS)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ done
fi
+# last resort 1
if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs2 in /usr/local/apache2/bin)
- if test -x /usr/local/apache/bin/apxs2; then
- APXS=/usr/local/apache/bin/apxs2
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
+ AC_PATH_PROG(APXS, apxs2)
fi
+# last resort 2
if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs in /usr/local/apache2/bin)
- if test -x /usr/local/apache2/bin/apxs; then
- APXS=/usr/local/apache2/bin/apxs
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
+ AC_PATH_PROG(APXS, apxs)
fi
if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs2 in /usr/sbin)
- if test -x /usr/sbin/apxs2; then
- APXS=/usr/sbin/apxs2
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
+ AC_MSG_ERROR([**** apxs was not found, DSO compilation will not be available.])
fi
-if test -z "$APXS"; then
- AC_MSG_CHECKING(for apxs in /usr/sbin)
- if test -x /usr/sbin/apxs; then
- APXS=/usr/sbin/apxs
- AC_MSG_RESULT([found, we'll use this. Use --with-apxs to specify another.])
- else
- AC_MSG_RESULT(no)
- fi
+if test -z "$APRCONFIG"; then
+ for mydir in `dirname ${APXS}` \
+ /usr/local/apache2/sbin \
+ /usr/local/apache2/bin \
+ /usr/local/apache/sbin \
+ /usr/local/apache/bin \
+ /usr/sbin \
+ /usr/bin
+ do
+ AC_MSG_CHECKING(for apr-1-config in $mydir)
+ A1="$mydir/apr-1-config"
+ if test -x "$A1" ; then
+ APRCONFIG="$A1"
+ AC_MSG_RESULT(found.)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ AC_MSG_CHECKING(for apr-config in $mydir)
+ A2="$mydir/apr-config"
+ if test -x "$A2" ; then
+ APRCONFIG="$A2"
+ AC_MSG_RESULT(found.)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ done
fi
-# last resort
-if test -z "$APXS"; then
- AC_PATH_PROG(APXS, apxs2)
-fi
-if test -z "$APXS"; then
- AC_PATH_PROG(APXS, apxs)
+# last resort 1
+if test -z "$APRCONFIG"; then
+ AC_PATH_PROG(APRCONFIG, apr-1-config)
fi
-if test -z "$APXS"; then
- AC_MSG_ERROR([**** apxs was not found, DSO compilation will not be available.])
+# last resort 2
+if test -z "$APRCONFIG"; then
+ AC_PATH_PROG(APRCONFIG, apr-config)
fi
-# determine LIBEXEC
-AC_MSG_CHECKING(for Apache libexec directory)
APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
-AC_MSG_RESULT($APXS_LIBEXECDIR)
-
-AC_MSG_CHECKING(for Apache sysconf directory)
APXS_SYSCONFDIR=`${APXS} -q SYSCONFDIR`
-AC_MSG_RESULT($APXS_SYSCONFDIR)
-# determine INCLUDES
-
-AC_MSG_CHECKING([for Apache include directory])
AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`"
-AC_MSG_RESULT($AP_INCLUDES)
-CFLAGS="$CFLAGS $AP_INCLUDES"
+CFLAGS="$CFLAGS $AP_INCLUDES"
+CFLAGS="$CFLAGS `$APXS -q CFLAGS`"
+CFLAGS="$CFLAGS `$APXS -q EXTRA_CFLAGS`"
+CPPFLAGS="$CPPFLAGS $AP_INCLUDES"
+CPPFLAGS="$CPPFLAGS $CFLAGS `$APXS -q EXTRA_CPPFLAGS`"
+CPPFLAGS="$CPPFLAGS $CFLAGS `$APXS -q CPPFLAGS`"
+if test -x "$APRCONFIG" ; then
+ CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
+ CPPFLAGS="$CFLAGS `$APRCONFIG --includes --cflags --cppflags`"
+fi
AC_MSG_CHECKING([Apache version])
AC_TRY_COMPILE([
#include
@@ -207,9 +214,7 @@
}
], [
APACHE_VER=2.2
- APRCONFIG_NAME=apr-1-config
], [
- APRCONFIG_NAME=apr-config
])
fi
@@ -217,69 +222,8 @@
if test ! "$APACHE_VER" = "1.3" -a ! "$APACHE_VER" = "retry" ; then
AC_MSG_RESULT(${APACHE_VER})
fi
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG" ; then
- A_DIR=`dirname ${APXS}`
- AC_MSG_CHECKING(for ${APRCONFIG_NAME} in ${A_DIR})
- APRCONFIG=`dirname ${APXS}`/${APRCONFIG_NAME}
- if test -x $APRCONFIG ; then
- AC_MSG_RESULT([found. We'll use this. Use --with-apr-config to specify another.])
- else
- AC_MSG_RESULT(no)
- APRCONFIG=""
- fi
-fi
-
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG"; then
- AC_MSG_CHECKING(for ${APRCONFIG_NAME} in /usr/local/apache/sbin)
- if test -x /usr/local/apache/sbin/${APRCONFIG_NAME}; then
- APRCONFIG=/usr/local/apache/sbin/${APRCONFIG_NAME}
- AC_MSG_RESULT([found, we'll use this. Use --with-apr-config to specify another.])
- else
- AC_MSG_RESULT(no)
- APRCONFIG=""
- fi
-fi
-
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG"; then
- AC_MSG_CHECKING(for ${APRCONFIG_NAME} in /usr/local/apache2/bin)
- if test -x /usr/local/apache2/bin/${APRCONFIG_NAME}; then
- APRCONFIG=/usr/local/apache2/bin/${APRCONFIG_NAME}
- AC_MSG_RESULT([found, we'll use this. Use --with-apr-config to specify another.])
- else
- AC_MSG_RESULT(no)
- APRCONFIG=""
- fi
-fi
-
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG"; then
- AC_MSG_CHECKING(for ${APRCONFIG_NAME} in /usr/sbin)
- if test -x /usr/sbin/${APRCONFIG_NAME}; then
- APRCONFIG=/usr/sbin/${APRCONFIG_NAME}
- AC_MSG_RESULT([found, we'll use this. Use --with-apr-config to specify another.])
- else
- AC_MSG_RESULT(no)
- APRCONFIG=""
- fi
-fi
-
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG"; then
- AC_MSG_CHECKING(for ${APRCONFIG_NAME} in /usr/bin)
- if test -x /usr/bin/${APRCONFIG_NAME}; then
- APRCONFIG=/usr/bin/${APRCONFIG_NAME}
- AC_MSG_RESULT([found, we'll use this. Use --with-apr-config to specify another.])
- else
- AC_MSG_RESULT(no)
- APRCONFIG=""
- fi
-fi
-
-if test ! "$APACHE_VER" = "1.3" -a -z "$APRCONFIG"; then
- AC_PATH_PROG(APRCONFIG, ${APRCONFIG_NAME})
-fi
-
# Try apr-config, probably 1.3
if test "$APACHE_VER" = "retry" -a -x "$APRCONFIG"; then
- CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
AC_TRY_COMPILE([
#include
], [
@@ -300,10 +244,6 @@
AC_MSG_RESULT($APACHE_VER)
fi
-if test ! "$APACHE_VER" = "1.3" -a -x "$APRCONFIG"; then
- CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
-fi
-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then
AC_MSG_ERROR([You need to install pkg-config])
@@ -333,7 +273,6 @@
fi
# check for --with-mono-default-config-dir
-AC_MSG_CHECKING(for --with-mono-default-config-dir)
DFLT_MONO_CONFIG_DIR=`$APXS -q SYSCONFDIR`/mod-mono-applications
AC_ARG_WITH(mono-default-config-dir,
[ --with-mono-default-config-dir=PATH Default value for MonoApplicationsConfigDir],
@@ -345,8 +284,7 @@
else
AC_MSG_RESULT([$DFLT_MONO_CONFIG_DIR])
fi
-],
-AC_MSG_RESULT($DFLT_MONO_CONFIG_DIR))
+],)
if test ! "$APACHE_VER" = "1.3" ; then
found_apr_socket_connect=yes
@@ -364,7 +302,6 @@
if test x$MONO_PREFIX = "x" ; then
MONO_PREFIX=$prefix
fi
-AC_MSG_CHECKING([for mono installation prefix])
AC_ARG_WITH(mono-prefix,
[ --with-mono-prefix=PATH The prefix where mono is installed. It's used
to set the default paths for mod-mono-server.exe
@@ -383,13 +320,8 @@
if test "$MONO_PREFIX" = NONE ; then
MONO_PREFIX=$ac_default_prefix
fi
-AC_MSG_RESULT($MONO_PREFIX)
AC_DEFINE_UNQUOTED([MONO_PREFIX],"$MONO_PREFIX",[Mono installation prefix])
-CPPFLAGS="$CPPFLAGS $CFLAGS `$APXS -q EXTRA_CPPFLAGS`"
-CPPFLAGS="$CPPFLAGS $CFLAGS `$APXS -q CPPFLAGS`"
-CFLAGS="$CFLAGS `$APXS -q CFLAGS`"
-CFLAGS="$CFLAGS `$APXS -q EXTRA_CFLAGS`"
AC_CHECK_HEADER(http_protocol.h, \
AC_DEFINE([HAVE_HTTP_PROTOCOL_H],1,\
[Define to 1 if you have the header file.]),,\
@@ -401,6 +333,7 @@
AC_SUBST(APXS)
AC_SUBST(AP_INCLUDES)
AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
AC_SUBST(DFLT_MONO_CONFIG_DIR)
AC_OUTPUT(
++++++ mod_mono-cppflags-63272.patch ++++++
Index: configure.in
===================================================================
--- configure.in (revision 63271)
+++ configure.in (working copy)
@@ -181,7 +181,7 @@
CPPFLAGS="$CPPFLAGS $CFLAGS `$APXS -q CPPFLAGS`"
if test -x "$APRCONFIG" ; then
CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
- CPPFLAGS="$CFLAGS `$APRCONFIG --includes --cflags --cppflags`"
+ CPPFLAGS="$CFLAGS $CPPFLAGS `$APRCONFIG --includes --cflags --cppflags`"
fi
AC_MSG_CHECKING([Apache version])
AC_TRY_COMPILE([
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
