X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=31b2d1c402f073bb7a6c7fa9e1ef6c8379683931;hb=140ea7f150ca4282dfed27df05e087da48f69fd2;hp=5d64f4cd8112156b3fdf69a6208670bfc5026b9c;hpb=915bb6ce733004f5bd528ab4c370402ee505804c;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/configure.ac b/configure.ac
index 5d64f4c..31b2d1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(xmltooling/config_pub.h)
 AM_INIT_AUTOMAKE([xmltooling], [1.0])
 
-sinclude(acx_pthread.m4)
 sinclude(doxygen.m4)
+sinclude(acx_pthread.m4)
 
 # Docygen features
 DX_HTML_FEATURE(ON)
@@ -34,6 +34,13 @@ AC_PROG_CC([gcc gcc3 cc])
 AC_PROG_CXX([g++ g++3 c++ CC])
 
 if test "$GCC" = "yes" ; then
+#    AC_HAVE_GCC_VERSION(4,0,0,0,
+#        [
+#        AC_DEFINE(GCC_HASCLASSVISIBILITY,1,
+#            [Define to enable class visibility control in gcc.])
+#        GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+#        GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
+#        ])
     CFLAGS="$GCC_CFLAGS"
     CXXFLAGS="$GCC_CXXFLAGS"
 fi
@@ -41,13 +48,14 @@ fi
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
-AC_LANG(C++)
-
-# C++ requirements
-AC_CXX_REQUIRE_STL
-AC_CXX_NAMESPACES
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
 
-AC_LANG(C)
+# Checks for library functions.
+AC_CHECK_FUNCS([strchr strdup strstr])
+AC_CHECK_HEADERS([dlfcn.h])
+AC_CHECK_FUNC(dlclose, , [ AC_CHECK_LIB(dl, dlopen) ])
 
 # checks for pthreads
 ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
@@ -55,36 +63,36 @@ 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.])
+	AM_CONDITIONAL(BUILD_PTHREAD,test "$enable_threads" = "pthread")
     LIBS="$PTHREAD_LIBS $LIBS"
     CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
     CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
 fi
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_STRUCT_TIMEZONE
-
-# Checks for library functions.
-AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([strchr strdup strstr gmtime_r timegm])
-AC_CHECK_HEADERS([dlfcn.h])
-
 # OpenSSL settings
-AC_PATH_PROG(PKG_CONFIG, pkg-config)
-if test "x$PKG_CONFIG" = x || test "x$PKG_CONFIG" = "xno" ; then
-    AC_ARG_WITH(openssl, 
-            AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
-            [if test x_$with_openssl != x_/usr; then
-                SSLLIBS="-L${with_openssl}/lib"
-                SSLFLAGS="-I${with_openssl}/include"
-            fi])
-    SSLLIBS="$SSLLIBS -lssl -lcrypto"
-else
-    SSLLIBS="`$PKG_CONFIG --libs openssl`"
-    SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+AC_ARG_WITH(openssl,
+    AC_HELP_STRING([--with-openssl=PATH], [where openssl is installed]),
+    [if test x_$with_openssl != x_/usr; then
+        SSLLIBS="-L${with_openssl}/lib -lcrypto -lssl"
+        SSLFLAGS="-I${with_openssl}/include"
+    fi])
+
+if test "x$SSLLIBS" = "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
+            SSLLIBS="`$PKG_CONFIG --libs openssl`"
+            SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
+        else
+            AC_MSG_ERROR([OpenSSL not supported by pkg-config, try --with-openssl instead])
+        fi
+    fi
 fi
+
+if test "x$SSLLIBS" = "x" ; then
+    SSLLIBS="-lcrypto -lssl"
+fi
+
 AC_MSG_CHECKING(for OpenSSL libraries)
 AC_MSG_RESULT($SSLLIBS)
 LIBS="$LIBS $SSLLIBS"
@@ -92,47 +100,34 @@ AC_MSG_CHECKING(for OpenSSL cflags)
 AC_MSG_RESULT($SSLFLAGS)
 CPPFLAGS="$SSLFLAGS $CPPFLAGS"
 
-AC_CHECK_HEADER([openssl/ssl.h],,
+AC_CHECK_HEADER([openssl/pem.h],,
                 AC_MSG_ERROR([unable to find openssl header files]))
 AC_MSG_CHECKING(for ERR_load_CRYPTO_string)
 AC_TRY_LINK_FUNC([ERR_load_CRYPTO_strings],,
              AC_MSG_ERROR([unable to link with openssl libraries]))
 AC_MSG_RESULT(yes)
-AC_MSG_CHECKING(for SSL_library_init)
-AC_TRY_LINK_FUNC([SSL_library_init],, 
-             AC_MSG_ERROR([unable to link with openssl libraries]))
-AC_MSG_RESULT(yes)
-
-# libcurl settings
-AC_PATH_PROG(CURL_CONFIG,curl-config)
-AC_ARG_WITH(curl,
-            AC_HELP_STRING([--with-curl=PATH], [where libcurl is installed]),
-            [CURL_CONFIG="${with_curl}/bin/curl-config"])
-if test -f "${CURL_CONFIG}"; then
-    LDFLAGS="`${CURL_CONFIG} --libs` $LDFLAGS"
-    CPPFLAGS="`${CURL_CONFIG} --cflags` $CPPFLAGS"
-else
-    AC_MSG_WARN([curl-config not found, guessing at libcurl build settings])
-fi
-AC_CHECK_HEADER([curl/curl.h],,AC_MSG_ERROR([unable to find libcurl header files]))
-AC_CHECK_LIB([curl],[curl_global_init],,AC_MSG_ERROR([unable to link with libcurl]))
-AC_MSG_CHECKING([for CURLOPT_SSL_CTX_FUNCTION in curl.h])
-AC_EGREP_HEADER([CURLOPT_SSL_CTX_FUNCTION], [curl/curl.h],
-		[AC_MSG_RESULT(yes)],
-		[AC_MSG_ERROR([need libcurl that supports CURLOPT_SSL_CTX_FUNCTION])])
 
 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"])
+    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
     LDFLAGS="`${LOG4CPP_CONFIG} --libs` $LDFLAGS"
     CPPFLAGS="`${LOG4CPP_CONFIG} --cflags` $CPPFLAGS"
 else
-    AC_MSG_WARN([log4cpp-config not found, guessing at log4cpp build settings])
+    AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
     LIBS="-llog4cpp $LIBS"
 fi
 AC_CHECK_HEADER([log4cpp/Category.hh],,AC_MSG_ERROR([unable to find log4cpp header files]))
@@ -210,6 +205,9 @@ AC_TRY_LINK(
             [Define if you have an STL implementation that supports useful string specialization.])],
         )
 
+# check for timegm() support
+AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,[Define to 1 if timegm is available]))
+
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"
 CXXTESTFLAGS=""