You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2006/03/09 10:49:38 UTC
svn commit: r384476 - in /webservices/axis2/trunk/c: build.sh configure.ac
modules/core/transport/Makefile.am modules/core/transport/http/Makefile.am
modules/core/transport/http/server/apache2/Makefile.am
Author: damitha
Date: Thu Mar 9 01:49:31 2006
New Revision: 384476
URL: http://svn.apache.org/viewcvs?rev=384476&view=rev
Log:
Added with-apache2=PATH configure option
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/core/transport/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/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=384476&r1=384475&r2=384476&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Thu Mar 9 01:49:31 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
+./configure --prefix=${AXIS2C_HOME} --enable-tests=yes --enable-samples=yes --enable-trace=yes --with-apache2=/usr/local/apache2
make
make install
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/configure.ac?rev=384476&r1=384475&r2=384476&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Thu Mar 9 01:49:31 2006
@@ -42,6 +42,31 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+AC_MSG_CHECKING(whether to use apache2 as server transport)
+AC_ARG_WITH(apache2,
+[ --with-apache2[=PATH] use apache2 as server transport.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ APACHE2BUILD=""
+ ;;
+ *)
+ 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"
+ 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"
+ else
+ AC_MSG_ERROR(could not find apache2. stop)
+ fi
+ APACHE2BUILD="apache2"
+ ;;
+ 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
@@ -144,6 +169,9 @@
PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
+APACHE2INC=$apache2inc
+
+AC_SUBST(APACHE2INC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_DIR)
@@ -151,6 +179,7 @@
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
+AC_SUBST(APACHE2BUILD)
AC_CONFIG_FILES([Makefile \
modules/Makefile \
@@ -165,6 +194,7 @@
modules/core/transport/http/sender/Makefile \
modules/core/transport/http/receiver/Makefile \
modules/core/transport/http/server/simple_axis2_server/Makefile \
+ modules/core/transport/http/server/Makefile \
modules/core/transport/http/server/apache2/Makefile \
modules/core/deployment/Makefile \
modules/core/clientapi/Makefile \
Modified: webservices/axis2/trunk/c/modules/core/transport/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/Makefile.am?rev=384476&r1=384475&r2=384476&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/Makefile.am Thu Mar 9 01:49:31 2006
@@ -1 +1,2 @@
+SUBDIRS=http
noinst_HEADERS = axis2_transport_receiver.h
Modified: webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am?rev=384476&r1=384475&r2=384476&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/Makefile.am Thu Mar 9 01:49:31 2006
@@ -1,4 +1,5 @@
TESTS =
+SUBDIRS = server
noinst_LTLIBRARIES = libaxis2_http.la
libaxis2_http_la_SOURCES = \
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=384476&r1=384475&r2=384476&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 01:49:31 2006
@@ -42,4 +42,4 @@
-I$(top_builddir)/modules/core/deployment \
-I$(top_builddir)/modules/platforms\
-I/usr/include/apr-0\
- -I/usr/include/apache2
+ @APACHE2INC@