[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-2-28-g2c8d451
The following commit has been merged in the debian-experimental-3.6 branch:
commit 2c8d451e59d26607505b06fe03a080805201324b
Author: Rene Engelhard <rene@debian.org>
Date: Sun Apr 8 23:21:42 2012 +0200
fi-a x mysqlcppconn version check
diff --git a/patches/fix-mysqlcppconn-version-check.diff b/patches/fix-mysqlcppconn-version-check.diff
new file mode 100644
index 0000000..688de95
--- /dev/null
+++ b/patches/fix-mysqlcppconn-version-check.diff
@@ -0,0 +1,20 @@
+--- a/configure.in-old 2012-04-08 23:14:14.294482576 +0200
++++ b/configure.in 2012-04-08 23:16:50.266434228 +0200
+@@ -6500,6 +6500,8 @@
+ [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"
+ AC_MSG_CHECKING([version])
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <mysql_driver.h>
+@@ -6517,7 +6519,7 @@
+ ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[])
+
+ AC_LANG_POP([C++])
+-
++ LDFLAGS=$save_LDFLAGS
+ else
+ AC_MSG_RESULT([internal])
+ AC_MSG_CHECKING([for mysqlcppconn module])
--
LibreOffice packaging repository
Reply to: