projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6351b16
)
Additional cleanup
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 12 Oct 2010 21:10:50 +0000
(21:10 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 12 Oct 2010 21:10:50 +0000
(21:10 +0000)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
4859844
..
b9801f4
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,4
+1,4
@@
-AC_PREREQ([2.
50
])
+AC_PREREQ([2.
67
])
AC_INIT([opensaml],[2.4],[https://bugs.internet2.edu/],[opensaml])
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
AC_INIT([opensaml],[2.4],[https://bugs.internet2.edu/],[opensaml])
AC_CONFIG_SRCDIR(saml)
AC_CONFIG_AUX_DIR(build-aux)
@@
-237,18
+237,14
@@
AC_ARG_WITH(xmltooling,
LIBS="-lxmltooling $LIBS"
AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
LIBS="-lxmltooling $LIBS"
AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files]))
-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
xmltooling::XMLToolingConfig::getConfig();
#else
#error Need XMLTooling version 1.4 or higher
-#endif
- ],
+#endif]])],
,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
# Check for unit test support
,[AC_MSG_ERROR([unable to link with XMLTooling, or version was too old])])
# Check for unit test support