You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/03/09 11:15:59 UTC
svn commit: r384481 - in /webservices/axis2/trunk/c: build.sh configure.ac
modules/core/Makefile.am modules/core/transport/http/server/Makefile.am
modules/core/transport/http/server/apache2/Makefile.am
Author: damitha
Date: Thu Mar 9 02:15:52 2006
New Revision: 384481
URL: http://svn.apache.org/viewcvs?rev=384481&view=rev
Log:
Now apr include also can be given as a path to configure
Added:
webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/core/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build.sh?rev=384481&r1=384480&r2=384481&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Thu Mar 9 02:15:52 2006
@@ -1,6 +1,6 @@
#!/bin/bash
./autogen.sh
AXIS2C_HOME=`pwd`/deploy
-./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-samples=yes --enable-trace=yes --with-apache2=/usr/local/apache2
+./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-samples=yes --enable-trace=yes --with-apache2=/usr/include/apache2 --with-apr=/usr/include/apr-0
make
make install
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=384481&r1=384480&r2=384481&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Mar 9 02:15:52 2006
@@ -54,10 +54,10 @@
AC_MSG_RESULT(yes)
dnl Find apache2 include dir in the path pointed by APACHE2_HOME env variable
if test -d $withval; then
- apache2inc="-I$withval/include"
+ apache2inc="-I$withval"
dnl else find the apache2 include dir in /usr/local/apache2
- elif test -d '/usr/local/apache2/include'; then
- apache2inc="-I/usr/local/apache2/include"
+ elif test -d '/usr/include/apache2'; then
+ apache2inc="-I/usr/include/apache2"
else
AC_MSG_ERROR(could not find apache2. stop)
fi
@@ -67,6 +67,29 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to use apr. Note that if you build with apache2 you might need to do this.)
+AC_ARG_WITH(apr,
+[ --with-apr[=PATH] use apr.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ dnl Find apr include dir in the path
+ if test -d $withval; then
+ aprinc="-I$withval"
+ dnl else find the apache2 include dir in /usr/local/apache2
+ elif test -d '/usr/include/apr-0'; then
+ aprinc="-I/usr/include/apr-0"
+ else
+ AC_MSG_ERROR(could not find apr. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to build guththila xml parser library)
AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=no],
[ case "${enableval}" in
@@ -170,8 +193,10 @@
CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
APACHE2INC=$apache2inc
+APRINC=$aprinc
AC_SUBST(APACHE2INC)
+AC_SUBST(APRINC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_DIR)
Modified: webservices/axis2/trunk/c/modules/core/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/Makefile.am?rev=384481&r1=384480&r2=384481&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/Makefile.am Thu Mar 9 02:15:52 2006
@@ -1 +1 @@
-SUBDIRS = addr clientapi context deployment description engine phaseresolver receivers transport transport/http transport/http/sender transport/http/receiver transport/http/server/simple_axis2_server util
+SUBDIRS = addr clientapi context deployment description engine phaseresolver receivers transport transport/http/sender transport/http/receiver transport/http/server/simple_axis2_server util
Added: webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am?rev=384481&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am (added)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/Makefile.am Thu Mar 9 02:15:52 2006
@@ -0,0 +1 @@
+SUBDIRS=@APACHE2BUILD@
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am?rev=384481&r1=384480&r2=384481&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am Thu Mar 9 02:15:52 2006
@@ -41,5 +41,5 @@
-I$(top_builddir)/modules/core/engine \
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/platforms\
- -I/usr/include/apr-0\
- @APACHE2INC@
+ @APACHE2INC@ \
+ @APRINC@