Ignore:
Timestamp:
Apr 28, 2004, 6:58:06 AM (21 years ago)
Author:
bird
Message:

#1040: Joined the GCC 3.3.3 with the trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gcc/zlib/configure

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1393 r1394  
    850850
    851851# This works around an automake problem.
    852 mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs"
     852mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
    853853
    854854
     
    16471647  hppa*)
    16481648    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
    1649   lt_cv_file_magic_cmd=/usr/bin/file
    1650   lt_cv_file_magic_test_file=/usr/lib/libc.sl
     1649    lt_cv_file_magic_cmd=/usr/bin/file
     1650    lt_cv_file_magic_test_file=/usr/lib/libc.sl
    16511651    ;;
    16521652  ia64*)
     
    16541654    lt_cv_file_magic_cmd=/usr/bin/file
    16551655    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
    1656   ;;
     1656    ;;
    16571657  esac
    16581658  ;;
     
    16821682linux-gnu*)
    16831683  case $host_cpu in
    1684   alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
     1684  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
    16851685    lt_cv_deplibs_check_method=pass_all ;;
    16861686  *)
     
    21352135  ;;
    21362136
     2137x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     2138  # Find out which ABI we are using.
     2139  echo 'int i;' > conftest.$ac_ext
     2140  if { (eval echo configure:2141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2141    case "`/usr/bin/file conftest.o`" in
     2142    *32-bit*)
     2143      case $host in
     2144        x86_64-*linux*)
     2145          LD="${LD-ld} -m elf_i386"
     2146          ;;
     2147        ppc64-*linux*|powerpc64-*linux*)
     2148          LD="${LD-ld} -m elf32ppclinux"
     2149          ;;
     2150        s390x-*linux*)
     2151          LD="${LD-ld} -m elf_s390"
     2152          ;;
     2153        sparc64-*linux*)
     2154          LD="${LD-ld} -m elf32_sparc"
     2155          ;;
     2156      esac
     2157      ;;
     2158    *64-bit*)
     2159      case $host in
     2160        x86_64-*linux*)
     2161          LD="${LD-ld} -m elf_x86_64"
     2162          ;;
     2163        ppc*-*linux*|powerpc*-*linux*)
     2164          LD="${LD-ld} -m elf64ppc"
     2165          ;;
     2166        s390*-*linux*)
     2167          LD="${LD-ld} -m elf64_s390"
     2168          ;;
     2169        sparc*-*linux*)
     2170          LD="${LD-ld} -m elf64_sparc"
     2171          ;;
     2172      esac
     2173      ;;
     2174    esac
     2175  fi
     2176  rm -rf conftest*
     2177  ;;
     2178
    21372179*-*-sco3.2v5*)
    21382180  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
     
    21402182  CFLAGS="$CFLAGS -belf"
    21412183  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
    2142 echo "configure:2143: checking whether the C compiler needs -belf" >&5
     2184echo "configure:2185: checking whether the C compiler needs -belf" >&5
    21432185if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    21442186  echo $ac_n "(cached) $ac_c" 1>&6
     
    21532195
    21542196     cat > conftest.$ac_ext <<EOF
    2155 #line 2156 "configure"
     2197#line 2198 "configure"
    21562198#include "confdefs.h"
    21572199
     
    21602202; return 0; }
    21612203EOF
    2162 if { (eval echo configure:2163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2204if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    21632205  rm -rf conftest*
    21642206  lt_cv_cc_needs_belf=yes
     
    22862328# thereby make the resulting definitions conditional.
    22872329echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    2288 echo "configure:2289: checking how to run the C preprocessor" >&5
     2330echo "configure:2331: checking how to run the C preprocessor" >&5
    22892331# On Suns, sometimes $CPP names a directory.
    22902332if test -n "$CPP" && test -d "$CPP"; then
     
    23022344  cat > conftest.$ac_ext <<EOF
    23032345#include <sys/types.h>
    2304 #line 2305 "configure"
     2346#line 2347 "configure"
    23052347#include "confdefs.h"
    23062348#include <assert.h>
     
    23082350EOF
    23092351ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2310 { (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2352{ (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    23112353ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    23122354if test -z "$ac_err"; then
     
    23202362  cat > conftest.$ac_ext <<EOF
    23212363#include <sys/types.h>
    2322 #line 2323 "configure"
     2364#line 2365 "configure"
    23232365#include "confdefs.h"
    23242366#include <assert.h>
     
    23262368EOF
    23272369ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2328 { (eval echo configure:2329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2370{ (eval echo configure:2371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    23292371ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    23302372if test -z "$ac_err"; then
     
    23382380  cat > conftest.$ac_ext <<EOF
    23392381#include <sys/types.h>
    2340 #line 2341 "configure"
     2382#line 2383 "configure"
    23412383#include "confdefs.h"
    23422384#include <assert.h>
     
    23442386EOF
    23452387ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2346 { (eval echo configure:2347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2388{ (eval echo configure:2389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    23472389ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    23482390if test -z "$ac_err"; then
     
    23922434ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    23932435echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2394 echo "configure:2395: checking for $ac_hdr" >&5
     2436echo "configure:2437: checking for $ac_hdr" >&5
    23952437if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    23962438  echo $ac_n "(cached) $ac_c" 1>&6
     
    23982440  cat > conftest.$ac_ext <<EOF
    23992441#include <sys/types.h>
    2400 #line 2401 "configure"
     2442#line 2443 "configure"
    24012443#include "confdefs.h"
    24022444#include <$ac_hdr>
    24032445EOF
    24042446ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2405 { (eval echo configure:2406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2447{ (eval echo configure:2448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    24062448ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    24072449if test -z "$ac_err"; then
     
    24322474do
    24332475echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2434 echo "configure:2435: checking for $ac_func" >&5
     2476echo "configure:2477: checking for $ac_func" >&5
    24352477if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    24362478  echo $ac_n "(cached) $ac_c" 1>&6
    24372479else
    24382480  cat > conftest.$ac_ext <<EOF
    2439 #line 2440 "configure"
     2481#line 2482 "configure"
    24402482#include "confdefs.h"
    24412483/* System header to define __stub macros and hopefully few prototypes,
     
    24602502; return 0; }
    24612503EOF
    2462 if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2504if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    24632505  rm -rf conftest*
    24642506  eval "ac_cv_func_$ac_func=yes"
     
    24852527
    24862528echo $ac_n "checking for working mmap""... $ac_c" 1>&6
    2487 echo "configure:2488: checking for working mmap" >&5
     2529echo "configure:2530: checking for working mmap" >&5
    24882530if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
    24892531  echo $ac_n "(cached) $ac_c" 1>&6
     
    24932535else
    24942536  cat > conftest.$ac_ext <<EOF
    2495 #line 2496 "configure"
     2537#line 2538 "configure"
    24962538#include "confdefs.h"
    24972539
     
    26332675
    26342676EOF
    2635 if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2677if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    26362678then
    26372679  ac_cv_func_mmap_fixed_mapped=yes
     
    26582700do
    26592701echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
    2660 echo "configure:2661: checking for $ac_func" >&5
     2702echo "configure:2703: checking for $ac_func" >&5
    26612703if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    26622704  echo $ac_n "(cached) $ac_c" 1>&6
    26632705else
    26642706  cat > conftest.$ac_ext <<EOF
    2665 #line 2666 "configure"
     2707#line 2708 "configure"
    26662708#include "confdefs.h"
    26672709/* System header to define __stub macros and hopefully few prototypes,
     
    26862728; return 0; }
    26872729EOF
    2688 if { (eval echo configure:2689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2730if { (eval echo configure:2731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    26892731  rm -rf conftest*
    26902732  eval "ac_cv_func_$ac_func=yes"
     
    27132755   if test "$with_system_zlib" = yes; then
    27142756      echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
    2715 echo "configure:2716: checking for deflate in -lz" >&5
     2757echo "configure:2758: checking for deflate in -lz" >&5
    27162758ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
    27172759if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
     
    27212763LIBS="-lz  $LIBS"
    27222764cat > conftest.$ac_ext <<EOF
    2723 #line 2724 "configure"
     2765#line 2766 "configure"
    27242766#include "confdefs.h"
    27252767/* Override any gcc2 internal prototype to avoid an error.  */
     
    27322774; return 0; }
    27332775EOF
    2734 if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2776if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    27352777  rm -rf conftest*
    27362778  eval "ac_cv_lib_$ac_lib_var=yes"
     
    27642806ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    27652807echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2766 echo "configure:2767: checking for $ac_hdr" >&5
     2808echo "configure:2809: checking for $ac_hdr" >&5
    27672809if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    27682810  echo $ac_n "(cached) $ac_c" 1>&6
     
    27702812  cat > conftest.$ac_ext <<EOF
    27712813#include <sys/types.h>
    2772 #line 2773 "configure"
     2814#line 2815 "configure"
    27732815#include "confdefs.h"
    27742816#include <$ac_hdr>
    27752817EOF
    27762818ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2777 { (eval echo configure:2778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2819{ (eval echo configure:2820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    27782820ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    27792821if test -z "$ac_err"; then
     
    28102852  toolexeclibdir='$(libdir)'
    28112853fi
    2812 toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .`
     2854if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
     2855  multiosdir=/`$CC -print-multi-os-directory`
     2856else
     2857  multiosdir=
     2858fi
     2859toolexeclibdir=${toolexeclibdir}${multiosdir}
    28132860
    28142861
     
    31383185CC="${CC}"
    31393186CXX="${CXX}"
     3187ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
    31403188
    31413189EOF
Note: See TracChangeset for help on using the changeset viewer.