[Libreoffice-commits] core.git: configure.ac
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 30 12:08:30 UTC 2018
configure.ac | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit 339795d6bd064f57ef33c7cbd5e90433c179e72e
Author: Kacper Kasper <kacperkasper at gmail.com>
AuthorDate: Wed Aug 29 21:54:32 2018 +0200
Commit: Rene Engelhard <rene at debian.org>
CommitDate: Thu Aug 30 14:08:06 2018 +0200
Drop --with-system-mysql-cppconn
Not needed since 5061663ce052087c6d5d0910d6f99358e26dbbd1 "drop
unnecessary SYSTEM_MYSQL_CONNECTOR_CPP"
Change-Id: I6ca1869edcfb42a1ffa77b791527e53d774117f5
Reviewed-on: https://gerrit.libreoffice.org/59781
Tested-by: Jenkins
Reviewed-by: Rene Engelhard <rene at debian.org>
Tested-by: Rene Engelhard <rene at debian.org>
diff --git a/configure.ac b/configure.ac
index 3be9d4efcc43..8a0de7e22435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1742,11 +1742,6 @@ AC_ARG_ENABLE(bundle-mariadb,
[When using MariaDB/MySQL libraries already on system, bundle them with the MariaDB Connector/LibreOffice.])
)
-AC_ARG_WITH(system-mysql-cppconn,
- AS_HELP_STRING([--with-system-mysql-cppconn],
- [Use MySQL C++ Connector libraries already on system.]),,
- [with_system_mysql_cppconn="$with_system_libs"])
-
AC_ARG_WITH(system-postgresql,
AS_HELP_STRING([--with-system-postgresql],
[Use PostgreSQL libraries already on system, for building the PostgreSQL-SDBC
@@ -3815,11 +3810,6 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then
else
with_system_graphite=no
fi
- if test "$with_system_mysql_cppconn" = "yes"; then
- AC_MSG_ERROR([--with-system-mysql-cppconn conflicts with --enable-dbgutil])
- else
- with_system_mysql_cppconn=no
- fi
if test "$with_system_orcus" = "yes"; then
AC_MSG_ERROR([--with-system-orcus conflicts with --enable-dbgutil])
else
More information about the Libreoffice-commits
mailing list