summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stoltz <astoltz@gmx.com>2016-08-28 22:32:40 -0500
committerAndrew Stoltz <astoltz@gmx.com>2016-08-31 13:04:53 -0500
commita4db3baf35537390a96f1e1f1eeee5bec01eee72 (patch)
treeaaf86a61a767fa2fe774d2720235e9a021046540
parentb812cb0104efaa25ce2f067a950fbf2abc36ebe5 (diff)
downloadautoconf-archive-a4db3baf35537390a96f1e1f1eeee5bec01eee72.tar.gz
Fix reference to LIBMYSQLCPPCONN_CXXFLAGS
-rw-r--r--m4/ax_lib_mysqlcppconn.m411
1 files changed, 9 insertions, 2 deletions
diff --git a/m4/ax_lib_mysqlcppconn.m4 b/m4/ax_lib_mysqlcppconn.m4
index ae8decd..f0421d6 100644
--- a/m4/ax_lib_mysqlcppconn.m4
+++ b/m4/ax_lib_mysqlcppconn.m4
@@ -35,7 +35,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 1
+#serial 2
AC_DEFUN([AX_LIB_MYSQLCPPCONN],
[
@@ -125,9 +125,13 @@ if test "x$want_libmysqlcppconn" = "xyes"; then
fi
CXXFLAGS_SAVED="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $LIBMYSQLCPPCONN_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $LIBMYSQLCPPCONN_CXXFLAGS"
export CXXFLAGS
+ CPPFLAGS_SAVED="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBMYSQLCPPCONN_CXXFLAGS"
+ export CPPFLAGS
+
LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $LIBMYSQLCPPCONN_LDFLAGS"
export LDFLAGS
@@ -166,6 +170,9 @@ if test "x$want_libmysqlcppconn" = "xyes"; then
CXXFLAGS="$CXXFLAGS_SAVED"
export CXXFLAGS
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ export CPPFLAGS
+
LDFLAGS="$LDFLAGS_SAVED"
export LDFLAGS