Package: autoconf-archive
Version: 20190106-2.1
Tags: patch upstream
User: [email protected]
Usertags: ftcbfs
Control: affects -1 + src:apophenia
apophenia fails to cross build from source, because it fails to locate
the mysql client libraries. It does so via the AX_LIB_MYSQL macro, which
consults mysql_config, which cannot work during cross builds. Please use
pkg-config instead. I'm attaching a patch that extends the AX_LIB_MYSQL
macro to try pkg-config before mysql_config.
Helmut
--- autoconf-archive-20190106.orig/m4/ax_lib_mysql.m4
+++ autoconf-archive-20190106/m4/ax_lib_mysql.m4
@@ -73,23 +73,28 @@
dnl Check MySQL libraries
dnl
- if test "$want_mysql" = "yes"; then
+ AS_IF([test "$want_mysql" = "yes"],[
- if test -z "$MYSQL_CONFIG" ; then
- AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mysql_config5], [no])
- fi
+ found_mysql=no
+ AS_IF([test -z "$MYSQL_CONFIG"],[
+ PKG_CHECK_MODULES([MYSQL],[mysqlclient],[
+ MYSQL_LDFLAGS=$MYSQL_LIBS
+ MYSQL_VERSION=`$PKG_CONFIG --modversion mysqlclient`
+ found_mysql=yes
+ ],[
+ AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mysql_config5], [no])
+ ])
+ ])
- if test "$MYSQL_CONFIG" != "no"; then
+ if test "$found_mysql" = no && test "$MYSQL_CONFIG" != "no"; then
MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
MYSQL_VERSION=`$MYSQL_CONFIG --version`
found_mysql="yes"
- else
- found_mysql="no"
fi
- fi
+ ])
dnl
dnl Check if required version of MySQL is available
