Touch up some Solaris package files for later.

[shibboleth/xmltooling.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3b0e930..d14baf6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,8 @@ if test -f "${LOG4SHIB_CONFIG}"; then
     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>],
+               [#include <log4shib/Category.hh>
+#include <log4shib/CategoryStream.hh>],
                [log4shib::Category::getInstance("foo").errorStream() << log4shib::eol],
                [AC_DEFINE(XMLTOOLING_LOG4SHIB,1,[Define if log4shib library is used.])],
                [AC_MSG_ERROR([unable to link with log4shib])])
@@ -132,7 +133,8 @@ else
            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>],
+                       [#include <log4cpp/Category.hh>
+#include <log4cpp/CategoryStream.hh>],
                        [log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol],
                        [AC_DEFINE(XMLTOOLING_LOG4CPP,1,[Define if log4cpp library is used.])],
                        [AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])])
@@ -202,8 +204,6 @@ int i = 0;
        # restore master libs
        LIBS="$save_LIBS"
 
-       AC_LANG(C)
-
        # libcurl settings
        AC_PATH_PROG(CURL_CONFIG,curl-config)
        AC_ARG_WITH(curl,
@@ -283,8 +283,6 @@ int i = 0;
        LIBS="$save_LIBS"
 
        AC_SUBST(XMLSEC_LIBS)
-       
-       AC_LANG(C++)
 else
     AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
     AC_DEFINE(XMLTOOLING_NO_XMLSEC,1,
@@ -299,6 +297,12 @@ AC_TRY_LINK(
         [AC_DEFINE(HAVE_GOOD_STL,1,
             [Define if you have an STL implementation that supports useful string specialization.])],
         )
+AC_TRY_LINK(
+        [#include <vector>],
+        [std::iterator_traits<std::vector<int>::iterator>::value_type foo=0],
+        [AC_DEFINE(HAVE_ITERATOR_TRAITS,1,
+            [Define to 1 if you have an STL implementation that supports std::iterator_traits.])],
+        )
 
 # Check for unit test support
 CXXTEST="/usr/bin/cxxtestgen.pl"