configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 130a064c29f218699c0b64b50367b3ddd3a3d2db Author: Tomas Chvatal <tchva...@suse.cz> Date: Wed Aug 8 21:10:17 2012 +0200 Use LIBS not LDFLAGS to not fail with enforced as-needed. Change-Id: Ia27e97c12e9a8f36e106c9ae3c399cd776433387 (cherry picked from commit 0c7617a388d8e2e3a0d6c451b6412a5d32dd3d6e) Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/configure.in b/configure.in index 2dd9390..444cf82 100644 --- a/configure.in +++ b/configure.in @@ -6833,8 +6833,8 @@ if test "$ENABLE_MYSQLC" = "YES"; then [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], []) AC_CHECK_LIB([mysqlcppconn], [main], [:], [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], []) - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -lmysqlcppconn" + save_LIBS=$LIBS + LIBS="$LIBS -lmysqlcppconn" AC_MSG_CHECKING([version]) AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <mysql_driver.h> @@ -6852,7 +6852,7 @@ int main(int argc, char **argv) { ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[]) AC_LANG_POP([C++]) - LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS else AC_MSG_RESULT([internal]) AC_MSG_CHECKING([for mysqlcppconn module]) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits