diff options
| -rw-r--r-- | m4/libmysqlclient.m4 | 18 | ||||
| -rw-r--r-- | m4/libodb.m4 | 6 | ||||
| -rw-r--r-- | m4/threads.m4 | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/m4/libmysqlclient.m4 b/m4/libmysqlclient.m4 index f75acc9..3148f26 100644 --- a/m4/libmysqlclient.m4 +++ b/m4/libmysqlclient.m4 @@ -33,8 +33,8 @@ if test x"path" != xnone; then LDFLAGS="$LDFLAGS -L$path" fi -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #ifdef _WIN32 # include <winsock2.h> #endif @@ -50,7 +50,7 @@ main () mysql_stmt_close (stmt); mysql_close (&handle); } -]]), +])], [ libmysqlclient_found=yes libmysqlclient_include=long @@ -60,8 +60,8 @@ if test x"$libmysqlclient_found" = xyes; then break; fi -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #ifdef _WIN32 # include <winsock2.h> #endif @@ -77,7 +77,7 @@ main () mysql_stmt_close (stmt); mysql_close (&handle); } -]]), +])], [ libmysqlclient_found=yes libmysqlclient_include=short @@ -111,8 +111,8 @@ libmysqlclient_thr_key_visible=no if test x"$libmysqlclient_found" = xyes -a x"$1" = xposix; then -CXX_LIBTOOL_LINK_IFELSE( -AC_LANG_SOURCE([[ +CXX_LIBTOOL_LINK_IFELSE([ +AC_LANG_SOURCE([ #include <pthread.h> extern pthread_key_t THR_KEY_mysys; int @@ -120,7 +120,7 @@ main () { return pthread_getspecific (THR_KEY_mysys) != 0; } -]]), +])], [ libmysqlclient_thr_key_visible=yes ]) 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/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]) |