SOURCES: apache-mod_mono-apu-config.patch - updated for 1.2.4

[qboosh]

Author: qboosh                       Date: Wed May 16 18:27:06 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.2.4

---- Files affected:
SOURCES:
   apache-mod_mono-apu-config.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/apache-mod_mono-apu-config.patch
diff -u SOURCES/apache-mod_mono-apu-config.patch:1.3 SOURCES/apache-mod_mono-apu-config.patch:1.4
--- SOURCES/apache-mod_mono-apu-config.patch:1.3	Sat Feb 17 18:03:30 2007
+++ SOURCES/apache-mod_mono-apu-config.patch	Wed May 16 20:27:01 2007
@@ -1,5 +1,5 @@
---- mod_mono-1.2.1/configure.in.orig	2006-11-21 23:24:50.000000000 +0100
-+++ mod_mono-1.2.1/configure.in	2007-02-17 17:55:31.519007163 +0100
+--- mod_mono-1.2.4/configure.in.orig	2007-04-20 06:15:26.000000000 +0200
++++ mod_mono-1.2.4/configure.in	2007-05-16 20:21:28.673112778 +0200
 @@ -82,6 +82,28 @@
    fi
  ],)
@@ -29,71 +29,19 @@
  if test -z "$APXS"; then
    for mydir in /usr/local/apache2/sbin	\
    		/usr/local/apache2/bin	\
-@@ -169,6 +191,48 @@
-   AC_PATH_PROG(APRCONFIG, apr-config)
- fi
+@@ -172,6 +194,7 @@
+ # apu-config - libapr-util can have different prefixes than libapr, check from apu-1-config to make sure
+ #  (suse 10.1 is an example of this)
  
 +if test -z "$APUCONFIG"; 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 apu-1-config in $mydir)
-+  	A1="$mydir/apu-1-config"
-+  	if test -x "$A1" ; then
-+		APUCONFIG="$A1"
-+		AC_MSG_RESULT(found.)
-+		break
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+
-+	AC_MSG_CHECKING(for apu-config in $mydir)
-+	A2="$mydir/apu-config"
-+  	if test -x "$A2" ; then
-+		APUCONFIG="$A2"
-+		AC_MSG_RESULT(found.)
-+		break
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+
-+  done
-+fi
-+
-+# last resort 1
-+if test -z "$APUCONFIG"; then
-+  AC_PATH_PROG(APUCONFIG, apu-1-config)
-+fi
-+
-+# last resort 2
-+if test -z "$APUCONFIG"; then
-+  AC_PATH_PROG(APUCONFIG, apu-config)
-+fi
-+
- APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
- APXS_SYSCONFDIR=`${APXS} -q SYSCONFDIR`
- AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`"
-@@ -183,6 +247,10 @@
- 	CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
- 	CPPFLAGS="$CFLAGS $CPPFLAGS `$APRCONFIG --includes --cflags --cppflags`"
- fi
-+if test -x "$APUCONFIG" ; then
-+	CFLAGS="$CFLAGS `$APUCONFIG --includes`"
-+	CPPFLAGS="$CFLAGS $CPPFLAGS `$APUCONFIG --includes`"
+ for mydir in `dirname ${APXS}` \
+ 		/usr/local/apache2/sbin	\
+   		/usr/local/apache2/bin	\
+@@ -200,6 +223,7 @@
+ 		AC_MSG_RESULT(no)
+ 	fi
+ done
 +fi
- AC_MSG_CHECKING([Apache version])
- AC_TRY_COMPILE([
- 	#include <ap_release.h>
-@@ -354,6 +422,7 @@
- echo "   * apxs = $APXS"
- test ! "$APACHE_VER" = "1.3" -a -x "$APRCONFIG" && \
- echo "   * apr-config = $APRCONFIG"
-+echo "   * apu-config = $APUCONFIG"
- echo "   * Verbose logging (debug) = $enable_debug"
- echo "   * mono prefix = $MONO_PREFIX"
- echo "   * Default MonoApplicationsConfigDir = $DFLT_MONO_CONFIG_DIR"
+ 
+ # last resort 1
+ if test -z "$APUCONFIG"; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-mod_mono-apu-config.patch?r1=1.3&r2=1.4&f=u