apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1671296 - in /apr/apr/trunk: CHANGES build/dbd.m4 configure.in
Date Sat, 04 Apr 2015 19:23:03 GMT
Author: trawick
Date: Sat Apr  4 19:23:03 2015
New Revision: 1671296

URL: http://svn.apache.org/r1671296
Log:
build: Correctly use AC_(PATH|CHECK)_TOOL to support cross compilation.

PR: 56866
Submitted by: Timothy Gu <timothygu99 gmail.com>
Reviewed by: trawick

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/dbd.m4
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1671296&r1=1671295&r2=1671296&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sat Apr  4 19:23:03 2015
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) build: Correctly use AC_(PATH|CHECK)_TOOL to support cross compilation.
+     PR: 56866.  [Timothy Gu <timothygu99 gmail.com>]
+
   *) apr_queue: Add apr_queue_timedpush() and apr_queue_timedpop() to
      support timedout operations. PR 56951. [Anthony Minessale <anthm
      freeswitch org>, Travis Cross <tc+asf travislists com>, Yann Ylavic].

Modified: apr/apr/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbd.m4?rev=1671296&r1=1671295&r2=1671296&view=diff
==============================================================================
--- apr/apr/trunk/build/dbd.m4 (original)
+++ apr/apr/trunk/build/dbd.m4 Sat Apr  4 19:23:03 2015
@@ -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`"

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=1671296&r1=1671295&r2=1671296&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Sat Apr  4 19:23:03 2015
@@ -219,8 +219,8 @@ AC_PROG_LN_S
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_CHECK_PROG(RM, rm, rm)
-AC_CHECK_PROG(AS, as, as)
-AC_CHECK_PROG(ASCPP, cpp, cpp)
+AC_CHECK_TOOL(AS, as, as)
+AC_CHECK_TOOL(ASCPP, cpp, cpp)
 AC_CHECK_TOOL(AR, ar, ar)
 
 dnl Various OS checks that apparently set required flags



Mime
View raw message