AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([shibboleth],[2.0])
+sinclude(doxygen.m4)
sinclude(acx_pthread.m4)
+# Docygen features
+DX_HTML_FEATURE(ON)
+DX_CHM_FEATURE(OFF)
+DX_CHI_FEATURE(OFF)
+DX_MAN_FEATURE(OFF)
+DX_RTF_FEATURE(OFF)
+DX_XML_FEATURE(OFF)
+DX_PDF_FEATURE(OFF)
+DX_PS_FEATURE(OFF)
+DX_INIT_DOXYGEN(shibboleth, doxygen.cfg, doc/api)
+DX_INCLUDE=
+
AC_ARG_ENABLE(debug,
AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)
]),
AC_PROG_CC([gcc gcc3 cc])
AC_PROG_CXX([g++ g++3 c++ CC])
+AC_CANONICAL_HOST
if test "$GCC" = "yes" ; then
# AC_HAVE_GCC_VERSION(4,0,0,0,
# Checks for library functions.
AC_FUNC_STRFTIME
AC_FUNC_STRERROR_R
-AC_CHECK_FUNCS([strchr strdup strstr gmtime_r ctime_r strtok_r strcasecmp])
+AC_CHECK_FUNCS([strchr strdup strstr timegm gmtime_r strtok_r strcasecmp])
# checks for pthreads
ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
fi
+# Thank you Solaris, really.
+AC_MSG_CHECKING(for ctime_r)
+ if test -z "$ac_cv_ctime_args"; then
+ AC_TRY_COMPILE(
+ [#include <time.h>],
+ [
+ time_t clock;
+ char buf[26];
+ ctime_r(&clock, buf);
+ ], ac_cv_ctime_args=2)
+
+ AC_TRY_COMPILE(
+ [#include <time.h>],
+ [
+ time_t clock;
+ char buf[26];
+ ctime_r(&clock, buf, 26);
+ ], ac_cv_ctime_args=3)
+ fi
+ if test -z "$ac_cv_ctime_args"; then
+ AC_MSG_RESULT(no)
+ else
+ if test "$ac_cv_ctime_args" = 2; then
+ AC_DEFINE(HAVE_CTIME_R_2,1,[Define if ctime_r is present with 2 parameters.])
+ elif test "$ac_cv_ctime_args" = 3; then
+ AC_DEFINE(HAVE_CTIME_R_3,1,[Define if ctime_r is present with 3 parameters.])
+ fi
+ AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
+ fi
+
+# OpenSSL settings
+AC_ARG_WITH(openssl,
+ AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
+ [if test x_$with_openssl != x_/usr; then
+ SSLFLAGS="-I${with_openssl}/include"
+ fi])
+
+if test "x$SSLFLAGS" = "x" ; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+ if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
+ if pkg-config openssl ; then
+ SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+ else
+ AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+ fi
+ fi
+fi
+
+AC_MSG_CHECKING(for OpenSSL cflags)
+AC_MSG_RESULT($SSLFLAGS)
+CPPFLAGS="$SSLFLAGS $CPPFLAGS"
+
+AC_CHECK_HEADER([openssl/x509.h],,
+ AC_MSG_ERROR([unable to find openssl header files]))
+
AC_LANG(C++)
# C++ requirements
AC_CXX_REQUIRE_STL
AC_CXX_NAMESPACES
-# log4cpp settings
-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"])
-if test -f "${LOG4CPP_CONFIG}"; then
- LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
- CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+# log4shib settings (favor this version over the log4cpp code)
+AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config)
+AC_ARG_WITH(log4shib,
+ AC_HELP_STRING([--with-log4shib=PATH], [where log4shib-config is installed]),
+ [
+ LOG4SHIB_CONFIG="${with_log4shib}"
+ if ! test -f "${LOG4SHIB_CONFIG}" ; then
+ LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config"
+ fi
+ ])
+if test -f "${LOG4SHIB_CONFIG}"; then
+ LDFLAGS="`${LOG4SHIB_CONFIG} --libs` $LDFLAGS"
+ CPPFLAGS="`${LOG4SHIB_CONFIG} --cflags` $CPPFLAGS"
+ AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
+ AC_TRY_LINK(
+ [#include <log4shib/Category.hh>
+#include <log4shib/CategoryStream.hh>],
+ [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol],
+ [AC_DEFINE(SHIBSP_LOG4SHIB,1,[Define if log4shib library is used.])],
+ [AC_MSG_ERROR([unable to link with log4shib])])
else
- AC_MSG_WARN([log4cpp-config not found, guessing at log4cpp build settings])
- LIBS="-llog4cpp $LIBS"
+ AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option])
+ AC_MSG_WARN([will look for original log4cpp library])
+
+ # log4cpp settings
+ AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
+ AC_ARG_WITH(log4cpp,
+ AC_HELP_STRING([--with-log4cpp=PATH], [where log4cpp-config is installed]),
+ [
+ LOG4CPP_CONFIG="${with_log4cpp}"
+ if ! test -f "${LOG4CPP_CONFIG}" ; then
+ LOG4CPP_CONFIG="${with_log4cpp}/bin/log4cpp-config"
+ fi
+ ])
+ if test -f "${LOG4CPP_CONFIG}"; then
+ AC_MSG_WARN([will try to use log4cpp, note that most non-Internet2 supplied versions are not thread-safe])
+ LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
+ CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+ AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
+ AC_TRY_LINK(
+ [#include <log4cpp/Category.hh>
+#include <log4cpp/CategoryStream.hh>],
+ [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol],
+ [AC_DEFINE(SHIBSP_LOG4CPP,1,[Define if log4cpp library is used.])],
+ [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])])
+ else
+ AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
+ fi
fi
-AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
-AC_TRY_LINK(
- [#include <log4cpp/Category.hh>],
- [log4cpp::Category::getInstance("foo")],
- [AC_DEFINE(HAVE_LIBLOG4CPP,1,[Define if log4cpp library was found])],
- [AC_MSG_ERROR([unable to link with log4cpp])])
# Xerces settings
AC_ARG_WITH(xerces,
[AC_MSG_ERROR([unable to link with Xerces])])
+#XML-Tooling settings
+AC_ARG_WITH(xmltooling,
+ AC_HELP_STRING([--with-xmltooling=PATH], [where xmltooling-c is installed]),
+ [if test x_$with_xmltooling != x_/usr; then
+ LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+ fi])
+LITE_LIBS="-lxmltooling-lite"
+XMLSEC_LIBS="-lxmltooling"
+AC_CHECK_HEADER([xmltooling/base.h],,
+ AC_MSG_ERROR([unable to find xmltooling header files]))
+
+# Establish location of xmltooling catalog.
+XMLTOOLINGXMLDIR=""
+if test "x$with_xmltooling" = "x" ; then
+ with_xmltooling="/usr"
+fi
+if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then
+ XMLTOOLINGXMLDIR="$with_xmltooling"
+elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then
+ XMLTOOLINGXMLDIR="$with_xerces"
+elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then
+ XMLTOOLINGXMLDIR="$with_log4shib"
+fi
+if test "x$XMLTOOLINGXMLDIR" = "x" ; then
+ AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option])
+fi
+XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling"
+AC_SUBST(XMLTOOLINGXMLDIR)
+
# XML-Security settings
AC_ARG_WITH(xmlsec,
AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),,
LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
CPPFLAGS="-I${with_xmlsec}/include $CPPFLAGS"
fi
-XMLSEC_LIBS="-lxml-security-c"
+XMLSEC_LIBS="-lxml-security-c $XMLSEC_LIBS"
# save and append master libs
save_LIBS="$LIBS"
AC_MSG_CHECKING([XML-Security version])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM([#include <xsec/utils/XSECPlatformUtils.hpp>],
- [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0)
+ [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3)
int i = 0;
#else
-#error need version 1.3.1 or later
+#error need version 1.4.0 or later
#endif])],
[AC_MSG_RESULT(OK)],
- [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])])
+ [AC_MSG_FAILURE([XML-Security version 1.4.0 or greater is required.])])
AC_TRY_LINK(
[#include <xsec/utils/XSECPlatformUtils.hpp>],
[XSECPlatformUtils::Initialise()],,
- [AC_MSG_ERROR([unable to link with XML-Sec])])
+ [AC_MSG_ERROR([unable to link with XML-Security])])
# restore master libs
LIBS="$save_LIBS"
save_LIBS="$LIBS"
LIBS="$XMLSEC_LIBS $LIBS"
-AC_CHECK_HEADER([saml/saml.h],,
- AC_MSG_ERROR([unable to find saml header files]))
+AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,
+ AC_MSG_ERROR([unable to find OpenSAML header files]))
AC_TRY_LINK(
[#include <saml/SAMLConfig.h>
#include <saml/version.h>],
# restore master libs
LIBS="$save_LIBS"
+# Establish location of opensaml catalogs.
+OPENSAMLXMLDIR=""
+if test "x$with_saml" = "x" ; then
+ with_saml="/usr"
+fi
+if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then
+ OPENSAMLXMLDIR="$with_saml"
+elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then
+ OPENSAMLXMLDIR="$with_xmltooling"
+elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then
+ OPENSAMLXMLDIR="$with_xerces"
+elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then
+ OPENSAMLXMLDIR="$with_log4shib"
+fi
+if test "x$OPENSAMLXMLDIR" = "x" ; then
+ AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option])
+fi
+OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml"
+AC_SUBST(OPENSAMLXMLDIR)
+
+AC_SUBST(LITE_LIBS)
AC_SUBST(XMLSEC_LIBS)
# output the underlying makefiles
configs/Makefile shibsp/Makefile shibd/Makefile \
util/Makefile selinux/Makefile])
+## ADFS?
+AC_CONFIG_FILES([adfs/Makefile])
+AC_ARG_ENABLE([adfs],
+ AC_HELP_STRING([--disable-adfs], [don't build the ADFS module]),
+ [adfs_enabled=$enableval], [adfs_enabled=yes])
+if test "x$adfs_enabled" = "x" ; then
+ adfs_enabled=yes
+fi
+AC_MSG_CHECKING(whether to build the ADFS module)
+if test "$adfs_enabled" = "no" ; then
+ AC_MSG_RESULT(no)
+else
+ AC_MSG_RESULT(yes)
+ WANT_SUBDIRS="$WANT_SUBDIRS adfs"
+fi
+
+
#
# Build NSAPI module?
#
if test -d $WANT_NSAPI/include ; then
NSAPI_INCLUDE=$WANT_NSAPI/include
AC_MSG_RESULT(Netscape-Enterprise 3.x style)
- AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+ AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX])
NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
fi
if test -d $WANT_NSAPI/plugins/include ; then
test -n "$NSAPI_INCLUDE" && NSAPI_INC_DIR="-I$NSAPI_INCLUDE"
NSAPI_INCLUDE="$WANT_NSAPI/plugins/include"
AC_MSG_RESULT(iPlanet 4.x / SunONE 6.x style)
- AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h])
+ AC_CHECK_HEADERS([$NSAPI_INCLUDE/nsapi.h],,,[#define XP_UNIX])
NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
fi
if test "$NSAPI_INCLUDE" = ""; then
WANT_SUBDIRS="$WANT_SUBDIRS nsapi_shib"
fi
+
+#
+# Build FastCGI support?
+#
+AC_MSG_CHECKING(for FastCGI support)
+AC_ARG_WITH(fastcgi,
+ AC_HELP_STRING([--with-fastcgi=DIR], [Build FastCGI support]),
+ [WANT_FASTCGI=$withval],[WANT_FASTCGI=no])
+AC_MSG_RESULT($WANT_FASTCGI)
+
+if test "$WANT_FASTCGI" != "no"; then
+ if test "$WANT_FASTCGI" != "yes"; then
+ if test x_$WANT_FASTCGI != x_/usr; then
+ FASTCGI_INCLUDE="-I$WANT_FASTCGI/include"
+ FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
+ fi
+ fi
+ AC_CHECK_HEADER([fcgio.h],,
+ AC_MSG_ERROR([unable to find FastCGI header files]))
+ FASTCGI_LIBS="-lfcgi -lfcgi++"
+fi
+
+AC_SUBST(FASTCGI_INCLUDE)
+AC_SUBST(FASTCGI_LDFLAGS)
+AC_SUBST(FASTCGI_LIBS)
+
+# always output the Makefile, even if you don't use it
+AC_CONFIG_FILES([fastcgi/Makefile])
+AM_CONDITIONAL(BUILD_FASTCGI,test ! "$WANT_FASTCGI" = "no")
+
+if test ! "$WANT_FASTCGI" = "no" ; then
+ WANT_SUBDIRS="$WANT_SUBDIRS fastcgi"
+fi
+
+
#
# If no --enable-apache-xx specified
# find a default and fake the specific parameters
# ask the daemon for the version and set parameters
AC_MSG_CHECKING(default apache version)
httpd="`$xs -q SBINDIR`/`$xs -q TARGET`"
- if test "x$httpd" != "x"; then
+ if test "x$httpd" != "x" && test -f $httpd ; then
v=`$httpd -v|$SED -n -e 's/.*Apache\/\.*//p'`
case $v in
1.3*) [enable_apache_13]=yes
# extract settings we need from APXS -q
APXS_CC="`$APXS -q CC`"
- APXS_CFLAGS="`$APXS -q CPPFLAGS` `$APXS -q CFLAGS` `$APXS -q CFLAGS_SHLIB`"
+ APXS_CFLAGS="`$APXS -q CFLAGS` `$APXS -q CFLAGS_SHLIB`"
APXS_INCLUDE="`$APXS -q INCLUDEDIR`"
fi
fi
],
[
- AC_PATH_PROG(APR_CONFIG, apr-config)
+ AC_PATH_PROG(APR_CONFIG, apr-config,,[`$APXS2 -q SBINDIR`]:[$PATH])
])
if test -f "${APR_CONFIG}"; then
APR_CFLAGS="`${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags` `${APR_CONFIG} --includes`"
# extract settings we need from APXS2 -q
APXS2_CC="`$APXS2 -q CC`"
- APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` `$APXS2 -q CFLAGS_SHLIB` $APR_CFLAGS"
+ APXS2_CFLAGS="`$APXS2 -q CPPFLAGS` `$APXS2 -q CFLAGS` $APR_CFLAGS"
APXS2_INCLUDE="`$APXS2 -q INCLUDEDIR`"
fi
fi
],
[
- AC_PATH_PROG(APR1_CONFIG, apr-1-config)
+ AC_PATH_PROG(APR1_CONFIG, apr-1-config,,[`$APXS22 -q SBINDIR`]:[$PATH])
])
if test -f "${APR1_CONFIG}"; then
APR1_CFLAGS="`${APR1_CONFIG} --cflags` `${APR1_CONFIG} --cppflags` `${APR1_CONFIG} --includes`"
# extract settings we need from APXS22 -q
APXS22_CC="`$APXS22 -q CC`"
- APXS22_CFLAGS="`$APXS22 -q CPPFLAGS` `$APXS22 -q CFLAGS` `$APXS22 -q CFLAGS_SHLIB` $APR1_CFLAGS"
+ APXS22_CFLAGS="`$APXS22 -q CPPFLAGS` `$APXS22 -q CFLAGS` $APR1_CFLAGS"
APXS22_INCLUDE="`$APXS22 -q INCLUDEDIR`"
fi
#
-# Implement the checks of the ODBC Credential Cache
+# Implement the checks of the ODBC Storage Service
#
# 1) Assume the user wants ODBC; if it's not found then just continue without
# 2) If the user specifically requested odbc, look for it and ERROR if not found
-# 3) If the user specifically requested no-odbc, don't build it.
+# 3) If the user specifically requested no odbc, don't build it.
#
-#AC_CONFIG_FILES([odbc_ccache/Makefile])
+AC_CONFIG_FILES([odbc-store/Makefile])
# determine whether we should enable the odbc ccache
-#AC_ARG_ENABLE([odbc],
-# AC_HELP_STRING([--disable-odbc], [disable the ODBC Credential Cache]),
-# [odbc_enabled=$enableval], [odbc_enabled=default])
+AC_ARG_ENABLE([odbc],
+ AC_HELP_STRING([--disable-odbc], [disable the ODBC Storage Service]),
+ [odbc_enabled=$enableval], [odbc_enabled=default])
-#if test "x$odbc_enabled" = "x" ; then
-# odbc_enabled=yes
-#fi
+if test "x$odbc_enabled" = "x" ; then
+ odbc_enabled=yes
+fi
# Are we trying to build ODBC?
-#AC_MSG_CHECKING(whether to build the ODBC ccache)
-#if test "$odbc_enabled" = "yes" ; then
-# build_odbc=yes
-# AC_MSG_RESULT(yes)
-#elif test "$odbc_enabled" = "default" ; then
-# build_odbc=yes
-# AC_MSG_RESULT([yes, if it can be found])
-#else
-# build_odbc=no
-# AC_MSG_RESULT(no)
-#fi
+AC_MSG_CHECKING(whether to build the ODBC storage service)
+if test "$odbc_enabled" = "yes" ; then
+ build_odbc=yes
+ AC_MSG_RESULT(yes)
+elif test "$odbc_enabled" = "default" ; then
+ build_odbc=yes
+ AC_MSG_RESULT([yes, if it can be found])
+else
+ build_odbc=no
+ AC_MSG_RESULT(no)
+fi
# If we're trying to build ODBC, try to find the odbc_config program.
-#if test "$build_odbc" = "yes" ; then
-# odbc_dir=""
-# AC_ARG_WITH(odbc,
-# AC_HELP_STRING([--with-odbc=PATH], [directory where odbc is installed]),
-# [if test "$with_odbc" = no ; then
-# AC_MSG_ERROR([Try running --disable-odbc instead.])
-# elif test "$with_odbc" != yes ; then
-# odbc_dir="$with_odbc/bin"
-# fi ])
-
- # Try to find the mysql_config program
-# AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH )
-
-# if test "$ODBC_CONFIG" = no ; then
-# if test "$odbc_enabled" = "yes" ; then
-# AC_MSG_ERROR(Cannot find odbc_config)
-# else
-# AC_MSG_WARN(ODBC not found, skipping.)
-# fi
-# fi
-#fi
-
-#if test "$build_odbc" = yes ; then
-# ODBC_CFLAGS=`$ODBC_CONFIG --cflags`
-# ODBC_CFLAGS=`eval echo $ODBC_CFLAGS`
-# ODBC_LIBS=`$ODBC_CONFIG --libs`
-# ODBC_LIBS=`eval echo $ODBC_LIBS`
-
-# save_CPPFLAGS="$CPPFLAGS"
-# CPPFLAGS="$CPPFLAGS $ODBC_CFLAGS"
-
-# AC_CHECK_HEADER([sql.h], [have_sql_h=yes], [have_sql_h=no])
-# if test "$have_sql_h" = no -a "$odbc_enabled" = "yes" ; then
-# AC_MSG_ERROR(unable to find ODBC header files)
-# fi
-
-# if test "$have_sql_h" = yes ; then
-# save_LIBS="$LIBS"
-# LIBS="$LIBS $ODBC_LIBS"
-# AC_MSG_CHECKING(if we can link againt ODBC)
-# AC_TRY_LINK(
-# [#include <sql.h>
-# #include <sqlext.h>
-# #include <stdio.h>],
-# [SQLSetEnvAttr(SQL_NULL_HANDLE, SQL_ATTR_CONNECTION_POOLING, (void*)SQL_CP_ONE_PER_HENV, 0)],
-# [have_odbc_libs=yes],
-# [have_odbc_libs=no])
-# LIBS="$save_LIBS"
-
-# if test "$have_odbc_libs" = no ; then
-# if test "$odbc_enabled" = "yes" ; then
-# AC_MSG_ERROR([unable to link with ODBC Library])
-# else
-# AC_MSG_RESULT(no, skipping ODBC)
-# fi
-# fi
-# fi
-
-# CPPFLAGS="$save_CPPFLAGS"
-#fi
+if test "$build_odbc" = "yes" ; then
+ odbc_dir=""
+ AC_ARG_WITH(odbc,
+ AC_HELP_STRING([--with-odbc=PATH], [directory where odbc is installed]),
+ [if test "$with_odbc" = no ; then
+ AC_MSG_ERROR([Try running --disable-odbc instead.])
+ elif test "$with_odbc" != yes ; then
+ odbc_dir="$with_odbc/bin"
+ if test "$with_odbc" != /usr ; then
+ ODBC_CFLAGS="-I$with_odbc/include"
+ ODBC_LIBS="-L$with_odbc/lib"
+ fi
+ fi ])
+
+ AC_PATH_PROG(ODBC_CONFIG, odbc_config, no, $odbc_dir $PATH )
+ if test "$ODBC_CONFIG" = no ; then
+ AC_MSG_WARN([Cannot find odbc_config, will try to guess settings.])
+ ODBC_LIBS="$ODBC_LIBS -lodbc"
+ else
+ ODBC_CFLAGS=`$ODBC_CONFIG --cflags`
+ ODBC_LIBS=`$ODBC_CONFIG --libs`
+ fi
+
+ save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $ODBC_CFLAGS"
+
+ AC_CHECK_HEADER([sql.h], [have_sql_h=yes], [have_sql_h=no])
+ if test "$have_sql_h" = no -a "$odbc_enabled" = "yes" ; then
+ AC_MSG_ERROR(unable to find ODBC header files)
+ fi
+
+ if test "$have_sql_h" = yes ; then
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $ODBC_LIBS"
+ AC_MSG_CHECKING(if we can link againt ODBC)
+ AC_TRY_LINK(
+ [#include <sql.h>
+ #include <sqlext.h>
+ #include <stdio.h>],
+ [SQLSetEnvAttr(SQL_NULL_HANDLE, SQL_ATTR_CONNECTION_POOLING, (void*)SQL_CP_ONE_PER_HENV, 0)],
+ [have_odbc_libs=yes],
+ [have_odbc_libs=no])
+ LIBS="$save_LIBS"
+
+ if test "$have_odbc_libs" = no ; then
+ if test "$odbc_enabled" = "yes" ; then
+ AC_MSG_ERROR([unable to link with ODBC Library])
+ else
+ AC_MSG_RESULT(no, skipping ODBC)
+ fi
+ fi
+ fi
+
+ CPPFLAGS="$save_CPPFLAGS"
+fi
# if have_odbc_libs=yes then go ahead with building ODBC
-#if test "$have_odbc_libs" = yes ; then
-# # this AC_MSG_RESULT is from above!
-# AC_MSG_RESULT(yes)
-# WANT_SUBDIRS="$WANT_SUBDIRS odbc_ccache"
-# AC_SUBST(ODBC_CFLAGS)
-# AC_SUBST(ODBC_LIBS)
-#fi
+if test "$have_odbc_libs" = yes ; then
+ # this AC_MSG_RESULT is from above!
+ AC_MSG_RESULT(yes)
+ WANT_SUBDIRS="$WANT_SUBDIRS odbc-store"
+ AC_SUBST(ODBC_CFLAGS)
+ AC_SUBST(ODBC_LIBS)
+fi
AC_SUBST(WANT_SUBDIRS)
projects / shibboleth / sp.git / blobdiff