remove apxs as an install-method. Fixes #89

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1026 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/Makefile.am b/apache/Makefile.am
index af48afd..2df8b0b 100644 (file)
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -16,12 +16,6 @@ mod_shib_13_la_LIBADD = \
   $(top_builddir)/shib/libshib.la \
   $(top_builddir)/shib-target/libshib-target.la
 
-if DO_APXS_INSTALL
-install-exec-local::
-       $(APXS) -i -n shib_13 .libs/mod_shib_13.so
-       for la in $(modshib13_LTLIBRARIES) ; do rm -f `$(APXS) -q LIBEXECDIR`/$$la ; done
-endif
-
 install-exec-hook:
        for la in $(modshib13_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib13dir)/$$la ; done
 
@@ -37,12 +31,6 @@ mod_shib_20_la_LIBADD = \
   $(top_builddir)/shib/libshib.la \
   $(top_builddir)/shib-target/libshib-target.la
 
-if DO_APXS2_INSTALL
-install-exec-local::
-       $(APXS2) -i -n shib_20 .libs/mod_shib_20.so
-       for la in $(modshib20_LTLIBRARIES) ; do rm -f `$(APXS2) -q LIBEXECDIR`/$$la ; done
-endif 
-
 install-exec-hook:
        for la in $(modshib20_LTLIBRARIES) ; do rm -f $(DESTDIR)$(modshib20dir)/$$la ; done
 

diff --git a/configure.ac b/configure.ac
index b157e76..1004527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -318,20 +318,11 @@ else
 fi
 fi
 
-if test "$WANT_APACHE_13" = "yes"; then
-    AC_ARG_ENABLE([apxs-install],
-       AC_HELP_STRING([--enable-apxs-install],
-                       [use apxs to install the apache modules]),
-       APXS_INSTALL="yes", )
-
-
-    AC_SUBST(APXS_CFLAGS)
-    AC_SUBST(APXS_INCLUDE)
-    AC_SUBST(APXS_LIBEXEC)
-    AC_SUBST(APXS_SYSCONFDIR)
-fi
+AC_SUBST(APXS_CFLAGS)
+AC_SUBST(APXS_INCLUDE)
+AC_SUBST(APXS_LIBEXEC)
+AC_SUBST(APXS_SYSCONFDIR)
 AM_CONDITIONAL(HAVE_APXS,test -n "$APXS")
-AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")
 
 
 # Apache 2.0 (mod_shib_20)
@@ -471,19 +462,11 @@ else
 fi
 fi
 
-if test "$WANT_APACHE_20" = "yes"; then
-    AC_ARG_ENABLE([apxs2-install],
-       AC_HELP_STRING([--enable-apxs2-install],
-                       [use apxs to install the apache-2 modules]),
-       APXS2_INSTALL="yes", )
-
-    AC_SUBST(APXS2_CFLAGS)
-    AC_SUBST(APXS2_INCLUDE)
-    AC_SUBST(APXS2_LIBEXEC)
-    AC_SUBST(APXS2_SYSCONFDIR)
-fi
+AC_SUBST(APXS2_CFLAGS)
+AC_SUBST(APXS2_INCLUDE)
+AC_SUBST(APXS2_LIBEXEC)
+AC_SUBST(APXS2_SYSCONFDIR)
 AM_CONDITIONAL(HAVE_APXS2,test -n "$APXS2")
-AM_CONDITIONAL(DO_APXS2_INSTALL,test -n "$APXS2_INSTALL")
 
 # always output the Makefile, even if you don't use it
 AC_CONFIG_FILES([apache/Makefile])