diff options
| author | Erik Andersson <erik@packy.se> | 2016-11-22 23:56:43 +0100 |
|---|---|---|
| committer | Erik Andersson <erik@packy.se> | 2016-11-22 23:56:43 +0100 |
| commit | 41954fffc10bfd230f857f57c6871b412d5f2e91 (patch) | |
| tree | 010bcf28f294a58b4a22b7276cf615758648bcbe /src/m4/mysql++.m4 | |
| parent | ed374a8dbcdaaf273964293d2805bdd61b148022 (diff) | |
| download | ocelot-master.zip ocelot-master.tar.gz ocelot-master.tar.bz2 | |
Diffstat (limited to 'src/m4/mysql++.m4')
| -rw-r--r-- | src/m4/mysql++.m4 | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/src/m4/mysql++.m4 b/src/m4/mysql++.m4 index 2931401..c475fc9 100644 --- a/src/m4/mysql++.m4 +++ b/src/m4/mysql++.m4 @@ -76,12 +76,17 @@ AC_DEFUN([MYSQLPP_DEVEL], if test -z "$ac_cv_mysqlpp_lib" then + AC_MSG_RESULT([no]) AC_MSG_ERROR([Didn't find the MySQL++ library dir in '$MYSQLPP_lib_check']) fi case "$ac_cv_mysqlpp_lib" in - /* ) ;; - * ) AC_MSG_ERROR([The MySQL++ library directory ($ac_cv_mysqlpp_lib) must be an absolute path.]) ;; + /* ) + ;; + * ) + AC_MSG_RESULT([no]) + AC_MSG_ERROR([The MySQL++ library directory ($ac_cv_mysqlpp_lib) must be an absolute path.]) + ;; esac ]) AC_SUBST([MYSQLPP_LIB_DIR],[$ac_cv_mysqlpp_lib]) @@ -102,12 +107,17 @@ AC_DEFUN([MYSQLPP_DEVEL], if test -z "$ac_cv_mysqlpp_inc" then + AC_MSG_RESULT([no]) AC_MSG_ERROR([Didn't find the MySQL++ header dir in '$MYSQLPP_inc_check']) fi case "$ac_cv_mysqlpp_inc" in - /* ) ;; - * ) AC_MSG_ERROR([The MySQL++ header directory ($ac_cv_mysqlpp_inc) must be an absolute path.]) ;; + /* ) + ;; + * ) + AC_MSG_RESULT([no]) + AC_MSG_ERROR([The MySQL++ header directory ($ac_cv_mysqlpp_inc) must be an absolute path.]) + ;; esac ]) AC_SUBST([MYSQLPP_INC_DIR],[$ac_cv_mysqlpp_inc]) @@ -116,20 +126,25 @@ AC_DEFUN([MYSQLPP_DEVEL], dnl Now check that the above checks resulted in -I and -L flags that dnl let us build actual programs against MySQL++. dnl - LDFLAGS_SAVED="$LDFLAGS" - CPPFLAGS_SAVED="$CPPFLAGS" case "$ac_cv_mysqlpp_lib" in - /usr/lib) ;; - *) LDFLAGS="$LDFLAGS -L${ac_cv_mysqlpp_lib}" ;; + /usr/lib) + ;; + *) + LDFLAGS="$LDFLAGS -L${ac_cv_mysqlpp_lib}" + ;; esac - CPPFLAGS="$CPPFLAGS -I${ac_cv_mysqlpp_inc} -I${MYSQL_C_INC_DIR}" + CPPFLAGS="$CPPFLAGS -I${ac_cv_mysqlpp_inc}" + LIBS="-lmysqlpp $LIBS" + AC_LANG_PUSH([C++]) AC_MSG_CHECKING([that we can build MySQL++ programs]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <mysql++.h>], - [mysqlpp::Connection c(false)])], - AC_MSG_RESULT([yes]), - AC_MSG_ERROR([no])) - LDFLAGS="$LDFLAGS_SAVED" - CPPFLAGS="$CPPFLAGS_SAVED" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include <mysql++.h>], + [mysqlpp::Connection c(false)] + )], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Cannot build MySQL++ programs])] + ) + AC_LANG_POP([C++]) ]) dnl End MYSQLPP_DEVEL - |