[Libreoffice-commits] core.git: config_host.mk.in configure.ac mysqlc/Extension_mysql-connector-ooo.mk

[David Tardon]

 config_host.mk.in                       |    1 +
 configure.ac                            |    1 +
 mysqlc/Extension_mysql-connector-ooo.mk |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 74a920c59ff7a68f5d42b3b9188ef8aeff28eda1
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 20 12:42:50 2013 +0100

    fdo#60907 export libmysql file name'
    
    Change-Id: I294301e0f87924ac89c16c99f0549c98a7ea7da5

diff --git a/config_host.mk.in b/config_host.mk.in
index a40d361..9ebf1c6 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -303,6 +303,7 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
 export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
+export LIBMYSQL=@LIBMYSQL@
 export LIBMYSQL_PATH=@LIBMYSQL_PATH@
 export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
 export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
diff --git a/configure.ac b/configure.ac
index 6fad25a..b0eea19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7816,6 +7816,7 @@ if test "$ENABLE_MYSQLC" = "YES"; then
     AC_SUBST(MYSQL_INC)
     AC_SUBST(MYSQL_LIB)
     AC_SUBST(MYSQL_DEFINES)
+    AC_SUBST([LIBMYSQL])
     AC_SUBST(LIBMYSQL_PATH)
 
     AC_LANG_PUSH([C++])
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk
index ad94a2f..7da474c 100644
--- a/mysqlc/Extension_mysql-connector-ooo.mk
+++ b/mysqlc/Extension_mysql-connector-ooo.mk
@@ -26,7 +26,7 @@ endif
 # HACK: comes from Library_mysql.mk
 ifeq ($(SYSTEM_MYSQL),NO)
 $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
-	$(LIBMYSQL_PATH)/lib/$(MYSQL_LIBFILE) \
+	$(LIBMYSQL_PATH)/lib/$(LIBMYSQL) \
 ))
 endif