[Modcplusplus-devel] (johnksterling) mod_cplusplus autogen.shconfigure.in

[Mod C. C. L. <mod...@so...>]

Mod Cplusplus CVS committal

Author  : johnksterling
Module  : mod_cplusplus
Dir     : mod_cplusplus



Modified Files:
	autogen.sh configure.in 


Log Message:
start working to a more flexible build system that picks up files on different types of systems
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- autogen.sh	9 May 2001 04:26:07 -0000	1.1.1.1
+++ autogen.sh	7 May 2004 23:26:24 -0000	1.2
@@ -8,7 +8,13 @@
 PROJECT=mod_cplusplus
 TEST_TYPE=-f
 FILE=src/mod_cplusplus.c
-
+LIBTOOLIZE=libtoolize
+LIBTOOLIZE_EXISTS=`which $LIBTOOLIZE`
+if test -f "$LIBTOOLIZE_EXISTS" ; then
+	LIBTOOLIZE=libtoolize
+else
+	LIBTOOLIZE=glibtoolize
+fi
 DIE=0
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
@@ -47,7 +53,7 @@
 aclocal
 
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-libtoolize --force --copy
+$LIBTOOLIZE --force --copy
 automake -a $am_opt
 autoconf
 cd $ORIGDIR
@@ -55,4 +61,4 @@
 $srcdir/configure "$@"
 
 echo 
-echo "Now type 'gmake' to compile $PROJECT."
+echo "Now type 'make' to compile $PROJECT."
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in	20 Aug 2003 01:36:54 -0000	1.16
+++ configure.in	7 May 2004 23:26:24 -0000	1.17
@@ -25,15 +25,24 @@
 		CPPFLAGS="$CPPFLAGS -DAP_HAVE_DESIGNATED_INITIALIZER"
 	fi
 
-
+        AC_MSG_CHECKING(for standard packaging)
 	searchfile="$withval/include/httpd.h"
 	if test -f $searchfile ; then
 		HTTPD_DIR=`cd $withval; pwd`
 		CPPFLAGS="$CPPFLAGS -I$HTTPD_DIR/include"
 	else
-		AC_MSG_ERROR($searchfile not found)
+		AC_MSG_RESULT($searchfile not found)
 	fi
-        AC_MSG_RESULT(found $HTTPD_DIR)
+       AC_MSG_CHECKING(for alternative default packaging)
+       searchfile="$withval/include/apache2/httpd.h"
+        if test -f $searchfile ; then
+                HTTPD_DIR=`cd $withval; pwd`
+                CPPFLAGS="$CPPFLAGS -I$HTTPD_DIR/include/apache2"
+        else
+                AC_MSG_RESULT($searchfile not found)
+        fi
+
+AC_MSG_RESULT(found $HTTPD_DIR)
 ],[
 	AC_MSG_ERROR(--with-httpd not given)
 ])