diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2013-02-06 07:43:11 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-02-06 07:43:11 +0200 |
| commit | e0b9e456970e6dd3f0cd63a9f333fac49b424c61 (patch) | |
| tree | b73a8090ed58a320bfa7f64c8e34de611527ec84 | |
| parent | 45611484324c284701d1fb6b5873ed4a05f0535b (diff) | |
Fix incorrect AC_LANG_SOURCE quoting
Thanks to Hugo Mildenberger <Hugo.Mildenberger@web.de> for the patch.
| -rw-r--r-- | m4/libodb.m4 | 6 | ||||
| -rw-r--r-- | m4/libqt.m4 | 30 | ||||
| -rw-r--r-- | m4/threads.m4 | 6 |
3 files changed, 21 insertions, 21 deletions
diff --git a/m4/libodb.m4 b/m4/libodb.m4 index 6e282a6..7d3130b 100644 --- a/m4/libodb.m4 +++ b/m4/libodb.m4 @@ -31,8 +31,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <odb/exception.hxx> void @@ -60,7 +60,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_found=yes]) if test x"$libodb_found" = xno; then diff --git a/m4/libqt.m4 b/m4/libqt.m4 index ef754a9..44cbd5c 100644 --- a/m4/libqt.m4 +++ b/m4/libqt.m4 @@ -16,8 +16,8 @@ AC_MSG_CHECKING([for QtCore]) # test allows the user to override the QtCore library name (e.g., # QtCored4) via the LIBS variable. # -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <string> #include <QtCore/QString> @@ -28,7 +28,7 @@ main () std::string ss (qs.toStdString ()); return ss.size () != 0; } -]]), +])], [ libqt_found=yes ]) @@ -40,8 +40,8 @@ if test x"$libqt_found" = xno; then save_LIBS="$LIBS" LIBS="-lQtCore $LIBS" - CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ + CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <string> #include <QtCore/QString> @@ -52,7 +52,7 @@ main () std::string ss (qs.toStdString ()); return ss.size () != 0; } -]]), +])], [ libqt_found=yes ]) @@ -69,8 +69,8 @@ if test x"$libqt_found" = xno; then save_LIBS="$LIBS" LIBS="-framework QtCore $LIBS" - CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ + CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <string> #include <QtCore/QString> @@ -81,7 +81,7 @@ main () std::string ss (qs.toStdString ()); return ss.size () != 0; } -]]), +])], [ libqt_found=yes ]) @@ -98,8 +98,8 @@ if test x"$libqt_found" = xno; then save_LIBS="$LIBS" LIBS="-lQtCore4 $LIBS" - CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ + CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <string> #include <QtCore/QString> @@ -110,7 +110,7 @@ main () std::string ss (qs.toStdString ()); return ss.size () != 0; } -]]), +])], [ libqt_found=yes ]) @@ -136,8 +136,8 @@ if test x"$libqt_found" = xno; then CPPFLAGS="$CPPFLAGS $save_CPPFLAGS" LIBS="$LIBS $save_LIBS" - CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ + CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <string> #include <QtCore/QString> @@ -148,7 +148,7 @@ main () std::string ss (qs.toStdString ()); return ss.size () != 0; } -]]), +])], [ libqt_found=yes ]) diff --git a/m4/threads.m4 b/m4/threads.m4 index fce3f39..4cd4c05 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -36,8 +36,8 @@ if test x$threads = xcheck; then # AC_MSG_CHECKING([for __thread keyword]) - CXX_LIBTOOL_LINK_IFELSE( - AC_LANG_SOURCE([[ + CXX_LIBTOOL_LINK_IFELSE([ + AC_LANG_SOURCE([ __thread int tls_var; int @@ -45,7 +45,7 @@ if test x$threads = xcheck; then { tls_var = 0; } - ]]), + ])], [threads_thread_keyword=yes]) AC_MSG_RESULT([$threads_thread_keyword]) |