[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:
use the cflags et.al. from apxs - also add some beginning support for rpmifying
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am	27 Feb 2005 22:36:10 -0000	1.10
+++ Makefile.am	26 Mar 2005 13:24:26 -0000	1.11
@@ -6,8 +6,8 @@
 
 install:
 	@echo ...installing module.......
-	cp src/.libs/libmod_cplusplus@SHLIB_EXT@ @MODULES_DIR@
+	cp src/.libs/libmod_cplusplus@SHLIB_EXT@ $(DESTDIR)@MODULES_DIR@
 	@echo ...checking config file......
-	if ! grep cplusplus @CONF_DIR@/httpd.conf; then echo ...updating config file....;echo 'LoadModule cplusplus_module @MODULES_DIR@/libmod_cplusplus@SHLIB_EXT@' >> @CONF_DIR@/httpd.conf ; else echo ***config file already contains modcplusplus***; fi
+	if ! grep cplusplus $(DESTDIR)@CONF_DIR@/httpd.conf; then echo ...updating config file....;echo 'LoadModule cplusplus_module @MODULES_DIR@/libmod_cplusplus@SHLIB_EXT@' >> $(DESTDIR)@CONF_DIR@/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.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- configure.in	26 Mar 2005 13:14:02 -0000	1.25
+++ configure.in	26 Mar 2005 13:24:26 -0000	1.26
@@ -23,12 +23,16 @@
                 apache_inc=`$withval -q INCLUDEDIR`
                 apr_inc=`$withval -q APR_INCLUDEDIR`
                 apu_inc=`$withval -q APU_INCLUDEDIR`
+				cflags=`$withval -q CFLAGS`
+				cxxflags=`$withval -q CXXFLAGS`
+				extra_cppflags=`$withval -q EXTRA_CPPFLAGS`
+				extra_cflags=`$withval -q EXTRA_CFLAGS`
 		INCLUDES="-I$apache_inc -I$apr_inc -I$apu_inc"
 		HTTPD_DIR=`$withval -q PREFIX`
 		CONF_DIR=`$withval -q SYSCONFDIR`
 		MODULES_DIR=`$withval -q LIBEXECDIR`
 		APXS=$withval
-               CPPFLAGS="$CPPFLAGS $INCLUDES"
+               CPPFLAGS="$CPPFLAGS $INCLUDES $cflags $cxxflags $extra_cppflags $extra_cflags"
                AC_MSG_RESULT(found $withval)
         else
                 AC_MSG_RESULT($withval not found)
@@ -38,12 +42,16 @@
                 	apache_inc=`$withval -q INCLUDEDIR`
                 	apr_inc=`$withval -q APR_INCLUDEDIR` 
                 	apu_inc=`$withval -q APU_INCLUDEDIR`
+					cflags=`$withval -q CFLAGS`
+					cxxflags=`$withval -q CXXFLAGS`
+					extra_cppflags=`$withval -q EXTRA_CPPFLAGS`
+					extra_cflags=`$withval -q EXTRA_CFLAGS`
                 	INCLUDES="-I$apache_inc -I$apr_inc -I$apu_inc"
 			HTTPD_DIR=`$withval -q PREFIX`
                 	CONF_DIR=`$withval -q SYSCONFDIR`
                 	MODULES_DIR=`$withval -q LIBEXECDIR`
                 	APXS=$withval
-                        CPPFLAGS="$CPPFLAGS $INCLUDES"
+               		CPPFLAGS="$CPPFLAGS $INCLUDES $cflags $cxxflags $extra_cppflags $extra_cflags"
                 else
                         AC_MSG_ERROR($withval not found. APXS installation cannot be located!)
                 fi