Add --enable-apxs-install configure option (default is OFF). When it is

off, install the apache modules into $(libexecdir)

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

diff --git a/configure.ac b/configure.ac
index dfe4e84..296b33e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,12 @@ dnl        ])
 dnl    LIBS="$saved_LIBS"
     CPPFLAGS="$saved_CPPFLAGS"
 
+    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)
@@ -274,6 +280,8 @@ dnl    LIBS="$saved_LIBS"
     AC_CONFIG_FILES([mod_shire/Makefile mod_shibrm/Makefile])
 fi
 
+AM_CONDITIONAL(DO_APXS_INSTALL,test -n "$APXS_INSTALL")
+
 AC_SUBST(WANT_SUBDIRS)
 
 if test -n "$APXS_CC" && test "$APXS_CC" != "$CC" ; then

diff --git a/mod_shibrm/Makefile.am b/mod_shibrm/Makefile.am
index d72aea0..6fc5767 100644 (file)
--- a/mod_shibrm/Makefile.am
+++ b/mod_shibrm/Makefile.am
@@ -2,7 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-lib_LTLIBRARIES = mod_shibrm.la
+shibrmdir = $(libexecdir)
+shibrm_LTLIBRARIES = mod_shibrm.la
 
 mod_shibrm_la_SOURCES = mod_shibrm.cpp
 
@@ -12,8 +13,7 @@ mod_shibrm_la_LIBADD = $(top_builddir)/shib/libshib.la $(top_builddir)/shib-targ
 
 mod_shibrm_la_LDFLAGS = -module -avoid-version -lapreq
 
-if HAVE_APXS
+if DO_APXS_INSTALL
 install-exec-local:
        $(APXS) -i -A -n shibrm .libs/mod_shibrm.so
 endif 
-

diff --git a/mod_shire/Makefile.am b/mod_shire/Makefile.am
index 379490c..79fe57b 100644 (file)
--- a/mod_shire/Makefile.am
+++ b/mod_shire/Makefile.am
@@ -2,7 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-lib_LTLIBRARIES = mod_shire.la
+shiredir = $(libexecdir)
+shire_LTLIBRARIES = mod_shire.la
 
 mod_shire_la_SOURCES = mod_shire.cpp
 
@@ -12,7 +13,7 @@ mod_shire_la_LIBADD = $(top_builddir)/shib/libshib.la $(top_builddir)/shib-targe
 
 mod_shire_la_LDFLAGS = -module -avoid-version -lapreq
 
-if HAVE_APXS
+if DO_APXS_INSTALL
 install-exec-local:
        $(APXS) -i -A -n shire .libs/mod_shire.so
 endif