AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.4], [shibboleth-users@internet2.edu], [shibboleth])
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.4])
-
-sinclude(doxygen.m4)
-sinclude(acx_pthread.m4)
+AC_INIT([shibboleth],[2.4],[https://bugs.internet2.edu/],[shibboleth])
+AC_CONFIG_SRCDIR(shibsp)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(m4)
+AM_INIT_AUTOMAKE
+LT_INIT
# Docygen features
DX_HTML_FEATURE(ON)
DX_INCLUDE=
AC_ARG_ENABLE(debug,
- AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)
-]),
+ AS_HELP_STRING([--enable-debug],[Have GCC compile with symbols (Default = no)]),
enable_debug=$enableval, enable_debug=no)
if test "$enable_debug" = "yes" ; then
GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
fi
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile])
+
AC_PROG_CC([gcc gcc3 cc])
AC_PROG_CXX([g++ g++3 c++ CC])
+AC_DISABLE_STATIC
AC_CANONICAL_HOST
if test "$GCC" = "yes" ; then
esac
fi
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-
AC_LANG(C)
# Checks for typedefs, structures, and compiler characteristics.
if test $enable_threads != "pthread"; then
AC_MSG_ERROR([unable to find pthreads, currently this is required])
else
- AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
+ AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
# OpenSSL settings
AC_ARG_WITH(openssl,
- AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
+ AS_HELP_STRING([--with-openssl=PATH],[where openssl is installed]),
[if test x_$with_openssl != x_/usr; then
SSLFLAGS="-I${with_openssl}/include"
fi])
AC_MSG_RESULT($SSLFLAGS)
CPPFLAGS="$SSLFLAGS $CPPFLAGS"
-AC_CHECK_HEADER([openssl/x509.h],,
- AC_MSG_ERROR([unable to find openssl header files]))
+AC_CHECK_HEADER([openssl/x509.h],,AC_MSG_ERROR([unable to find openssl header files]))
-AC_LANG(C++)
+AC_LANG([C++])
# C++ requirements
-AC_CXX_REQUIRE_STL
AC_CXX_NAMESPACES
+AC_CXX_REQUIRE_STL
# 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
+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
# 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]),
+ AS_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"
+ if ! test -f "${LOG4SHIB_CONFIG}"; then
+ LOG4SHIB_CONFIG="${with_log4shib}/bin/log4shib-config"
fi
])
-if test -f "${LOG4SHIB_CONFIG}"; then
+if test -f "${LOG4SHIB_CONFIG}" ; then
LIBS="`${LOG4SHIB_CONFIG} --libs` $LIBS"
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])])
+ AC_CHECK_HEADER([log4shib/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4shib header files]))
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <log4shib/Category.hh>
+#include <log4shib/CategoryStream.hh>]],
+ [[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol]])],
+ [AC_DEFINE([SHIBSP_LOG4SHIB],[1],[Define to 1 if log4shib library is used.])],
+ [AC_MSG_ERROR([unable to link with log4shib])])
else
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])
- LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS"
- 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
+ # log4cpp settings
+ AC_PATH_PROG(LOG4CPP_CONFIG,log4cpp-config)
+ AC_ARG_WITH(log4cpp,
+ AS_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])
+ LIBS="`${LOG4CPP_CONFIG} --libs` $LIBS"
+ CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
+ AC_CHECK_HEADER([log4cpp/CategoryStream.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <log4cpp/Category.hh>
+#include <log4cpp/CategoryStream.hh>]],
+ [[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol]])],
+ [AC_DEFINE([SHIBSP_LOG4CPP],[1],[Define to 1 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
# Xerces settings
-AC_ARG_WITH(xerces,
- AC_HELP_STRING([--with-xerces=PATH], [where xerces-c is installed]),
- [if test x_$with_xerces != x_/usr; then
- LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
- CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
- fi])
+AC_ARG_WITH(xerces,
+ AS_HELP_STRING([--with-xerces=PATH],[where xerces-c is installed]),
+ [if test x_$with_xerces != x_/usr; then
+ LDFLAGS="-L${with_xerces}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xerces}/include $CPPFLAGS"
+ fi])
LIBS="-lxerces-c $LIBS"
-AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,
- AC_MSG_ERROR([unable to find xerces header files]))
+AC_CHECK_HEADER([xercesc/dom/DOM.hpp],,AC_MSG_ERROR([unable to find xerces header files]))
AC_MSG_CHECKING([Xerces version])
AC_PREPROC_IFELSE(
[AC_LANG_PROGRAM([#include <xercesc/util/XercesVersion.hpp>],
#endif])],
[AC_MSG_RESULT(OK)],
[AC_MSG_FAILURE([Xerces-C v2.6.0 has bugs that inhibit use with signed XML, please use a newer version])])
-AC_TRY_LINK(
- [#include <xercesc/util/PlatformUtils.hpp>],
- [xercesc::XMLPlatformUtils::Initialize()],
- [AC_DEFINE(HAVE_LIBXERCESC,1,[Define if Xerces-C library was found])],
- [AC_MSG_ERROR([unable to link with Xerces])])
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]],[[xercesc::XMLPlatformUtils::Initialize()]])],
+ ,[AC_MSG_ERROR([unable to link with Xerces])])
AC_MSG_CHECKING([whether Xerces XMLString::release(XMLByte**) exists])
-AC_TRY_COMPILE([#include <xercesc/util/XMLString.hpp>],
- [using namespace XERCES_CPP_NAMESPACE;
- XMLByte* buf=NULL;
- XMLString::release(&buf);
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE([SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE], [1], [Define to 1 if Xerces XMLString includes XMLByte release.])],
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <xercesc/util/XMLString.hpp>]],
+ [[using namespace XERCES_CPP_NAMESPACE; XMLByte* buf=NULL; XMLString::release(&buf);]])],
+ [AC_MSG_RESULT([yes])AC_DEFINE([SHIBSP_XERCESC_HAS_XMLBYTE_RELEASE],[1],[Define to 1 if Xerces XMLString includes XMLByte release.])],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces DOMNodeFilter API returns a short])
static Blocker g_Blocker;
],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE([SHIBSP_XERCESC_SHORT_ACCEPTNODE], [1], [Define to 1 if Xerces DOMNodeFilter API returns a short.])],
+ [AC_DEFINE([SHIBSP_XERCESC_SHORT_ACCEPTNODE],[1],[Define to 1 if Xerces DOMNodeFilter API returns a short.])],
[AC_MSG_RESULT([no])])
#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])
+ AS_HELP_STRING([--with-xmltooling=PATH],[where xmltooling is installed]),
+ [if test x_$with_xmltooling != x_/usr; then
+ LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
+ CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+ DX_INCLUDE="${with_xmltooling}/include"
+ fi])
LITE_LIBS="-lxmltooling-lite"
XMLSEC_LIBS="-lxmltooling"
-AC_CHECK_HEADER([xmltooling/base.h],,
- AC_MSG_ERROR([unable to find xmltooling header files]))
+AC_CHECK_HEADER([xmltooling/base.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
# save and append master libs
save_LIBS="$LIBS"
LIBS="$XMLSEC_LIBS $LIBS"
-AC_TRY_LINK(
- [
-#include <xmltooling/XMLToolingConfig.h>
-#include <xmltooling/version.h>
- ],
- [
-#if _XMLTOOLING_VERSION >= 10400
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/version.h>]],
+ [[#if _XMLTOOLING_VERSION >= 10400
xmltooling::XMLToolingConfig::getConfig();
#else
#error Need XMLTooling version 1.4 or higher
-#endif
- ],
- [AC_DEFINE(HAVE_XMLTOOLING,1,[Define if xmltooling library was found])],
- [AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])]
- )
+#endif]])],
+ ,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
# restore master libs
LIBS="$save_LIBS"
# XML-Security settings
AC_ARG_WITH(xmlsec,
- AC_HELP_STRING([--with-xmlsec=PATH], [where xmlsec is installed]),,
- [with_xmlsec=/usr])
+ AS_HELP_STRING([--with-xmlsec=PATH],[where xmlsec is installed]),,
+ [with_xmlsec=/usr])
if test x_$with_xmlsec != x_/usr; then
LDFLAGS="-L${with_xmlsec}/lib $LDFLAGS"
#endif])],
[AC_MSG_RESULT(OK)],
[AC_MSG_FAILURE([XML-Security-C 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-Security])])
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <xsec/utils/XSECPlatformUtils.hpp>]],
+ [[XSECPlatformUtils::Initialise()]])],,
+ [AC_MSG_ERROR([unable to link with XML-Security])])
AC_MSG_CHECKING([whether XML-Security-C supports white/blacklisting of algorithms])
AC_TRY_COMPILE([#include <xsec/framework/XSECAlgorithmMapper.hpp>],
[XSECAlgorithmMapper* mapper; mapper->whitelistAlgorithm(NULL);],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE([SHIBSP_XMLSEC_WHITELISTING], [1], [Define to 1 if XML-Security-C supports white/blacklisting algorithms.])],
+ [AC_DEFINE([SHIBSP_XMLSEC_WHITELISTING],[1],[Define to 1 if XML-Security-C supports white/blacklisting algorithms.])],
[AC_MSG_RESULT([no])])
# OpenSAML settings
AC_ARG_WITH(saml,
- AC_HELP_STRING([--with-saml=PATH], [where saml is installed]),
+ AS_HELP_STRING([--with-saml=PATH],[where saml is installed]),
[if test x_$with_saml != x_/usr; then
LDFLAGS="-L${with_saml}/lib $LDFLAGS"
CPPFLAGS="-I${with_saml}/include $CPPFLAGS"
+ DX_INCLUDE="$DX_INCLUDE ${with_saml}/include"
fi])
XMLSEC_LIBS="-lsaml $XMLSEC_LIBS"
save_LIBS="$LIBS"
LIBS="$XMLSEC_LIBS $LIBS"
-AC_CHECK_HEADER([saml/saml2/metadata/Metadata.h],,
- AC_MSG_ERROR([unable to find OpenSAML 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>
AC_SUBST(LITE_LIBS)
AC_SUBST(XMLSEC_LIBS)
-AC_CONFIG_FILES([shibboleth.spec pkginfo Portfile])
-
# output the underlying makefiles
WANT_SUBDIRS="doc schemas configs shibsp shibd util"
AC_CONFIG_FILES([Makefile doc/Makefile schemas/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])
+ AS_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
+ adfs_enabled=yes
fi
AC_MSG_CHECKING(whether to build the ADFS module)
if test "$adfs_enabled" = "no" ; then
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(yes)
- WANT_SUBDIRS="$WANT_SUBDIRS adfs"
+ AC_MSG_RESULT(yes)
+ WANT_SUBDIRS="$WANT_SUBDIRS adfs"
fi
#
AC_MSG_CHECKING(for NSAPI module option)
AC_ARG_WITH(nsapi,
- AC_HELP_STRING([--with-nsapi=DIR], [Build NSAPI module for Netscape/iPlanet/SunONE]),
- [WANT_NSAPI=$withval],[WANT_NSAPI=no])
+ AS_HELP_STRING([--with-nsapi=DIR],[Build NSAPI module for Netscape/iPlanet/SunONE]),
+ [WANT_NSAPI=$withval],[WANT_NSAPI=no])
AC_MSG_RESULT($WANT_NSAPI)
if test "$WANT_NSAPI" != "no"; then
if test ! -d $WANT_NSAPI/bin ; then
- AC_MSG_ERROR(Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR)
+ AC_MSG_ERROR([Please specify the path to the root of your Netscape/iPlanet/SunONE server using --with-nsapi=DIR])
fi
AC_MSG_CHECKING(for NSAPI include files)
if test -d $WANT_NSAPI/include ; then
NSAPI_INCLUDE="$NSAPI_INC_DIR -I$NSAPI_INCLUDE"
fi
if test "$NSAPI_INCLUDE" = ""; then
- AC_MSG_ERROR(Please check you have nsapi.h in either $WANT_NSAPI/include or $WANT_NSAPI/plugins/include)
+ AC_MSG_ERROR([Please check you have nsapi.h in either $WANT_NSAPI/include or $WANT_NSAPI/plugins/include])
fi
fi
#
AC_MSG_CHECKING(for FastCGI support)
AC_ARG_WITH(fastcgi,
- AC_HELP_STRING([--with-fastcgi=DIR], [Build FastCGI support]),
+ AS_HELP_STRING([--with-fastcgi=DIR],[Build FastCGI support]),
[WANT_FASTCGI=$withval],[WANT_FASTCGI=no])
AC_MSG_RESULT($WANT_FASTCGI)
FASTCGI_LDFLAGS="-L$WANT_FASTCGI/lib"
fi
fi
- AC_CHECK_HEADER([fcgio.h],,
- AC_MSG_ERROR([unable to find FastCGI header files]))
+ AC_CHECK_HEADER([fcgio.h],,AC_MSG_ERROR([unable to find FastCGI header files]))
FASTCGI_LIBS="-lfcgi -lfcgi++"
fi
#
AC_MSG_CHECKING(for Memcached support)
AC_ARG_WITH(memcached,
- AC_HELP_STRING([--with-memcached=DIR], [Build Memcached support]),
+ AS_HELP_STRING([--with-memcached=DIR],[Build Memcached support]),
[WANT_MEMCACHED=$withval],[WANT_MEMCACHED=no])
AC_MSG_RESULT($WANT_MEMCACHED)
# --with-apxs (DSO build, the normal way, uses apxs to derive build flags)
AC_ARG_ENABLE(apache-13,
- AC_HELP_STRING([--enable-apache-13], [enable the Apache 1.3 module]),
- [ if test "x$enableval" = "x" ; then
- WANT_APACHE_13=yes
- else
- WANT_APACHE_13="$enableval"
- fi
+ AS_HELP_STRING([--enable-apache-13],[enable the Apache 1.3 module]),
+ [if test "x$enableval" = "x" ; then
+ WANT_APACHE_13=yes
+ else
+ WANT_APACHE_13="$enableval"
+ fi
],[ WANT_APACHE_13=no ])
AC_MSG_CHECKING(whether to build Apache 1.3 module)
if test "$WANT_APACHE_13" != yes && test "$WANT_APACHE_13" != no ; then
if test "$WANT_APACHE_13" = "yes" ; then
AC_ARG_WITH(apxs,
- AC_HELP_STRING([--with-apxs=FILE], [Specifies where to find the Apache 1.3 apxs script.]),
+ AS_HELP_STRING([--with-apxs=FILE],[Specifies where to find the Apache 1.3 apxs script.]),
[
AC_MSG_CHECKING(for user-specified apxs name/location)
if test "$withval" != "no" ; then
# --with-apu (DSO build, APR-UTIL development package installed separately)
AC_ARG_ENABLE(apache-20,
- AC_HELP_STRING([--enable-apache-20], [enable the Apache 2.0 module]),
- [ if test "x$enableval" = "x" ; then
- WANT_APACHE_20=yes
- else
- WANT_APACHE_20="$enableval"
- fi
+ AS_HELP_STRING([--enable-apache-20],[enable the Apache 2.0 module]),
+ [if test "x$enableval" = "x" ; then
+ WANT_APACHE_20=yes
+ else
+ WANT_APACHE_20="$enableval"
+ fi
],[ WANT_APACHE_20=no ])
AC_MSG_CHECKING(whether to build Apache 2.0 module)
if test "$WANT_APACHE_20" != yes && test "$WANT_APACHE_20" != no ; then
- WANT_APACHE_20=yes
+ WANT_APACHE_20=yes
fi
AC_MSG_RESULT($WANT_APACHE_20)
if test "$WANT_APACHE_20" = "yes" ; then
AC_ARG_WITH(apxs2,
- AC_HELP_STRING([--with-apxs2=FILE], [Specifies where to find the Apache 2.0 apxs script.]),
+ AS_HELP_STRING([--with-apxs2=FILE],[Specifies where to find the Apache 2.0 apxs script.]),
[
AC_MSG_CHECKING(for user-specified Apache2 apxs name/location)
if test "$withval" != "no" ; then
# APR settings
AC_ARG_WITH(apr,
- AC_HELP_STRING([--with-apr=PATH], [where apr-config is installed]),
+ AS_HELP_STRING([--with-apr=PATH],[where apr-config is installed]),
[
AC_MSG_CHECKING(for user-specified apr-config name/location)
if test "$withval" != "no" ; then
# APU settings
AC_ARG_WITH(apu,
- AC_HELP_STRING([--with-apu=PATH], [where apu-config is installed]),
+ AS_HELP_STRING([--with-apu=PATH],[where apu-config is installed]),
[
AC_MSG_CHECKING(for user-specified apu-config name/location)
if test "$withval" != "no" ; then
# --with-apu1 (DSO build, APR-UTIL development package installed separately)
AC_ARG_ENABLE(apache-22,
- AC_HELP_STRING([--enable-apache-22], [enable the Apache 2.2 module]),
- [ if test "x$enableval" = "x" ; then
- WANT_APACHE_22=yes
- else
- WANT_APACHE_22="$enableval"
- fi
+ AS_HELP_STRING([--enable-apache-22],[enable the Apache 2.2 module]),
+ [if test "x$enableval" = "x" ; then
+ WANT_APACHE_22=yes
+ else
+ WANT_APACHE_22="$enableval"
+ fi
],[ WANT_APACHE_22=no ])
AC_MSG_CHECKING(whether to build Apache 2.2 module)
if test "$WANT_APACHE_22" != yes && test "$WANT_APACHE_22" != no ; then
- WANT_APACHE_22=yes
+ WANT_APACHE_22=yes
fi
AC_MSG_RESULT($WANT_APACHE_22)
if test "$WANT_APACHE_22" = "yes" ; then
AC_ARG_WITH(apxs22,
- AC_HELP_STRING([--with-apxs22=FILE], [Specifies where to find the Apache 2.2 apxs script.]),
+ AS_HELP_STRING([--with-apxs22=FILE],[Specifies where to find the Apache 2.2 apxs script.]),
[
AC_MSG_CHECKING(for user-specified Apache2.2 apxs name/location)
if test "$withval" != "no" ; then
# APR1 settings
AC_ARG_WITH(apr1,
- AC_HELP_STRING([--with-apr1=PATH], [where apr-1-config is installed]),
+ AS_HELP_STRING([--with-apr1=PATH],[where apr-1-config is installed]),
[
AC_MSG_CHECKING(for user-specified apr-1-config name/location)
if test "$withval" != "no" ; then
# APU1 settings
AC_ARG_WITH(apu1,
- AC_HELP_STRING([--with-apu1=PATH], [where apu-1-config is installed]),
+ AS_HELP_STRING([--with-apu1=PATH],[where apu-1-config is installed]),
[
AC_MSG_CHECKING(for user-specified apu-1-config name/location)
if test "$withval" != "no" ; then
if test "$withval" != "yes"; then
- APR1_CONFIG=$withval
+ APU1_CONFIG=$withval
AC_MSG_RESULT("$withval")
fi
fi
# determine whether we should enable the odbc ccache
AC_ARG_ENABLE([odbc],
- AC_HELP_STRING([--disable-odbc], [disable the ODBC Storage Service]),
+ AS_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
+ odbc_enabled=yes
fi
# Are we trying to build ODBC?
AC_MSG_CHECKING(whether to build the ODBC storage service)
if test "$odbc_enabled" = "yes" ; then
- build_odbc=yes
- AC_MSG_RESULT(yes)
+ 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])
+ build_odbc=yes
+ AC_MSG_RESULT([yes, if it can be found])
else
- build_odbc=no
- AC_MSG_RESULT(no)
+ 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]),
+ odbc_dir=""
+ AC_ARG_WITH(odbc,
+ AS_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_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
if test "$odbc_enabled" = "yes" ; then
AC_MSG_ERROR([unable to link with ODBC Library])
else
- AC_MSG_RESULT(no, skipping ODBC)
+ AC_MSG_RESULT([no, skipping ODBC])
fi
fi
fi
projects / shibboleth / sp.git / blobdiff