[Modcplusplus-devel] (johnksterling) mod_cplusplus Makefile.amconfigure.in

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

Mod Cplusplus CVS committal

Author  : johnksterling
Module  : mod_cplusplus
Dir     : mod_cplusplus



Modified Files:
	Makefile.am configure.in 


Log Message:
more tweaks to the build scripts - all fixes in patch or concept submitted by William F. Dowling <wil...@th...>
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am	27 Sep 2003 15:13:42 -0000	1.6
+++ Makefile.am	18 May 2004 02:36:39 -0000	1.7
@@ -6,8 +6,8 @@
 
 install:
 	@echo ***installing module.......***
-	cp src/.libs/libmod_cplusplus.so @HTTPD_DIR@/modules
+	cp src/.libs/libmod_cplusplus.@SHLIB_EXT@ @HTTPD_DIR@/modules
 	@echo ***checking config file......***
-	if ! grep cplusplus /home/www/apache-2.0/conf/httpd.conf; then echo ***updating config file....***;@echo 'LoadModule cplusplus_module @HTTPD_DIR@/modules/libmod_cplusplus.so' >> @HTTPD_DIR@/conf/httpd.conf ; else echo ***config file already contains modcplusplus***; fi
+	if ! grep cplusplus /home/www/apache-2.0/conf/httpd.conf; then echo ***updating config file....***;@echo 'LoadModule cplusplus_module @HTTPD_DIR@/modules/libmod_cplusplus.@SHLIB_EXT@' >> @HTTPD_DIR@/conf/httpd.conf ; else echo ***config file already contains modcplusplus***; fi
 	@echo ***install complete***
 
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- configure.in	12 May 2004 01:34:23 -0000	1.18
+++ configure.in	18 May 2004 02:36:39 -0000	1.19
@@ -29,34 +29,51 @@
         AC_MSG_CHECKING(for standard packaging)
 	searchfile="$withval/include/httpd.h"
 	if test -f $searchfile ; then
+                AC_MSG_RESULT(found $searchfile)
 		HTTPD_DIR=`cd $withval; pwd`
 		CPPFLAGS="$CPPFLAGS -I$HTTPD_DIR/include"
 	else
 		AC_MSG_RESULT($searchfile not found)
-	fi
-        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)
+                AC_MSG_CHECKING(for alternative default packaging)
+                searchfile="$withval/include/apache2/httpd.h"
+                if test -f $searchfile ; then
+                        AC_MSG_RESULT(found $searchfile)
+                        HTTPD_DIR="$withval"
+                        CPPFLAGS="$CPPFLAGS -I$withval/include/apache2"
+                else
+                        AC_MSG_RESULT($searchfile not found)
+                        searchfile="/usr/include/apache2/httpd.h"
+                        if test -f $searchfile ; then
+                                AC_MSG_RESULT(found $searchfile)
+                                HTTPD_DIR="/usr"
+                                CPPFLAGS="$CPPFLAGS -I/usr/include/apache2"
+                        else
+                                AC_MSG_ERROR($searchfile not found. Apache2 installation cannot be located!)
+                        fi
+                fi
         fi
         AC_MSG_CHECKING(for apr.h)
         AC_ARG_WITH(apr_path,   [  --with-apr_path         Specify path to apr include directory ],
         [
-        if test ! -f $withval/apr.h; then
-               AC_MSG_ERROR($withval not a valid path to apr.h)
-        else
+        if test -f $withval/apr.h; then
                CPPFLAGS="$CPPFLAGS -I$withval"
                AC_MSG_RESULT(found $withval/apr.h)
+        else
+                AC_MSG_RESULT($withval not found)
+                withval="/usr/include/apr-0/apr.h"
+                if test -f $withval ; then
+                        AC_MSG_RESULT(found $withval)
+                        CPPFLAGS="$CPPFLAGS -I/usr/include/apr-0"
+                else
+                        AC_MSG_ERROR($withval not found. APR installation cannot be located!)
+                fi
         fi
         ],)
 
 
 AC_MSG_RESULT(found $HTTPD_DIR)
 ],[
-	AC_MSG_ERROR(--with-httpd not given)
+	AC_MSG_ERROR(--with-httpd not given and couldn't find a default distrobution)
 ])
 
 AC_CHECK_LIB(stdc++, __gxx_personality_v0, LIB_STDCPP="-lstdc++")