From: Helmut Schaa Date: Fri, 18 Mar 2016 14:43:24 +0000 (+0100) Subject: ulogd: fix cross compilation errors with mysql_config X-Git-Tag: ulogd-2.0.7~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49a362eb8f9ffee4cee84ab45aa76df870ef77ec;p=thirdparty%2Fulogd2.git ulogd: fix cross compilation errors with mysql_config When cross-compiling ulogd, mysql_config and pg_config will return build host configuration not build target configuration. This leads to build failures if mysql_config is installed on the host system but mysql is not available on the build target. Fix this by not using mysql_config and pg_config for cross-compilation. Signed-off-by: Helmut Schaa --- diff --git a/acinclude.m4 b/acinclude.m4 index 56d47b8..bd21255 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -35,7 +35,7 @@ if test "$pg_prefix" != "no"; then AC_MSG_CHECKING([for PostgreSQL pg_config program]) for d in $pg_prefix/bin /usr/bin /usr/local/bin /usr/local/pgsql/bin /opt/pgsql/bin /opt/packages/pgsql/bin do - if test -x $d/pg_config + if test -x $d/pg_config -a "$cross_compiling" = "no"; then AC_MSG_RESULT(found pg_config in $d) PQINCPATH=`$d/pg_config --includedir` @@ -130,7 +130,7 @@ if test "$my_prefix" != "no"; then AC_MSG_CHECKING([for MySQL mysql_config program]) for d in $my_prefix/bin /usr/bin /usr/local/bin /usr/local/mysql/bin /opt/mysql/bin /opt/packages/mysql/bin do - if test -x $d/mysql_config + if test -x $d/mysql_config -a "$cross_compiling" = "no"; then AC_MSG_RESULT(found mysql_config in $d) MYSQL_INC=`$d/mysql_config --include`