diff options
| author | David Tardon <dtardon@redhat.com> | 2013-02-20 12:42:50 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-02-20 12:46:34 +0100 |
| commit | 74a920c59ff7a68f5d42b3b9188ef8aeff28eda1 (patch) | |
| tree | 7f2a60e1b99bd784fe1a13c4f1a2c83de8cadfa2 | |
| parent | f3ceb0be8805657a3b886509ac255128a11b5974 (diff) | |
fdo#60907 export libmysql file name'
Change-Id: I294301e0f87924ac89c16c99f0549c98a7ea7da5
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index a40d361c6e7a..9ebf1c686264 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 6fad25ab3c9c..b0eea1930d7d 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 ad94a2f33def..7da474c47ebd 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 |