test -f requires a full path, so use AC_PATH_PROG to find the -config app

[shibboleth/sp.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 354b14c..ad6087d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_TRY_LINK_FUNC([SSL_library_init],,
 AC_MSG_RESULT(yes)
 
 # log4cpp settings
-LOG4CPP_CONFIG="log4cpp-config"
+AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
 AC_ARG_WITH(log4cpp,
             AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp is installed]),
             [LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config"])
@@ -174,7 +174,7 @@ fi
 AM_CONDITIONAL(USE_OUR_ONCRPC,test "$rpctest" = "no")
 
 
-# Apache 1.3 (mod_shire/mod_shibrm)
+# Apache 1.3 (mod_shire)
 #   --with-apache-13 (static build, no idea how to do this yet, so not supported)
 #   --with-apxs      (DSO build, the normal way, uses apxs to derive build flags)
 #   --without-apxs   (DSO build, you tell us how to build using the environment)
@@ -310,36 +310,6 @@ fi
 fi
 
 if test "$WANT_APACHE_13" = "yes"; then
-    AC_ARG_WITH(apreq,
-                AC_HELP_STRING([--with-apreq=PATH], [where libapreq is installed]),
-                [if test x_$with_apreq != x_/usr; then
-                    LDFLAGS="-L${with_apreq}/lib $LDFLAGS"
-                    CPPFLAGS="-I${with_apreq}/include $CPPFLAGS"
-                fi])
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="-I$APXS_INCLUDE $APXS_CFLAGS $CPPFLAGS"
-    AC_TRY_COMPILE([#include <libapreq/apache_request.h>],
-                   [int i=0],
-                   test_apreq="yes",test_apreq="no")
-    if test "$test_apreq" = "no"; then
-        CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
-        APXS_CFLAGS="$APXS_CFLAGS -U_XOPEN_SOURCE"
-        AC_CHECK_HEADER([libapreq/apache_request.h],,
-            AC_MSG_ERROR([unable to find a usable libapreq header]))
-    fi
-
-dnl    saved_LIBS="$LIBS"
-dnl    LIBS="-lapreq $LIBS"
-dnl    AC_TRY_LINK(
-dnl        [#include <libapreq/apache_request.h>],
-dnl        [ApacheRequest_expires],
-dnl        [AC_DEFINE(HAVE_APREQ,1,[Define if apreq library was found])],
-dnl        [AC_MSG_ERROR([unable to link with apreq])
-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]),
@@ -352,7 +322,7 @@ dnl    LIBS="$saved_LIBS"
     AC_SUBST(APXS_SYSCONFDIR)
 
     # output the Apache 1.3 makefiles
-    WANT_SUBDIRS="$WANT_SUBDIRS mod_shire mod_shibrm"
+    WANT_SUBDIRS="$WANT_SUBDIRS mod_shire"
 fi
 # always output the Makefile, even if we don't use it
 AC_CONFIG_FILES([mod_shire/Makefile])
@@ -498,42 +468,11 @@ fi
 fi
 
 if test "$WANT_APACHE_20" = "yes"; then
-    AC_ARG_WITH(apreq2,
-                AC_HELP_STRING([--with-apreq2=PATH], [where http-apreq-2 is installed]),
-                [if test x_$with_apreq2 != x_/usr; then
-                    LDFLAGS="-L${with_apreq2}/lib $LDFLAGS"
-                    CPPFLAGS="-I${with_apreq2}/include $CPPFLAGS"
-                fi])
-
-    saved_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="-I$APXS2_INCLUDE $APXS2_CFLAGS $CPPFLAGS"
-    AC_TRY_COMPILE([#include <apreq.h>],
-                   [int i=0],
-                   test_apreq2="yes",test_apreq2="no")
-    if test "$test_apreq2" = "no"; then
-        CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE"
-        APXS2_CFLAGS="$APXS2_CFLAGS -U_XOPEN_SOURCE"
-        AC_CHECK_HEADER([apreq.h],,
-            AC_MSG_ERROR([unable to find a usable libapreq2 header]))
-    fi
-
-dnl    saved_LIBS="$LIBS"
-dnl    LIBS="-lapreq $LIBS"
-dnl    AC_TRY_LINK(
-dnl        [#include <apreq.h>],
-dnl        [apreq_param],
-dnl        [AC_DEFINE(HAVE_APREQ2,1,[Define if apreq2 library was found])],
-dnl        [AC_MSG_ERROR([unable to link with apreq2])
-dnl        ])
-dnl    LIBS="$saved_LIBS"
-    CPPFLAGS="$saved_CPPFLAGS"
-
     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)
@@ -547,6 +486,16 @@ AC_CONFIG_FILES([apache-2.0/Makefile])
 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])
+AM_CONDITIONAL(BUILD_AP13,test "$WANT_APACHE_13" = "yes")
+AM_CONDITIONAL(BUILD_AP20,test "$WANT_APACHE_20" = "yes")
+
+# add the apache module to the list of wanted subdirs..
+if test "$WANT_APACHE_13" = "yes" || test "$WANT_APACHE_20" = "yes" ; then
+    WANT_SUBDIRS="$WANT_SUBDIRS apache"
+fi
+
 
 #
 # Implement the checks of the MySQL Credential Cache