mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#60907 export libmysql file name'

Browse Source 
Change-Id: I294301e0f87924ac89c16c99f0549c98a7ea7da5
This commit is contained in:
David Tardon
2013-02-20 12:42:50 +01:00
parent f3ceb0be88
commit 74a920c59f
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -303,6 +303,7 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@ export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBMYSQL=@LIBMYSQL@
export LIBMYSQL_PATH=@LIBMYSQL_PATH@ export LIBMYSQL_PATH=@LIBMYSQL_PATH@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@

1
configure.ac
View File

@@ -7816,6 +7816,7 @@ if test "$ENABLE_MYSQLC" = "YES"; then
AC_SUBST(MYSQL_INC) AC_SUBST(MYSQL_INC)
AC_SUBST(MYSQL_LIB) AC_SUBST(MYSQL_LIB)
AC_SUBST(MYSQL_DEFINES) AC_SUBST(MYSQL_DEFINES)
AC_SUBST([LIBMYSQL])
AC_SUBST(LIBMYSQL_PATH) AC_SUBST(LIBMYSQL_PATH)
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])

2
mysqlc/Extension_mysql-connector-ooo.mk
View File

@@ -26,7 +26,7 @@ endif
# HACK: comes from Library_mysql.mk # HACK: comes from Library_mysql.mk
ifeq ($(SYSTEM_MYSQL),NO) ifeq ($(SYSTEM_MYSQL),NO)
$(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
$(LIBMYSQL_PATH)/lib/$(MYSQL_LIBFILE) \ $(LIBMYSQL_PATH)/lib/$(LIBMYSQL) \
)) ))
endif endif