From 7e8e8aba7cc49bd26393c8f2cb07d99df9fec8dd Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 3 Sep 2010 16:21:31 +0200 Subject: Add support for MinGW build --- m4/libmysqlclient.m4 | 35 ++++++++++++++++++++++++++++++++++- m4/static-lib.m4 | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 m4/static-lib.m4 (limited to 'm4') diff --git a/m4/libmysqlclient.m4 b/m4/libmysqlclient.m4 index 3f607a2..bacb765 100644 --- a/m4/libmysqlclient.m4 +++ b/m4/libmysqlclient.m4 @@ -24,6 +24,9 @@ LIBS="-l$libmysqlclient_name $LIBS" CXX_LIBTOOL_LINK_IFELSE( AC_LANG_SOURCE([[ +#ifdef _WIN32 +# include +#endif #include int @@ -37,7 +40,37 @@ main () mysql_close (&handle); } ]]), -[libmysqlclient_found=yes]) +[ +libmysqlclient_found=yes +libmysqlclient_include=long +]) + +if test x"$libmysqlclient_found" = xno; then + +CXX_LIBTOOL_LINK_IFELSE( +AC_LANG_SOURCE([[ +#ifdef _WIN32 +# include +#endif +#include + +int +main () +{ + MYSQL handle; + mysql_init (&handle); + mysql_real_connect (&handle, 0, 0, 0, 0, 0, 0, 0); + MYSQL_STMT* stmt = mysql_stmt_init (&handle); + mysql_stmt_close (stmt); + mysql_close (&handle); +} +]]), +[ +libmysqlclient_found=yes +libmysqlclient_include=short +]) + +fi if test x"$libmysqlclient_found" = xno; then LIBS="$save_LIBS" diff --git a/m4/static-lib.m4 b/m4/static-lib.m4 new file mode 100644 index 0000000..1c0af42 --- /dev/null +++ b/m4/static-lib.m4 @@ -0,0 +1,19 @@ +dnl file : m4/static-lib.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +dnl STATIC_LIB(MACRO, DESCRIPTION) +dnl +dnl Define MACRO if we are on MinGW and are only building static library. +dnl +AC_DEFUN([STATIC_LIB], +[ +if test x$enable_shared = xno; then + case $host_os in + mingw*) + AC_DEFINE([$1], [1], [$2]) + ;; + esac +fi +])dnl -- cgit v1.1