X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d14baf6c058f87046cacb65b796244b3d2a7ac90;hb=80efca9b984967fc99d1649ccb024af23d09c8de;hp=1222f0a5175e9a641062ad4513e31070a1e7f0ec;hpb=8bb129630df4fe2df086d9ad823b608bedb0a4cf;p=shibboleth%2Fxmltooling.git

diff --git a/configure.ac b/configure.ac
index 1222f0a..d14baf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,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,
@@ -285,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,
@@ -301,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"