diff options
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/acx.m4 | 4 | ||||
| -rwxr-xr-x | configure | 50 |
3 files changed, 48 insertions, 11 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index af27fc6..e07a877 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2007-06-20 Mike Stump <mrs@apple.com> + + * acx.m4 (NCN_STRICT_CHECK_TARGET_TOOLS): Fix incremental builds. + (ACX_HAVE_GCC_FOR_TARGET): Likewise. + 2007-06-14 Paolo Bonzini <bonzini@gnu.org> * acx.m4 (ACX_CHECK_PROG_VER): Remove duplicate lines. diff --git a/config/acx.m4 b/config/acx.m4 index a70d407..1bcf73a 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -211,6 +211,8 @@ if test -z "$ac_cv_prog_$1" ; then else $1="${ncn_target_tool_prefix}[$]2" fi], [$1="$3"]) +else + $1="$ac_cv_prog_$1" fi ]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS @@ -325,7 +327,7 @@ if test -z "$ac_cv_path_$1" ; then elif test $build != $host && test $have_gcc_for_target = yes; then $1=`$GCC_FOR_TARGET --print-prog-name=$2` test [$]$1=$2 && $1= - ac_cv_path_$1=[$]$1 + test -n "[$]$1" && ac_cv_path_$1=[$]$1 fi fi if test -z "$ac_cv_path_$1" && test -n "$gcc_cv_tool_dirs"; then @@ -7875,6 +7875,8 @@ if test -z "$ac_cv_prog_CC_FOR_TARGET" ; then else CC_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + CC_FOR_TARGET="$ac_cv_prog_CC_FOR_TARGET" fi @@ -8028,6 +8030,8 @@ if test -z "$ac_cv_prog_CXX_FOR_TARGET" ; then else CXX_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + CXX_FOR_TARGET="$ac_cv_prog_CXX_FOR_TARGET" fi @@ -8176,6 +8180,8 @@ fi if test -z "$ac_cv_prog_GCC_FOR_TARGET" ; then GCC_FOR_TARGET="${CC_FOR_TARGET}" +else + GCC_FOR_TARGET="$ac_cv_prog_GCC_FOR_TARGET" fi @@ -8329,6 +8335,8 @@ if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then else GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET" fi @@ -8482,6 +8490,8 @@ if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then else GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET" fi @@ -8518,7 +8528,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET + test -n "$AR_FOR_TARGET" && ac_cv_path_AR_FOR_TARGET=$AR_FOR_TARGET fi fi if test -z "$ac_cv_path_AR_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -8714,6 +8724,8 @@ if test -z "$ac_cv_prog_AR_FOR_TARGET" ; then else AR_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + AR_FOR_TARGET="$ac_cv_prog_AR_FOR_TARGET" fi else @@ -8739,7 +8751,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET + test -n "$AS_FOR_TARGET" && ac_cv_path_AS_FOR_TARGET=$AS_FOR_TARGET fi fi if test -z "$ac_cv_path_AS_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -8935,6 +8947,8 @@ if test -z "$ac_cv_prog_AS_FOR_TARGET" ; then else AS_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + AS_FOR_TARGET="$ac_cv_prog_AS_FOR_TARGET" fi else @@ -8960,7 +8974,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET + test -n "$DLLTOOL_FOR_TARGET" && ac_cv_path_DLLTOOL_FOR_TARGET=$DLLTOOL_FOR_TARGET fi fi if test -z "$ac_cv_path_DLLTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -9156,6 +9170,8 @@ if test -z "$ac_cv_prog_DLLTOOL_FOR_TARGET" ; then else DLLTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + DLLTOOL_FOR_TARGET="$ac_cv_prog_DLLTOOL_FOR_TARGET" fi else @@ -9181,7 +9197,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET + test -n "$LD_FOR_TARGET" && ac_cv_path_LD_FOR_TARGET=$LD_FOR_TARGET fi fi if test -z "$ac_cv_path_LD_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -9377,6 +9393,8 @@ if test -z "$ac_cv_prog_LD_FOR_TARGET" ; then else LD_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + LD_FOR_TARGET="$ac_cv_prog_LD_FOR_TARGET" fi else @@ -9402,7 +9420,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET + test -n "$LIPO_FOR_TARGET" && ac_cv_path_LIPO_FOR_TARGET=$LIPO_FOR_TARGET fi fi if test -z "$ac_cv_path_LIPO_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -9598,6 +9616,8 @@ if test -z "$ac_cv_prog_LIPO_FOR_TARGET" ; then else LIPO_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + LIPO_FOR_TARGET="$ac_cv_prog_LIPO_FOR_TARGET" fi else @@ -9623,7 +9643,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET + test -n "$NM_FOR_TARGET" && ac_cv_path_NM_FOR_TARGET=$NM_FOR_TARGET fi fi if test -z "$ac_cv_path_NM_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -9819,6 +9839,8 @@ if test -z "$ac_cv_prog_NM_FOR_TARGET" ; then else NM_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + NM_FOR_TARGET="$ac_cv_prog_NM_FOR_TARGET" fi else @@ -9844,7 +9866,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET + test -n "$OBJDUMP_FOR_TARGET" && ac_cv_path_OBJDUMP_FOR_TARGET=$OBJDUMP_FOR_TARGET fi fi if test -z "$ac_cv_path_OBJDUMP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -10040,6 +10062,8 @@ if test -z "$ac_cv_prog_OBJDUMP_FOR_TARGET" ; then else OBJDUMP_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + OBJDUMP_FOR_TARGET="$ac_cv_prog_OBJDUMP_FOR_TARGET" fi else @@ -10065,7 +10089,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET + test -n "$RANLIB_FOR_TARGET" && ac_cv_path_RANLIB_FOR_TARGET=$RANLIB_FOR_TARGET fi fi if test -z "$ac_cv_path_RANLIB_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -10261,6 +10285,8 @@ if test -z "$ac_cv_prog_RANLIB_FOR_TARGET" ; then else RANLIB_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + RANLIB_FOR_TARGET="$ac_cv_prog_RANLIB_FOR_TARGET" fi else @@ -10286,7 +10312,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET + test -n "$STRIP_FOR_TARGET" && ac_cv_path_STRIP_FOR_TARGET=$STRIP_FOR_TARGET fi fi if test -z "$ac_cv_path_STRIP_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -10482,6 +10508,8 @@ if test -z "$ac_cv_prog_STRIP_FOR_TARGET" ; then else STRIP_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + STRIP_FOR_TARGET="$ac_cv_prog_STRIP_FOR_TARGET" fi else @@ -10507,7 +10535,7 @@ echo "${ECHO_T}no" >&6 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= - ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET + test -n "$WINDRES_FOR_TARGET" && ac_cv_path_WINDRES_FOR_TARGET=$WINDRES_FOR_TARGET fi fi if test -z "$ac_cv_path_WINDRES_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then @@ -10703,6 +10731,8 @@ if test -z "$ac_cv_prog_WINDRES_FOR_TARGET" ; then else WINDRES_FOR_TARGET="${ncn_target_tool_prefix}$2" fi +else + WINDRES_FOR_TARGET="$ac_cv_prog_WINDRES_FOR_TARGET" fi else |