From 4d3f937abd9df3b51ae0f76825fc403958ee6805 Mon Sep 17 00:00:00 2001
From: jfarrell <jfarrell@apache.org>
Date: Wed, 8 Oct 2014 23:35:05 -0400
Subject: THRIFT-2127: Autoconf scripting does not properly account for
 cross-compile Client: build Patch: Frank Earl

Updated patch to add lt_sysroot to help with cross-compiling
---
 aclocal/ax_boost_base.m4 | 4 ++--
 aclocal/ax_lib_event.m4  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'aclocal')

diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4
index 8e6ee9a9b..b496020e4 100644
--- a/aclocal/ax_boost_base.m4
+++ b/aclocal/ax_boost_base.m4
@@ -121,7 +121,7 @@ if test "x$want_boost" = "xyes"; then
                 fi
         done
     elif test "$cross_compiling" != yes; then
-        for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+        for ac_boost_path_tmp in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do
             if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
                 for libsubdir in $libsubdirs ; do
                     if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
@@ -185,7 +185,7 @@ if test "x$want_boost" = "xyes"; then
             fi
         else
             if test "$cross_compiling" != yes; then
-                for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+                for ac_boost_path in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do
                     if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
                         for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
                             _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
diff --git a/aclocal/ax_lib_event.m4 b/aclocal/ax_lib_event.m4
index 7d2f98a83..cf6c4c2d5 100644
--- a/aclocal/ax_lib_event.m4
+++ b/aclocal/ax_lib_event.m4
@@ -165,7 +165,7 @@ AC_DEFUN([AX_LIB_EVENT],
             if test -n "$ax_libevent_path"; then
               AX_LIB_EVENT_DO_CHECK
             else
-              for ax_libevent_path in "" /usr /usr/local /opt /opt/local /opt/libevent "$LIBEVENT_ROOT" ; do
+              for ax_libevent_path in "" $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local $lt_sysroot/opt/libevent "$LIBEVENT_ROOT" ; do
                 AX_LIB_EVENT_DO_CHECK
                 if test "$success" = "yes"; then
                   break;
-- 
cgit v1.2.1