diff options
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/acx.m4 | 2 | ||||
| -rwxr-xr-x | configure | 20 |
3 files changed, 16 insertions, 11 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index e07a8772dd0..3c43dcde1e6 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2007-06-27 Mike Stump <mrs@apple.com> + + * acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Fixup logic for cross + builds. + 2007-06-20 Mike Stump <mrs@apple.com> * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds. diff --git a/config/acx.m4 b/config/acx.m4 index 1bcf73ab061..c8a32c9f9ed 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -326,7 +326,7 @@ if test -z "$ac_cv_path_$1" ; then fi elif test $build != $host && test $have_gcc_for_target = yes; then $1=`$GCC_FOR_TARGET --print-prog-name=$2` - test [$]$1=$2 && $1= + test [$]$1 = $2 && $1= test -n "[$]$1" && ac_cv_path_$1=[$]$1 fi fi diff --git a/configure b/configure index fe956b1c5d6..fd10c209681 100755 --- a/configure +++ b/configure @@ -8527,7 +8527,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then AR_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ar` - test $AR_FOR_TARGET=ar && AR_FOR_TARGET= + test $AR_FOR_TARGET = ar && AR_FOR_TARGET= test -n "$AR_FOR_TARGET" && ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET fi fi @@ -8750,7 +8750,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then AS_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=as` - test $AS_FOR_TARGET=as && AS_FOR_TARGET= + test $AS_FOR_TARGET = as && AS_FOR_TARGET= test -n "$AS_FOR_TARGET" && ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET fi fi @@ -8973,7 +8973,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then DLLTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=dlltool` - test $DLLTOOL_FOR_TARGET=dlltool && DLLTOOL_FOR_TARGET= + test $DLLTOOL_FOR_TARGET = dlltool && DLLTOOL_FOR_TARGET= test -n "$DLLTOOL_FOR_TARGET" && ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET fi fi @@ -9196,7 +9196,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then LD_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ld` - test $LD_FOR_TARGET=ld && LD_FOR_TARGET= + test $LD_FOR_TARGET = ld && LD_FOR_TARGET= test -n "$LD_FOR_TARGET" && ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET fi fi @@ -9419,7 +9419,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then LIPO_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=lipo` - test $LIPO_FOR_TARGET=lipo && LIPO_FOR_TARGET= + test $LIPO_FOR_TARGET = lipo && LIPO_FOR_TARGET= test -n "$LIPO_FOR_TARGET" && ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET fi fi @@ -9642,7 +9642,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then NM_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=nm` - test $NM_FOR_TARGET=nm && NM_FOR_TARGET= + test $NM_FOR_TARGET = nm && NM_FOR_TARGET= test -n "$NM_FOR_TARGET" && ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET fi fi @@ -9865,7 +9865,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then OBJDUMP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=objdump` - test $OBJDUMP_FOR_TARGET=objdump && OBJDUMP_FOR_TARGET= + test $OBJDUMP_FOR_TARGET = objdump && OBJDUMP_FOR_TARGET= test -n "$OBJDUMP_FOR_TARGET" && ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET fi fi @@ -10088,7 +10088,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then RANLIB_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=ranlib` - test $RANLIB_FOR_TARGET=ranlib && RANLIB_FOR_TARGET= + test $RANLIB_FOR_TARGET = ranlib && RANLIB_FOR_TARGET= test -n "$RANLIB_FOR_TARGET" && ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET fi fi @@ -10311,7 +10311,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then STRIP_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=strip` - test $STRIP_FOR_TARGET=strip && STRIP_FOR_TARGET= + test $STRIP_FOR_TARGET = strip && STRIP_FOR_TARGET= test -n "$STRIP_FOR_TARGET" && ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET fi fi @@ -10534,7 +10534,7 @@ echo "${ECHO_T}no" >&6 fi elif test $build != $host && test $have_gcc_for_target = yes; then WINDRES_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=windres` - test $WINDRES_FOR_TARGET=windres && WINDRES_FOR_TARGET= + test $WINDRES_FOR_TARGET = windres && WINDRES_FOR_TARGET= test -n "$WINDRES_FOR_TARGET" && ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET fi fi |