LP2008252: Fix report output access when Shibboleth is enabled

[evergreen-equinox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a7685ad..67596da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +21,10 @@
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
 AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [trunk])
-AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
+AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar])
 AC_SUBST(prefix)
 AC_SUBST([abs_top_builddir])
@@ -32,7 +33,7 @@ AC_SUBST([abs_top_builddir])
 #-----------------------------------
 
 
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -152,33 +153,6 @@ esac],
 AM_CONDITIONAL([BUILDILSCLIENT], [test x$openils_client = xtrue])
 
 
-# build evergreen java ?
-
-AC_ARG_ENABLE([java],
-[  --enable-java    enables installation of the Evergreen Java components ],
-[case "${enableval}" in
-    yes) evergreen_java=true ;;
-    no)  evergreen_java=false ;;
-  *) AC_MSG_ERROR([please choose another value for --enable-java (supported values are yes or no])
-esac],
-[evergreen_java=false])
-
-AM_CONDITIONAL([BUILDEGJAVA], [test x$evergreen_java = xtrue])
-
-
-# build the evergreen python modules?
-
-AC_ARG_ENABLE([python],
-[  --enable-python    enables installation of the Evergreen Python modules ],
-[case "${enableval}" in
-    yes) EG_PYTHON_INSTALL=true ;;
-    no)  EG_PYTHON_INSTALL=false ;;
-  *) AC_MSG_ERROR([please choose another value for --enable-python (supported values are yes or no)])
-esac],
-[EG_PYTHON_INSTALL=false])
-
-AM_CONDITIONAL([BUILDEGPYTHON], [test x$EG_PYTHON_INSTALL = xtrue])
-
 #-----------------------------------
 # Check for dependencies 
 #-----------------------------------
@@ -213,10 +187,7 @@ AC_ARG_WITH([libxml2],
 [LIBXML2_HEADERS=/usr/include/libxml2/])
 AC_SUBST([LIBXML2_HEADERS])
 
-AC_ARG_WITH([dbi],
-[  --with-dbi=path             location of the libdbi driver libraries (default is /usr/lib/x86_64-linux-gnu/dbd/)],
-[DBI_LIBS=${withval}],
-[DBI_LIBS=/usr/lib/x86_64-linux-gnu/dbd/])
+PKG_CHECK_MODULES([DBI], [dbi])
 
 AC_ARG_WITH([perlbase],
 [  --with-perlbase=path        base location to install Perl modules (default based on Config.pm)],
@@ -224,17 +195,7 @@ AC_ARG_WITH([perlbase],
 [PERL_BASE=x])
 AC_SUBST([PERL_BASE])
 
-# If the passed in value doesn't work, fall back to reasonable defaults
-# Distributions are starting to package a good version of libdbi / libdbd
-if ! test -d "$DBI_LIBS"; then
-    for i in /usr/lib/dbd/ /usr/lib64/dbd /usr/local/lib/dbd/ ; do
-        if test -d "$i"; then
-            DBI_LIBS="$i"
-            break
-        fi
-    done
-fi
-AC_SUBST([DBI_LIBS])
+AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
 
 if test "x$openils_core" = "xtrue"; then
 
@@ -273,7 +234,7 @@ if test "x$openils_core" = "xtrue"; then
         AC_MSG_ERROR([*** cpan not found, aborting])
     fi
 
-    AC_CHECK_PROG([YAZ],yaz-config,yes,no)
+    PKG_CHECK_MODULES([YAZ],[yaz],[YAZ=yes],[YAZ=no])
     if test $YAZ = "no"; then
         AC_MSG_ERROR([*** yaz not found, aborting])
     fi
@@ -324,7 +285,6 @@ if test "x$openils_core" = "xtrue"; then
     # Checks for header files.
     #------------------------------------
 
-    AC_HEADER_STDC
     AC_CHECK_HEADERS([fcntl.h langinfo.h locale.h stdlib.h string.h unistd.h])
 
     #-------------------------------------------------------------------
@@ -349,7 +309,6 @@ if test "x$openils_core" = "xtrue"; then
     #---------------------------------
     PKG_CHECK_MODULES([CHECK], [check >= 0.9.0], [enable_tests=yes],
                       [enable_tests=no])
-    AM_CONDITIONAL(CHECK_TESTS, test x$enable_tests = xyes)
     if test "x$enable_tests" = "xno"; then
         AC_MSG_WARN(Check unit testing framework not found.)
     fi
@@ -361,9 +320,7 @@ if test "x$openils_core" = "xtrue"; then
     AC_CONFIG_FILES([Open-ILS/examples/Makefile
              Open-ILS/src/c-apps/Makefile
              Open-ILS/src/c-apps/tests/Makefile
-             Open-ILS/src/extras/Makefile
-             Open-ILS/src/java/Makefile
-             Open-ILS/src/python/Makefile])
+             Open-ILS/src/extras/Makefile])
 fi
 
 if test "x$build_apachemods" = "xtrue"; then
@@ -435,16 +392,6 @@ AC_MSG_RESULT([Evergreen Staff Client:      yes])
     else
 AC_MSG_RESULT([Evergreen Staff Client:      no])
     fi
-    if test "$EG_PYTHON_INSTALL" = "true" ; then
-AC_MSG_RESULT([Evergreen Python Components: yes])
-    else
-AC_MSG_RESULT([Evergreen Python Components: no])
-    fi
-    if test "$evergreen_java" = "true" ; then
-AC_MSG_RESULT([Evergreen Java Components:   yes])
-    else
-AC_MSG_RESULT([Evergreen Java Components:   no])
-fi
 AC_MSG_RESULT([]) 
 AC_MSG_RESULT([-------- Installation Directories --------])
 AC_MSG_RESULT(Installation directory prefix:            ${prefix})