diff options
| author | John Wiegley <johnw@newartisans.com> | 2008-08-08 00:30:54 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-08-08 00:30:54 -0400 |
| commit | 9628850bc0688a6274fabb664c4fe6c7bc248802 (patch) | |
| tree | 24f377f8225ddfb670a9bbb7ac88f2527ea2e385 /configure.ac | |
| parent | 510ec810633957b6d02b48a6e45f08335609e590 (diff) | |
| download | fork-ledger-9628850bc0688a6274fabb664c4fe6c7bc248802.tar.gz fork-ledger-9628850bc0688a6274fabb664c4fe6c7bc248802.tar.bz2 fork-ledger-9628850bc0688a6274fabb664c4fe6c7bc248802.zip | |
Moved autoconf minimum version back to 2.61 (which is what comes with OS X).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index a87c71e9..4ad5dca7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.62) +AC_PREREQ(2.61) m4_include([version.m4]) @@ -126,11 +126,15 @@ if [test x$xml = xtrue ]; then [libexpat_save_libs=$LIBS LIBS="-lexpat $LIBS" AC_LANG_PUSH(C++) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> + AC_TRY_LINK( + [#include <stdio.h> extern "C" { #include <expat.h> // expat XML parser - }]], [[XML_Parser parser = XML_ParserCreate(NULL); - return parser != NULL;]])],[libexpat_avail_cv_=true],[libexpat_avail_cv_=false]) + }], + [XML_Parser parser = XML_ParserCreate(NULL); + return parser != NULL;], + [libexpat_avail_cv_=true], + [libexpat_avail_cv_=false]) AC_LANG_POP LIBS=$libexpat_save_libs]) @@ -152,11 +156,15 @@ if [test x$xml = xtrue ]; then [libxmlparse_save_libs=$LIBS LIBS="-lxmlparse -lxmltok $LIBS" AC_LANG_PUSH(C++) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> + AC_TRY_LINK( + [#include <stdio.h> extern "C" { #include <xmlparse.h> // expat XML parser - }]], [[XML_Parser parser = XML_ParserCreate(NULL); - return parser != NULL;]])],[libxmlparse_avail_cv_=true],[libxmlparse_avail_cv_=false]) + }], + [XML_Parser parser = XML_ParserCreate(NULL); + return parser != NULL;], + [libxmlparse_avail_cv_=true], + [libxmlparse_avail_cv_=false]) AC_LANG_POP LIBS=$libxmlparse_save_libs]) |