diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 13:30:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:59:56 +0200 |
| commit | 871d75e9c2c82d4b3ffbbff80f1dfa7a823e4f3d (patch) | |
| tree | ba997ca727e6eccaea4b1877f2b4b1f682facaba /configure.ac | |
| parent | 0bb764854361249c60ea31c5366a91dcd938c747 (diff) | |
consistent naming of externals: libmariadb -> mariadb-connector-c
The used version is actually named mariadb_client but since 2.1.0
upstream calls it MariaDB Connector/C.
Change-Id: I51b12a9be55151919585dec91a5fc802ff4fc86b
Reviewed-on: https://gerrit.libreoffice.org/42295
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 56985d8083ff..3de1c765acf5 100644 --- a/configure.ac +++ b/configure.ac @@ -8156,7 +8156,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then AC_MSG_CHECKING([which MariaDB to use]) if test "$with_system_mariadb" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_MARIADB=TRUE + SYSTEM_MARIADB_CONNECTOR_C=TRUE #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config]) if test -z "$MARIADBCONFIG"; then AC_PATH_PROG(MARIADBCONFIG, [mysql_config]) @@ -8193,7 +8193,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library]) if test "$enable_bundle_mariadb" = "yes"; then AC_MSG_RESULT([yes]) - BUNDLE_MARIADB=TRUE + BUNDLE_MARIADB_CONNECTOR_C=TRUE LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[[:space:]]]\{1,\}-l\([[^[:space:]]]\{1,\}\)/\ \1\ /g' -e 's/^-l\([[^[:space:]]]\{1,\}\)[[[:space:]]]*/\ @@ -8217,22 +8217,22 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then fi else AC_MSG_RESULT([no]) - BUNDLE_MARIADB= + BUNDLE_MARIADB_CONNECTOR_C= fi else AC_MSG_RESULT([internal]) - SYSTEM_MARIADB= - MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include" - MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib" - BUILD_TYPE="$BUILD_TYPE MARIADB" + SYSTEM_MARIADB_CONNECTOR_C= + MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb-connector-c/include" + MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadb-connector-c" + BUILD_TYPE="$BUILD_TYPE MARIADB_CONNECTOR_C" fi - AC_SUBST(SYSTEM_MARIADB) + AC_SUBST(SYSTEM_MARIADB_CONNECTOR_C) AC_SUBST(MARIADB_CFLAGS) AC_SUBST(MARIADB_LIBS) AC_SUBST(LIBMARIADB) AC_SUBST(LIBMARIADB_PATH) - AC_SUBST(BUNDLE_MARIADB) + AC_SUBST(BUNDLE_MARIADB_CONNECTOR_C) AC_LANG_PUSH([C++]) dnl =================================================================== |