|
From: Mod C. C. L. <mod...@so...> - 2004-05-18 02:36:47
|
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++")
|
|
From: Mod C. C. L. <mod...@so...> - 2004-11-26 18:39:41
|
Mod Cplusplus CVS committal
Author : johnksterling
Module : mod_cplusplus
Dir : mod_cplusplus
Modified Files:
Makefile.am configure.in
Log Message:
support apxs - this will definitely work right now if all include files are declared byapxs. Im not sure if there are installations where apr.h is not put in INCLUDEDIR - if there are systems like that I would have to make more changes.
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 27 Aug 2004 02:58:08 -0000 1.8
+++ Makefile.am 26 Nov 2004 18:39:26 -0000 1.9
@@ -6,8 +6,8 @@
install:
@echo ...installing module.......
- cp src/.libs/libmod_cplusplus.@SHLIB_EXT@ @HTTPD_DIR@/modules
+ cp src/.libs/libmod_cplusplus.@SHLIB_EXT@ @MODULES_DIR@
@echo ...checking config file......
- if ! grep cplusplus @HTTPD_DIR@/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
+ 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
@echo ...install complete...
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- configure.in 18 May 2004 02:36:39 -0000 1.19
+++ configure.in 26 Nov 2004 18:39:26 -0000 1.20
@@ -69,13 +69,37 @@
fi
fi
],)
+ AC_MSG_RESULT(found $HTTPD_DIR)
+],)
+AC_MSG_CHECKING(for apxs)
+AC_ARG_WITH(apxs, [ --with-apxs Specify path to apxs ],
+[
+ if test -f $withval; then
+ inc=`$withval -q INCLUDEDIR`
+ HTTPD_DIR=`$withval -q PREFIX`
+ CONF_DIR=`$withval -q SYSCONFDIR`
+ MODULES_DIR=`$withval -q LIBEXECDIR`
+ APXS=$withval
+ CPPFLAGS="$CPPFLAGS -I$inc"
+ AC_MSG_RESULT(found $withval)
+ else
+ AC_MSG_RESULT($withval not found)
+ withval="$withval/apxs"
+ if test -f $withval ; then
+ AC_MSG_RESULT(found $withval)
+ HTTPD_DIR=`$withval -q PREFIX`
+ CONF_DIR=`$withval -q SYSCONFDIR`
+ MODULES_DIR=`$withval -q LIBEXECDIR`
+ APXS=$withval
+ inc=`$withval -q INCLUDEDIR`
+ CPPFLAGS="$CPPFLAGS -I$inc"
+ else
+ AC_MSG_ERROR($withval not found. APXS installation cannot be located!)
+ fi
+ fi
+],)
-AC_MSG_RESULT(found $HTTPD_DIR)
-],[
- AC_MSG_ERROR(--with-httpd not given and couldn't find a default distrobution)
-])
-
AC_CHECK_LIB(stdc++, __gxx_personality_v0, LIB_STDCPP="-lstdc++")
if test "$LIB_STDCPP" == "" ; then
CPPFLAGS="$CPPFLAGS -DNO_STDCPP"
@@ -84,7 +108,9 @@
CPPFLAGS="$CPPFLAGS -g -I$CPLUSPLUS_BUILDDIR/include"
AC_SUBST(CPLUSPLUS_BUILDDIR)
-AC_SUBST(HTTPD_DIR)
+AC_SUBST(MODULES_DIR)
+AC_SUBST(CONF_DIR)
+AC_SUBST(APXS)
AC_SUBST(CFLAGS)
AC_SUBST(LIB_STDCPP)
|
|
From: Mod C. C. L. <mod...@so...> - 2005-03-26 13:24:36
|
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
|
