]> git.ipfire.org Git - thirdparty/ulogd2.git/commitdiff
ulogd: fix cross compilation errors with mysql_config
authorHelmut Schaa <helmut.schaa@googlemail.com>
Fri, 18 Mar 2016 14:43:24 +0000 (15:43 +0100)
committerEric Leblond <eric@regit.org>
Thu, 31 Mar 2016 06:36:17 +0000 (08:36 +0200)
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 <helmut.schaa@googlemail.com>
acinclude.m4

index 56d47b89ea4cbf3267170e157a1af03d863d83f6..bd21255b56ceb045738da4b1491d049925e7b90c 100644 (file)
@@ -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`