From 1501fcaf7be0eb7466b7e86fd05e17632d6e0f9e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 6 Feb 2013 07:43:11 +0200 Subject: Fix incorrect AC_LANG_SOURCE quoting Thanks to Hugo Mildenberger for the patch. --- m4/c++11.m4 | 6 +++--- m4/libboost.m4 | 30 +++++++++++++++--------------- m4/libodb-boost.m4 | 6 +++--- m4/libodb-mssql.m4 | 6 +++--- m4/libodb-mysql.m4 | 6 +++--- m4/libodb-oracle.m4 | 6 +++--- m4/libodb-pgsql.m4 | 6 +++--- m4/libodb-qt.m4 | 6 +++--- m4/libodb-sqlite.m4 | 6 +++--- m4/libodb.m4 | 6 +++--- m4/libqt.m4 | 30 +++++++++++++++--------------- m4/threads.m4 | 6 +++--- m4/tr1-memory.m4 | 6 +++--- 13 files changed, 63 insertions(+), 63 deletions(-) diff --git a/m4/c++11.m4 b/m4/c++11.m4 index 774f20d..5df020f 100644 --- a/m4/c++11.m4 +++ b/m4/c++11.m4 @@ -13,8 +13,8 @@ cxx11=no AC_MSG_CHECKING([whether we are in C++11 mode]) -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include int @@ -23,7 +23,7 @@ main () std::shared_ptr p (new int (10)); *p = 11; } -]]), +])], [cxx11=yes]) if test x"$cxx11" = xyes; then diff --git a/m4/libboost.m4 b/m4/libboost.m4 index b1f53b4..c8132eb 100644 --- a/m4/libboost.m4 +++ b/m4/libboost.m4 @@ -28,8 +28,8 @@ if test x"$libboost_dir" != x; then LDFLAGS="$LDFLAGS -L$abs_libboost_dir/stage/lib" fi -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include #ifndef BOOST_VERSION @@ -40,7 +40,7 @@ int main () { } -]]), +])], [ libboost_found=yes ]) @@ -113,8 +113,8 @@ dnl dnl LIBBOOST_SMART_PTR([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) dnl AC_DEFUN([LIBBOOST_SMART_PTR], [ -LIBBOOST_HEADER_LIB([smart_ptr], -AC_LANG_SOURCE([[ +LIBBOOST_HEADER_LIB([smart_ptr],[ +AC_LANG_SOURCE([ #include #include @@ -124,7 +124,7 @@ main () boost::shared_ptr sp (new int (10)); boost::weak_ptr wp (sp); } -]]), +])], [$1], [$2]) ])dnl @@ -132,8 +132,8 @@ dnl dnl LIBBOOST_UNORDERED([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) dnl AC_DEFUN([LIBBOOST_UNORDERED], [ -LIBBOOST_HEADER_LIB([unordered], -AC_LANG_SOURCE([[ +LIBBOOST_HEADER_LIB([unordered],[ +AC_LANG_SOURCE([ #include #include @@ -146,7 +146,7 @@ main () s.insert (1); return m.find (1) != m.end (); } -]]), +])], [$1], [$2]) ])dnl @@ -154,13 +154,13 @@ dnl dnl LIBBOOST_SYSTEM([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) dnl AC_DEFUN([LIBBOOST_SYSTEM], [ -LIBBOOST_LIB([system], -AC_LANG_SOURCE([[ +LIBBOOST_LIB([system],[ +AC_LANG_SOURCE([ int main () { } -]]), +])], [$1], [$2]) ])dnl @@ -168,8 +168,8 @@ dnl dnl LIBBOOST_DATE_TIME([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) dnl AC_DEFUN([LIBBOOST_DATE_TIME], [ -LIBBOOST_LIB([date_time], -AC_LANG_SOURCE([[ +LIBBOOST_LIB([date_time],[ +AC_LANG_SOURCE([ #include int @@ -179,7 +179,7 @@ main () const char* s (m.as_short_string ()); return s == 0; } -]]), +])], [$1], [$2]) ])dnl diff --git a/m4/libodb-boost.m4 b/m4/libodb-boost.m4 index 874597a..8ce86d1 100644 --- a/m4/libodb-boost.m4 +++ b/m4/libodb-boost.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-boost $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_boost_found=yes]) if test x"$libodb_boost_found" = xno; then diff --git a/m4/libodb-mssql.m4 b/m4/libodb-mssql.m4 index cc1c627..578a2f2 100644 --- a/m4/libodb-mssql.m4 +++ b/m4/libodb-mssql.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-mssql $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_mssql_found=yes]) if test x"$libodb_mssql_found" = xno; then diff --git a/m4/libodb-mysql.m4 b/m4/libodb-mysql.m4 index b369a09..cbac417 100644 --- a/m4/libodb-mysql.m4 +++ b/m4/libodb-mysql.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-mysql $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_mysql_found=yes]) if test x"$libodb_mysql_found" = xno; then diff --git a/m4/libodb-oracle.m4 b/m4/libodb-oracle.m4 index 2b85a83..6302368 100644 --- a/m4/libodb-oracle.m4 +++ b/m4/libodb-oracle.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-oracle $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_oracle_found=yes]) if test x"$libodb_oracle_found" = xno; then diff --git a/m4/libodb-pgsql.m4 b/m4/libodb-pgsql.m4 index 30dcd4d..e50c65f 100644 --- a/m4/libodb-pgsql.m4 +++ b/m4/libodb-pgsql.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-pgsql $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_pgsql_found=yes]) if test x"$libodb_pgsql_found" = xno; then diff --git a/m4/libodb-qt.m4 b/m4/libodb-qt.m4 index 6abf9cc..f0a1a0e 100644 --- a/m4/libodb-qt.m4 +++ b/m4/libodb-qt.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-qt $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_qt_found=yes]) if test x"$libodb_qt_found" = xno; then diff --git a/m4/libodb-sqlite.m4 b/m4/libodb-sqlite.m4 index 2e1ab19..fd5f3d0 100644 --- a/m4/libodb-sqlite.m4 +++ b/m4/libodb-sqlite.m4 @@ -32,8 +32,8 @@ fi save_LIBS="$LIBS" LIBS="-lodb-sqlite $LIBS" -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include void @@ -61,7 +61,7 @@ main () const char* m (g ()); return m != 0; } -]]), +])], [libodb_sqlite_found=yes]) if test x"$libodb_sqlite_found" = xno; then 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 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 #include @@ -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 #include @@ -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 #include @@ -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 #include @@ -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 #include @@ -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]) diff --git a/m4/tr1-memory.m4 b/m4/tr1-memory.m4 index d207f1e..5df00a1 100644 --- a/m4/tr1-memory.m4 +++ b/m4/tr1-memory.m4 @@ -14,8 +14,8 @@ tr1_memory=no AC_MSG_CHECKING([for TR1 ]) -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include int @@ -24,7 +24,7 @@ main () std::tr1::shared_ptr p (new int (10)); *p = 11; } -]]), +])], [tr1_memory=yes]) if test x"$tr1_memory" = xyes; then -- cgit v1.1