Author: wyoung
Date: Sun Jan 1 06:24:57 2017
New Revision: 2785
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2785&view=rev
Log:
The mysql_loc.m4 macro is now entirely side-effect-free, merely setting
MYSQL_C_* variables that the top-level Bakefile now uses when and as it
needs them, rather than expecting that variables like CXXFLAGS and LIBS
are already set to correct values.
Modified:
trunk/config/mysql_loc.m4
trunk/mysql++.bkl
Modified: trunk/config/mysql_loc.m4
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/config/mysql_loc.m4?rev=2785&r1=2784&r2=2785&view=diff
==============================================================================
--- trunk/config/mysql_loc.m4 (original)
+++ trunk/config/mysql_loc.m4 Sun Jan 1 06:24:57 2017
@@ -10,7 +10,7 @@
dnl --with-mysql-lib: Same as --with-mysql, but for library only.
dnl --with-mysql-include: Same as --with-mysql, but for headers
only.
dnl
-dnl @version 1.5, 2016/12/29
+dnl @version 1.5, 2016/12/31
dnl @author Warren Young <[email protected]>
AC_DEFUN([MYSQL_C_API_LOCATION],
[
@@ -68,17 +68,19 @@
AC_MSG_RESULT([$MYSQL_C_INC_DIR])
- CPPFLAGS="$CPPFLAGS -I${MYSQL_C_INC_DIR}"
-
#
# Look for MySQL C API library
#
AC_MSG_CHECKING([for MySQL C API library directory])
+ save_CPPFLAGS=$CPPFLAGS
save_LIBS=$LIBS
+ save_LDFLAGS=$LDFLAGS
+ CPPFLAGS="$CPPFLAGS -I$MYSQL_C_INC_DIR"
MYSQL_C_LIB_DIR=
for m in $MYSQL_lib_check
do
+ LDFLAGS="$save_LDFLAGS -L$m"
LIBS="$save_LIBS -l$MYSQL_C_LIB_NAME"
AC_TRY_LINK(
[ #include <mysql.h> ],
@@ -87,10 +89,7 @@
MYSQL_C_LIB_DIR=$m
break
],
- [ AC_CHECK_HEADERS(zlib.h, AC_CHECK_LIB(z, gzread, [],
- [ AC_MSG_ERROR([zlib not found]) ]))
- AC_MSG_CHECKING([whether adding -lz will let the link
succeed])
- LIBS="$save_LIBS -l$MYSQL_C_LIB_NAME -lz"
+ [ LIBS="$save_LIBS -l$MYSQL_C_LIB_NAME -lz"
AC_TRY_LINK(
[ #include <mysql.h> ],
[ mysql_store_result(0); ],
@@ -103,7 +102,9 @@
)
])
done
+ CPPFLAGS=$save_CPPFLAGS
LIBS=$save_LIBS
+ LDFLAGS=$save_LDFLAGS
if test -z "$MYSQL_C_LIB_DIR"
then
@@ -116,14 +117,12 @@
* ) AC_MSG_ERROR([The MySQL library directory
($MYSQL_C_LIB_DIR) must be an absolute path.]) ;;
esac
- case "$MYSQL_C_LIB_DIR" in
- /usr/lib)
+ if [ "$MYSQL_C_LIB_DIR" = "/usr/lib" -o \
+ "$MYSQL_C_LIB_DIR" = "/usr/lib64" ]
+ then
+ # Remove redundant lib paths
MYSQL_C_LIB_DIR=
- ;;
- *)
- LDFLAGS="$LDFLAGS -L${MYSQL_C_LIB_DIR}"
- ;;
- esac
+ fi
AC_SUBST(MYSQL_C_INC_DIR)
AC_SUBST(MYSQL_C_LIB_DIR)
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2785&r1=2784&r2=2785&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Sun Jan 1 06:24:57 2017
@@ -135,6 +135,8 @@
<cxxflags>@PTHREAD_CFLAGS@</cxxflags>
<include>.</include>
+ <include>@MYSQL_C_INC_DIR@</include>
+ <ldflags>-L@MYSQL_C_LIB_DIR@</ldflags>
<ldflags>-l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@
@MYSQLPP_EXTRA_LIBS@</ldflags>
</if>
@@ -169,6 +171,8 @@
<if cond="FORMAT in ['autoconf', 'gnu', 'mingw', 'xcode2']">
<include>lib</include>
+ <include>@MYSQL_C_INC_DIR@</include>
+ <lib-path>@MYSQL_C_LIB_DIR@</lib-path>
<lib-path>.</lib-path>
</if>
<if cond="FORMAT in ['msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
