Changeset 42cd451 for libcfa


Ignore:
Timestamp:
Jul 24, 2020, 12:49:13 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
f4ec4a90
Parents:
f854ee32 (diff), e262b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • libcfa/configure

    rf854ee32 r42cd451  
    677677AMDEP_FALSE
    678678AMDEP_TRUE
     679am__quote
    679680am__include
    680681DEPDIR
    … …  
    783784PACKAGE_NAME
    784785PATH_SEPARATOR
    785 SHELL
    786 am__quote'
     786SHELL'
    787787ac_subst_files=''
    788788ac_user_opts='
    … …  
    25322532
    25332533
    2534 am__api_version='1.16'
     2534am__api_version='1.15'
    25352535
    25362536# Find a good install program.  We prefer a C program (faster),
    … …  
    30093009# For better backward compatibility.  To be removed once Automake 1.9.x
    30103010# dies out for good.  For more background, see:
    3011 # <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
    3012 # <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
     3011# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
     3012# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
    30133013mkdir_p='$(MKDIR_P)'
    30143014
    … …  
    30613061
    30623062You can download and install GNU coreutils to get an 'rm' implementation
    3063 that behaves properly: <https://www.gnu.org/software/coreutils/>.
     3063that behaves properly: <http://www.gnu.org/software/coreutils/>.
    30643064
    30653065If you want to complete the configuration process using your problematic
    … …  
    34453445ac_config_commands="$ac_config_commands depfiles"
    34463446
    3447 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
    3448 $as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
    3449 cat > confinc.mk << 'END'
     3447
     3448am_make=${MAKE-make}
     3449cat > confinc << 'END'
    34503450am__doit:
    3451         @echo this is the am__doit target >confinc.out
     3451        @echo this is the am__doit target
    34523452.PHONY: am__doit
    34533453END
     3454# If we don't find an include directive, just comment out the code.
     3455{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
     3456$as_echo_n "checking for style of include used by $am_make... " >&6; }
    34543457am__include="#"
    34553458am__quote=
    3456 # BSD make does it like this.
    3457 echo '.include "confinc.mk" # ignored' > confmf.BSD
    3458 # Other make implementations (GNU, Solaris 10, AIX) do it like this.
    3459 echo 'include confinc.mk # ignored' > confmf.GNU
    3460 _am_result=no
    3461 for s in GNU BSD; do
    3462   { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
    3463    (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
    3464    ac_status=$?
    3465    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    3466    (exit $ac_status); }
    3467   case $?:`cat confinc.out 2>/dev/null` in #(
    3468   '0:this is the am__doit target') :
    3469     case $s in #(
    3470   BSD) :
    3471     am__include='.include' am__quote='"' ;; #(
    3472   *) :
    3473     am__include='include' am__quote='' ;;
    3474 esac ;; #(
    3475   *) :
     3459_am_result=none
     3460# First try GNU make style include.
     3461echo "include confinc" > confmf
     3462# Ignore all kinds of additional output from 'make'.
     3463case `$am_make -s -f confmf 2> /dev/null` in #(
     3464*the\ am__doit\ target*)
     3465  am__include=include
     3466  am__quote=
     3467  _am_result=GNU
     3468  ;;
     3469esac
     3470# Now try BSD make style include.
     3471if test "$am__include" = "#"; then
     3472   echo '.include "confinc"' > confmf
     3473   case `$am_make -s -f confmf 2> /dev/null` in #(
     3474   *the\ am__doit\ target*)
     3475     am__include=.include
     3476     am__quote="\""
     3477     _am_result=BSD
    34763478     ;;
    3477 esac
    3478   if test "$am__include" != "#"; then
    3479     _am_result="yes ($s style)"
    3480     break
    3481   fi
    3482 done
    3483 rm -f confinc.* confmf.*
    3484 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
    3485 $as_echo "${_am_result}" >&6; }
     3479   esac
     3480fi
     3481
     3482
     3483{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
     3484$as_echo "$_am_result" >&6; }
     3485rm -f confinc confmf
    34863486
    34873487# Check whether --enable-dependency-tracking was given.
    … …  
    59875987
    59885988: ${AR=ar}
    5989 : ${AR_FLAGS=cr}
     5989: ${AR_FLAGS=cru}
    59905990
    59915991
    … …  
    64886488    # Now try to grab the symbols.
    64896489    nlist=conftest.nm
    6490     $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
    6491     if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
     6490    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
     6491  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
     6492  ac_status=$?
     6493  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     6494  test $ac_status = 0; } && test -s "$nlist"; then
    64926495      # Try sorting and uniquifying the output.
    64936496      if sort "$nlist" | uniq > "$nlist"T; then
    … …  
    77087711      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
    77097712      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
    7710       echo "$AR cr libconftest.a conftest.o" >&5
    7711       $AR cr libconftest.a conftest.o 2>&5
     7713      echo "$AR cru libconftest.a conftest.o" >&5
     7714      $AR cru libconftest.a conftest.o 2>&5
    77127715      echo "$RANLIB libconftest.a" >&5
    77137716      $RANLIB libconftest.a 2>&5
    … …  
    88358838        lt_prog_compiler_wl='-Wl,'
    88368839        lt_prog_compiler_pic='-KPIC'
    8837         lt_prog_compiler_static='-static'
    8838         ;;
    8839       # flang / f18. f95 an alias for gfortran or flang on Debian
    8840       flang* | f18* | f95*)
    8841         lt_prog_compiler_wl='-Wl,'
    8842         lt_prog_compiler_pic='-fPIC'
    88438840        lt_prog_compiler_static='-static'
    88448841        ;;
    … …  
    1320313200      # what "hidden" libraries, object files and flags are used when
    1320413201      # linking a shared library.
    13205       output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
     13202      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
    1320613203
    1320713204    else
    … …  
    1369513692            # from the output so that they don't get included in the library
    1369613693            # dependencies.
    13697             output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
     13694            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
    1369813695            ;;
    1369913696          *)
    … …  
    1376013757            # from the output so that they don't get included in the library
    1376113758            # dependencies.
    13762             output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
     13759            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
    1376313760            ;;
    1376413761          *)
    … …  
    1409914096              # what "hidden" libraries, object files and flags are used when
    1410014097              # linking a shared library.
    14101               output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
     14098              output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
    1410214099
    1410314100            else
    … …  
    1418314180                # what "hidden" libraries, object files and flags are used when
    1418414181                # linking a shared library.
    14185                 output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
     14182                output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
    1418614183              else
    1418714184                # g++ 2.7 appears to require '-G' NOT '-shared' on this
    … …  
    1419414191                # what "hidden" libraries, object files and flags are used when
    1419514192                # linking a shared library.
    14196                 output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
     14193                output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
    1419714194              fi
    1419814195
    … …  
    2006120058# INIT-COMMANDS
    2006220059#
    20063 AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
     20060AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
    2006420061
    2006520062
    … …  
    2105721054  # are listed without --file.  Let's play safe and only enable the eval
    2105821055  # if we detect the quoting.
    21059   # TODO: see whether this extra hack can be removed once we start
    21060   # requiring Autoconf 2.70 or later.
    21061   case $CONFIG_FILES in #(
    21062   *\'*) :
    21063     eval set x "$CONFIG_FILES" ;; #(
    21064   *) :
    21065     set x $CONFIG_FILES ;; #(
    21066   *) :
    21067      ;;
    21068 esac
     21056  case $CONFIG_FILES in
     21057  *\'*) eval set x "$CONFIG_FILES" ;;
     21058  *)   set x $CONFIG_FILES ;;
     21059  esac
    2106921060  shift
    21070   # Used to flag and report bootstrapping failures.
    21071   am_rc=0
    21072   for am_mf
     21061  for mf
    2107321062  do
    2107421063    # Strip MF so we end up with the name of the file.
    21075     am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
    21076     # Check whether this is an Automake generated Makefile which includes
    21077     # dependency-tracking related rules and includes.
    21078     # Grep'ing the whole file directly is not great: AIX grep has a line
     21064    mf=`echo "$mf" | sed -e 's/:.*$//'`
     21065    # Check whether this is an Automake generated Makefile or not.
     21066    # We used to match only the files named 'Makefile.in', but
     21067    # some people rename them; so instead we look at the file content.
     21068    # Grep'ing the first line is not enough: some people post-process
     21069    # each Makefile.in and add a new line on top of each file to say so.
     21070    # Grep'ing the whole file is not good either: AIX grep has a line
    2107921071    # limit of 2048, but all sed's we know have understand at least 4000.
    21080     sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
    21081       || continue
    21082     am_dirpart=`$as_dirname -- "$am_mf" ||
    21083 $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    21084          X"$am_mf" : 'X\(//\)[^/]' \| \
    21085          X"$am_mf" : 'X\(//\)$' \| \
    21086          X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
    21087 $as_echo X"$am_mf" |
     21072    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     21073      dirpart=`$as_dirname -- "$mf" ||
     21074$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     21075         X"$mf" : 'X\(//\)[^/]' \| \
     21076         X"$mf" : 'X\(//\)$' \| \
     21077         X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
     21078$as_echo X"$mf" |
    2108821079    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
    2108921080            s//\1/
    … …  
    2110321094          }
    2110421095          s/.*/./; q'`
    21105     am_filepart=`$as_basename -- "$am_mf" ||
    21106 $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
    21107          X"$am_mf" : 'X\(//\)$' \| \
    21108          X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
    21109 $as_echo X/"$am_mf" |
    21110     sed '/^.*\/\([^/][^/]*\)\/*$/{
     21096    else
     21097      continue
     21098    fi
     21099    # Extract the definition of DEPDIR, am__include, and am__quote
     21100    # from the Makefile without running 'make'.
     21101    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     21102    test -z "$DEPDIR" && continue
     21103    am__include=`sed -n 's/^am__include = //p' < "$mf"`
     21104    test -z "$am__include" && continue
     21105    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     21106    # Find all dependency output files, they are included files with
     21107    # $(DEPDIR) in their names.  We invoke sed twice because it is the
     21108    # simplest approach to changing $(DEPDIR) to its actual value in the
     21109    # expansion.
     21110    for file in `sed -n "
     21111      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
     21112         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
     21113      # Make sure the directory exists.
     21114      test -f "$dirpart/$file" && continue
     21115      fdir=`$as_dirname -- "$file" ||
     21116$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     21117         X"$file" : 'X\(//\)[^/]' \| \
     21118         X"$file" : 'X\(//\)$' \| \
     21119         X"$file" : 'X\(/\)' \| . 2>/dev/null ||
     21120$as_echo X"$file" |
     21121    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
    2111121122            s//\1/
    2111221123            q
    2111321124          }
    21114           /^X\/\(\/\/\)$/{
     21125          /^X\(\/\/\)[^/].*/{
    2111521126            s//\1/
    2111621127            q
    2111721128          }
    21118           /^X\/\(\/\).*/{
     21129          /^X\(\/\/\)$/{
     21130            s//\1/
     21131            q
     21132          }
     21133          /^X\(\/\).*/{
    2111921134            s//\1/
    2112021135            q
    2112121136          }
    2112221137          s/.*/./; q'`
    21123     { echo "$as_me:$LINENO: cd "$am_dirpart" \
    21124       && sed -e '/# am--include-marker/d' "$am_filepart" \
    21125         | $MAKE -f - am--depfiles" >&5
    21126    (cd "$am_dirpart" \
    21127       && sed -e '/# am--include-marker/d' "$am_filepart" \
    21128         | $MAKE -f - am--depfiles) >&5 2>&5
    21129    ac_status=$?
    21130    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    21131    (exit $ac_status); } || am_rc=$?
     21138      as_dir=$dirpart/$fdir; as_fn_mkdir_p
     21139      # echo "creating $dirpart/$file"
     21140      echo '# dummy' > "$dirpart/$file"
     21141    done
    2113221142  done
    21133   if test $am_rc -ne 0; then
    21134     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    21135 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    21136 as_fn_error $? "Something went wrong bootstrapping makefile fragments
    21137     for automatic dependency tracking.  Try re-running configure with the
    21138     '--disable-dependency-tracking' option to at least be able to build
    21139     the package (albeit without support for automatic dependency tracking).
    21140 See \`config.log' for more details" "$LINENO" 5; }
    21141   fi
    21142   { am_dirpart=; unset am_dirpart;}
    21143   { am_filepart=; unset am_filepart;}
    21144   { am_mf=; unset am_mf;}
    21145   { am_rc=; unset am_rc;}
    21146   rm -f conftest-deps.mk
    2114721143}
    2114821144 ;;
    … …  
    2116221158#! $SHELL
    2116321159# Generated automatically by $as_me ($PACKAGE) $VERSION
     21160# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
    2116421161# NOTE: Changes made to this file will be lost: look at ltmain.sh.
    2116521162
Note: See TracChangeset for help on using the changeset viewer.