diff options
| -rw-r--r-- | bfd/ChangeLog | 3 | ||||
| -rwxr-xr-x | bfd/configure | 60 | ||||
| -rw-r--r-- | bfd/configure.in | 3 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 5 |
4 files changed, 53 insertions, 18 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b199e06..e803efc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,8 @@ Tue Nov 7 13:48:58 1995 Ian Lance Taylor <ian@cygnus.com> + * configure.in: Call AC_CHECK_PROG to find and cache AR. + * configure: Rebuilt. + * aclocal.m4 (BFD_CC_FOR_BUILD): Don't define CC_FOR_BUILD if it is defined in the environment. diff --git a/bfd/configure b/bfd/configure index 5648107..3ba179d 100755 --- a/bfd/configure +++ b/bfd/configure @@ -589,7 +589,33 @@ rm -f conftest* -AR=${AR-ar} +# Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR=":" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -687,7 +713,7 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <<EOF -#line 691 "configure" +#line 717 "configure" #include "confdefs.h" main(){return(0);} EOF @@ -704,10 +730,12 @@ cross_compiling=$ac_cv_c_cross echo "$ac_t""$ac_cv_c_cross" 1>&6 # Put a plausible default for CC_FOR_BUILD in Makefile. -if test "x$cross_compiling" = "xno"; then - CC_FOR_BUILD='$(CC)' -else - CC_FOR_BUILD=gcc +if test -z "$CC_FOR_BUILD"; then + if test "x$cross_compiling" = "xno"; then + CC_FOR_BUILD='$(CC)' + else + CC_FOR_BUILD=gcc + fi fi @@ -726,7 +754,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 730 "configure" +#line 758 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -740,7 +768,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 744 "configure" +#line 772 "configure" #include "confdefs.h" #include <assert.h> Syntax Error @@ -773,7 +801,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 777 "configure" +#line 805 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -809,7 +837,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 813 "configure" +#line 841 "configure" #include "confdefs.h" #include <$ac_hdr> EOF @@ -844,7 +872,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 848 "configure" +#line 876 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -902,7 +930,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 906 "configure" +#line 934 "configure" #include "confdefs.h" #include <stdio.h> @@ -941,7 +969,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 945 "configure" +#line 973 "configure" #include "confdefs.h" #include <stdio.h> @@ -1232,7 +1260,7 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1236 "configure" +#line 1264 "configure" #include "confdefs.h" #include <sys/procfs.h> int main() { return 0; } @@ -1518,7 +1546,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <<EOF -#line 1522 "configure" +#line 1550 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. */ @@ -1617,7 +1645,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1621 "configure" +#line 1649 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ diff --git a/bfd/configure.in b/bfd/configure.in index 3508aed..8b18868 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -39,8 +39,7 @@ target64=false AC_PROG_CC AC_SUBST(CFLAGS) AC_SUBST(HDEFINES) -AR=${AR-ar} -AC_SUBST(AR) +AC_CHECK_PROG(AR, ar, ar, :) AC_PROG_RANLIB AC_PROG_INSTALL diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 5873a66..6e463b6 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 7 15:21:06 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Call AC_CHECK_PROG to find and cache AR. + * configure: Rebuilt. + Mon Nov 6 17:39:47 1995 Harry Dolan <dolan@ssd.intel.com> * configure.in: Add case for bfd_i860_arch. |