Patch from Jeroen van Meeuwen (Fedora Project) <kanarip@fedoraproject.org> to use...
authordbs <dbs@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 20 Nov 2009 15:45:49 +0000 (15:45 +0000)
committerdbs <dbs@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 20 Nov 2009 15:45:49 +0000 (15:45 +0000)
Attached patch makes the auto foo respect the --with-apxs ./configure option for src/gateway/Makefile.am.

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_2@1859 9efc2488-bf62-4759-914b-345cdb29e865

src/gateway/Makefile.am

index 3fba17c..2446501 100644 (file)
@@ -18,9 +18,9 @@ AM_CFLAGS = -D_LARGEFILE64_SOURCE -Wall -I@abs_top_srcdir@/include/ -I$(LIBXML2_
 AM_LDFLAGS = -L$(LIBDIR) -L@top_builddir@/src/libopensrf
 
 install-exec-local: 
-       if [ ! "$$(grep mod_placeholder `apxs2 -q SYSCONFDIR`/httpd.conf)" ]; \
+       if [ ! "$$(grep mod_placeholder `$(APXS2) -q SYSCONFDIR`/httpd.conf)" ]; \
                then echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-               >> `apxs2 -q SYSCONFDIR`/httpd.conf; \
+               >> `$(APXS2) -q SYSCONFDIR`/httpd.conf; \
        fi
        $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_json_gateway.c apachetools.c apachetools.h libopensrf.so
        $(APXS2) -c $(DEF_LDLIBS) $(AM_CFLAGS) $(AM_LDFLAGS) @srcdir@/osrf_http_translator.c apachetools.c apachetools.h libopensrf.so