[Libreoffice-commits] .: 2 commits - configure.in scp2/source

[René Engelhard]

 configure.in                                       |    4 +++-
 scp2/source/graphicfilter/module_graphicfilter.scp |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6cc3499c777bfe07438a24b23bf79ea5c4c2cd74
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 9 15:37:03 2012 +0200

    fix mysqlcppconn version check

diff --git a/configure.in b/configure.in
index 090c4eb..24d55e4 100644
--- a/configure.in
+++ b/configure.in
@@ -6493,6 +6493,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"
         AC_MSG_CHECKING([version])
         AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <mysql_driver.h>
@@ -6510,7 +6512,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
     else
         AC_MSG_RESULT([internal])
         AC_MSG_CHECKING([for mysqlcppconn module])
commit 28f6fedd11aff6bf3b3579d9101e39560f83113f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 9 15:25:25 2012 +0200

    actually add gid_File_Lib_CDRImport to gid_Module_Optional_Grfflt

diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index 984b247..dd66724 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,5 +34,6 @@ Module gid_Module_Optional_Grfflt
     ParentID = gid_Module_Optional;
     Default = YES;
     Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-    		 gid_File_Lib_VisioImport, gid_File_Share_Registry_Graphicfilter_Xcd);
+    		 gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
+                 gid_File_Share_Registry_Graphicfilter_Xcd);
 End