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

Hack for mysql_config under linux32

Browse Source 
Change-Id: I3a6b4aae36df7e23c05da9fd27b0588a6228b92b
This commit is contained in:
Stephan Bergmann
2014-02-14 15:10:32 +01:00
parent 7273e371be
commit bfd6428fff
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@@ -8056,6 +8056,14 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-fstack-protector-strong//) MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-fstack-protector-strong//)
fi fi
MARIADB_LIBS=`$MARIADBCONFIG --libs_r` MARIADB_LIBS=`$MARIADBCONFIG --libs_r`
dnl At least mariadb-5.5.34-3.fc20.x86_64 plus
dnl mariadb-5.5.34-3.fc20.i686 reports 64-bit specific output even under
dnl linux32:
if test "$OS" = LINUX -a "$CPUNAME" = INTEL; then
MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-m64//)
MARIADB_LIBS=$(printf '%s' "$MARIADB_LIBS" \
| sed -e 's|/lib64/|/lib/|')
fi
AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS']) AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS'])
AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library]) AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
if test "$enable_bundle_mariadb" = "yes"; then if test "$enable_bundle_mariadb" = "yes"; then