[Openprinting-papi-svn] SF.net SVN: openprinting: [165] trunk/papi/acinclude.m4

[<nj...@us...>]

Revision: 165
Author:   njacobs
Date:     2006-05-19 22:47:53 -0700 (Fri, 19 May 2006)
ViewCVS:  http://svn.sourceforge.net/openprinting/?rev=165&view=rev

Log Message:
-----------
fix build infrastructure Apache support for Mandriva
contributed by Til...@gm...

Modified Paths:
--------------
    trunk/papi/acinclude.m4
Modified: trunk/papi/acinclude.m4
===================================================================
--- trunk/papi/acinclude.m4	2006-05-13 02:43:49 UTC (rev 164)
+++ trunk/papi/acinclude.m4	2006-05-20 05:47:53 UTC (rev 165)
@@ -37,11 +37,20 @@
 
   if test x$apache_prefix != x; then
     AC_PATH_PROG(APXS, apxs, no, $apache_prefix/sbin $apache_prefix/bin)
+    if test x$APXS != xno; then
+      APACHE_CFLAGS="$APACHE_CFLAGS -I`$APXS -q INCLUDEDIR` -DEAPI"
+    else
+      APACHE_CFLAGS=""
+    fi
+    AC_PATH_PROG(APPR1CONFIG, apr-1-config, no)
+    if test x$APR1CONFIG !- x; then
+      APACHE_CFLAGS="-I`$APR1CONFIG --includedir` $APACHE_CFLAGS"
+      CFLAGS="-I`$APR1CONFIG --includedir` $CFLAGS"
+    fi
   else
-    AC_PATH_PROG(APXS, apxs, no)
+    APACHE_CFLAGS=""
   fi
 
-  APACHE_CFLAGS="$APACHE_CFLAGS -I`$APXS -q INCLUDEDIR` -DEAPI"
   AC_SUBST(APACHE_CFLAGS)
 
   AM_CONDITIONAL(HAVE_APACHE, [ test x$APXS != xno ])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.