Author: jfrederic.clere(a)jboss.com Date: 2009-02-19 12:30:33 -0500 (Thu, 19 Feb 2009) New Revision: 2305 Modified: trunk/mod_cluster/native/mod_proxy/Makefile.in trunk/mod_cluster/native/mod_proxy/configure.in Log: Use apxs. Modified: trunk/mod_cluster/native/mod_proxy/Makefile.in =================================================================== --- trunk/mod_cluster/native/mod_proxy/Makefile.in 2009-02-19 17:26:28 UTC (rev 2304) +++ trunk/mod_cluster/native/mod_proxy/Makefile.in 2009-02-19 17:30:33 UTC (rev 2305) @@ -1,7 +1,7 @@ # Makefile.in for mod_proxy_cluster # copy the source in the httpd Apache source tree APACHE_BASE = @APACHE_BASE@ -top_builddir = @APACHE_BASE@ +top_builddir = @APACHE_BUILDDIR@ # For .deps. builddir = @CLUSTER_BASE@ # For the apache includes @@ -14,17 +14,17 @@ proxy_ajp_objs=mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo proxy_ajp_objs_slo=mod_proxy_ajp.slo ajp_header.slo ajp_link.slo ajp_msg.slo ajp_utils.slo -include $(APACHE_BASE)/build/rules.mk +include $(top_builddir)/build/rules.mk SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@ all: mod_proxy.so mod_proxy_http.so mod_proxy_ajp.so mod_proxy.so: mod_proxy.la - $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy.la `pwd` + $(top_builddir)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy.la `pwd` mod_proxy_http.so: mod_proxy_http.la - $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_http.la `pwd` + $(top_builddir)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_http.la `pwd` mod_proxy_ajp.so: mod_proxy_ajp.la - $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_ajp.la `pwd` + $(top_builddir)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_ajp.la `pwd` mod_proxy.la: $(proxy_objs_slo) $(SH_LINK) -rpath $(libexecdir) -module -avoid-version $(proxy_objs) Modified: trunk/mod_cluster/native/mod_proxy/configure.in =================================================================== --- trunk/mod_cluster/native/mod_proxy/configure.in 2009-02-19 17:26:28 UTC (rev 2304) +++ trunk/mod_cluster/native/mod_proxy/configure.in 2009-02-19 17:30:33 UTC (rev 2305) @@ -4,21 +4,30 @@ AC_INIT(mod_proxy.c) AC_MSG_CHECKING(for Apache httpd installation) -AC_ARG_WITH(apache, -[ --with-apache[=DIR] DIR is the apache base installation +AC_ARG_WITH(apxs, +[ --with-apxs[=FILE] Build shared Apache module using apxs. + FILE is the apache apxs tool ], -[ if test "$withval" = "yes"; then - withval=/usr/local/etc/httpd - fi +[ apxs_support=true if test "$withval" != "no"; then - APACHE_BASE=$withval + APXS=$withval + AC_MSG_RESULT([APXS is ${APXS}]) + ${APXS} -q PREFIX >/dev/null 2>/dev/null || apxs_support=false else - AC_MSG_ERROR(mod_proxy need a valid apache location) + apxs_support=false fi + AC_MSG_RESULT([apxs_support is ${apxs_support}]) + if test "${apxs_support}" = "false" ; then + AC_MSG_ERROR(mod_cluster module need a valid apxs) + fi + APACHE_BASE=`$APXS -q PREFIX` + APACHE_BUILDDIR=`$APXS -q installbuilddir` + APACHE_BUILDDIR=`(cd $APACHE_BUILDDIR/..; pwd)` ], -[ AC_MSG_ERROR(Please use --with-apache[=DIR])]) +[ AC_MSG_ERROR(Please use --with-apxs[=FILE])]) CLUSTER_BASE=`pwd` AC_SUBST(APACHE_BASE) AC_SUBST(CLUSTER_BASE) +AC_SUBST(APACHE_BUILDDIR) AC_OUTPUT(Makefile)