LP2008252: Fix report output access when Shibboleth is enabled

[evergreen-equinox.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e0baeb9..67596da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_SUBST([abs_top_builddir])
 #-----------------------------------
 
 
-AC_PROG_LIBTOOL
+LT_INIT
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -153,20 +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])
-
-
 #-----------------------------------
 # Check for dependencies 
 #-----------------------------------
@@ -201,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)],
@@ -212,18 +195,6 @@ 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
@@ -263,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
@@ -314,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])
 
     #-------------------------------------------------------------------
@@ -350,8 +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/extras/Makefile])
 fi
 
 if test "x$build_apachemods" = "xtrue"; then
@@ -423,11 +392,6 @@ AC_MSG_RESULT([Evergreen Staff Client:      yes])
     else
 AC_MSG_RESULT([Evergreen Staff Client:      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})