diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2015-04-04 19:23:03 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2015-04-04 19:23:03 +0000 |
| commit | dc9b5be1a4106ccfac2eecc2a5433b8c29e25fe0 (patch) | |
| tree | 33e06d17f18609bd730749d0e5f025a188d85521 /build | |
| parent | 5bb55e0e537e8070469f78b7f1737ba7ee777b4d (diff) | |
| download | libapr-dc9b5be1a4106ccfac2eecc2a5433b8c29e25fe0.tar.gz | |
build: Correctly use AC_(PATH|CHECK)_TOOL to support cross compilation.
PR: 56866
Submitted by: Timothy Gu <timothygu99 gmail.com>
Reviewed by: trawick
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1671296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
| -rw-r--r-- | build/dbd.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index f5f6722c7..3ae967992 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -31,7 +31,7 @@ AC_DEFUN([APU_CHECK_DBD], [ AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]), [ if test "$withval" = "yes"; then - AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) + AC_PATH_TOOL([PGSQL_CONFIG],[pg_config]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" @@ -68,7 +68,7 @@ AC_DEFUN([APU_CHECK_DBD], [ elif test "$withval" = "no"; then : else - AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin]) + AC_PATH_TOOL([PGSQL_CONFIG],[pg_config],,[$withval/bin]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" @@ -108,7 +108,7 @@ AC_DEFUN([APU_CHECK_DBD], [ fi fi ], [ - AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) + AC_PATH_TOOL([PGSQL_CONFIG],[pg_config]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" @@ -166,7 +166,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ AC_ARG_WITH([mysql], APR_HELP_STRING([--with-mysql=DIR], [enable MySQL DBD driver]), [ if test "$withval" = "yes"; then - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config]) + AC_PATH_TOOL([MYSQL_CONFIG],[mysql_config]) if test "x$MYSQL_CONFIG" != 'x'; then mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" @@ -192,7 +192,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [ elif test "$withval" = "no"; then : else - AC_PATH_PROG([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) + AC_PATH_TOOL([MYSQL_CONFIG],[mysql_config],,[$withval/bin]) if test "x$MYSQL_CONFIG" != 'x'; then mysql_CPPFLAGS="`$MYSQL_CONFIG --include`" mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r | sed -e 's/-l[[^ ]]\+//g'`" @@ -420,7 +420,7 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [ AC_ARG_WITH([odbc], APR_HELP_STRING([--with-odbc=DIR], [specify ODBC location]), [ if test "$withval" = "yes"; then - AC_PATH_PROG([ODBC_CONFIG],[odbc_config]) + AC_PATH_TOOL([ODBC_CONFIG],[odbc_config]) if test "x$ODBC_CONFIG" != 'x'; then odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`" odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`" @@ -441,7 +441,7 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [ elif test "$withval" = "no"; then : else - AC_PATH_PROG([ODBC_CONFIG],[odbc_config],,[$withval/bin]) + AC_PATH_TOOL([ODBC_CONFIG],[odbc_config],,[$withval/bin]) if test "x$ODBC_CONFIG" != 'x'; then odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`" odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`" @@ -471,7 +471,7 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [ fi fi ], [ - AC_PATH_PROG([ODBC_CONFIG],[odbc_config]) + AC_PATH_TOOL([ODBC_CONFIG],[odbc_config]) if test "x$ODBC_CONFIG" != 'x'; then odbc_CPPFLAGS="-I`$ODBC_CONFIG --include-prefix`" odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`" |