Changeset 3999


Ignore:
Timestamp:
Sep 11, 2019 8:29:18 AM (5 weeks ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/HSL/branches/autotools-update
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/branches/autotools-update/compile

    r3969 r3999  
    136136  outfile=
    137137  implib=
     138  linking=1
    138139  for arg
    139140  do
     
    220221          shift
    221222          ;;
     223        -c)
     224          linking=0
     225          set x "$@" "$1"
     226          shift
     227          ;;
    222228        *)
    223229          set x "$@" "$1"
     
    233239  # remove old $implib, so we can distinguish between generated and not-generated implib below
    234240  if test -n "$implib" && test -f "$implib" ; then rm "$implib" ; fi
     241
     242  # add path to MSVC link in front on PATH if we seem to link (check isn't so accurate, but some false-positives shouldn't matter)
     243  # compiler will call the link it finds in the PATH, and we don't want it to use MSYS' /bin/link
     244  # we assume that MSVC link is in same directory as cl and that cl is found in PATH
     245  if test "$linking" = 1 && comppath=`which cl 2>/dev/null` ; then
     246    comppath=`dirname "$comppath"`
     247    #echo "Adding $comppath to front of PATH"
     248    PATH="$comppath:$PATH"
     249  fi
    235250
    236251  #echo "compile: $@ $linker_opts"
  • ThirdParty/HSL/branches/autotools-update/configure

    r3984 r3999  
    725725LDFLAGS
    726726CFLAGS
    727 CC
    728727MAINT
    729728MAINTAINER_MODE_FALSE
     
    760759host_cpu
    761760host
     761CC
    762762build_os
    763763build_vendor
     
    24142414
    24152415
    2416 
    2417   # Check whether --enable-msvc was given.
    2418 if test "${enable_msvc+set}" = set; then :
    2419   enableval=$enable_msvc; enable_msvc=$enableval
    2420 else
    2421   enable_msvc=no
    2422 fi
    2423 
    2424 
    2425 
    2426   # We want --enable-msvc setup and checked
    2427 
    2428 
    2429   # Check whether --enable-debug was given.
    2430 if test "${enable_debug+set}" = set; then :
    2431   enableval=$enable_debug; enable_debug=$enableval
    2432 else
    2433   enable_debug=no
    2434 fi
    2435 
    2436 
    2437 # This macro should run before the compiler checks (doesn't seem to be
    2438 # sufficient for CFLAGS)
    2439 
    2440 
    2441 
    2442 
    2443 
    2444 
    2445 # change default compiler flags
    2446 # - debugging enabled: enable debug symbols (-g/-Z7)
    2447 # - debugging disabled: disable debug code (-DNDEBUG); enable (more) optimization (-O2)
    2448 # - enable exceptions for (i)cl
    2449 
    2450   if test "$enable_debug" = yes ; then
    2451     if test "$enable_msvc" = yes ; then
    2452       : ${FFLAGS:="-nologo -Z7 -MDd"}
    2453       : ${FCFLAGS:="-nologo -Z7 -MDd"}
    2454       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2455       : ${CXXFLAGS:="-nologo -EHsc -Z7 -MDd"}
    2456       : ${AR:="lib"}
    2457       : ${AR_FLAGS:="-nologo -out:"}
    2458     else
    2459       : ${FFLAGS:="-g"}
    2460       : ${FCFLAGS:="-g"}
    2461       : ${CFLAGS:="-g"}
    2462       : ${CXXFLAGS:="-g"}
    2463     fi
    2464   else
    2465     if test "$enable_msvc" = yes ; then
    2466       : ${FFLAGS:="-nologo -O2 -MD"}
    2467       : ${FCFLAGS:="-nologo -O2 -MD"}
    2468       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2469       : ${CXXFLAGS:="-nologo -EHsc -DNDEBUG -O2 -MD"}
    2470       : ${AR:="lib"}
    2471       : ${AR_FLAGS:="-nologo -out:"}
    2472     else
    2473       : ${FFLAGS:="-O2"}
    2474       : ${FCFLAGS:="-O2"}
    2475       : ${CFLAGS:="-O2 -DNDEBUG"}
    2476       : ${CXXFLAGS:="-O2 -DNDEBUG"}
    2477     fi
    2478   fi
    2479 
    24802416ac_aux_dir=
    24812417for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
     
    25442480case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
    25452481
     2482
     2483
     2484
     2485
     2486  # Check whether --enable-msvc was given.
     2487if test "${enable_msvc+set}" = set; then :
     2488  enableval=$enable_msvc; enable_msvc=$enableval
     2489else
     2490  enable_msvc=no
     2491     case $build in
     2492       *-mingw* | *-cygwin* | *-msys* )
     2493         for ac_prog in gcc clang icl cl
     2494do
     2495  # Extract the first word of "$ac_prog", so it can be a program name with args.
     2496set dummy $ac_prog; ac_word=$2
     2497{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2498$as_echo_n "checking for $ac_word... " >&6; }
     2499if ${ac_cv_prog_CC+:} false; then :
     2500  $as_echo_n "(cached) " >&6
     2501else
     2502  if test -n "$CC"; then
     2503  ac_cv_prog_CC="$CC" # Let the user override the test.
     2504else
     2505as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2506for as_dir in $PATH
     2507do
     2508  IFS=$as_save_IFS
     2509  test -z "$as_dir" && as_dir=.
     2510    for ac_exec_ext in '' $ac_executable_extensions; do
     2511  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2512    ac_cv_prog_CC="$ac_prog"
     2513    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2514    break 2
     2515  fi
     2516done
     2517  done
     2518IFS=$as_save_IFS
     2519
     2520fi
     2521fi
     2522CC=$ac_cv_prog_CC
     2523if test -n "$CC"; then
     2524  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     2525$as_echo "$CC" >&6; }
     2526else
     2527  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2528$as_echo "no" >&6; }
     2529fi
     2530
     2531
     2532  test -n "$CC" && break
     2533done
     2534
     2535         case "$CC" in *cl ) enable_msvc=yes ;; esac
     2536       ;;
     2537     esac
     2538fi
     2539
     2540
     2541
     2542  # We want --enable-msvc setup and checked
     2543
     2544
     2545  # Check whether --enable-debug was given.
     2546if test "${enable_debug+set}" = set; then :
     2547  enableval=$enable_debug; enable_debug=$enableval
     2548else
     2549  enable_debug=no
     2550fi
     2551
     2552
     2553# This macro should run before the compiler checks (doesn't seem to be
     2554# sufficient for CFLAGS)
     2555
     2556
     2557
     2558
     2559
     2560
     2561# change default compiler flags
     2562# - debugging enabled: enable debug symbols (-g/-Z7)
     2563# - debugging disabled: disable debug code (-DNDEBUG); enable (more) optimization (-O2)
     2564# - enable exceptions for (i)cl
     2565
     2566  if test "$enable_debug" = yes ; then
     2567    if test "$enable_msvc" = yes ; then
     2568      : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
     2569      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
     2570      : ${CFLAGS:="-nologo -Z7 -MDd"}
     2571      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2572      : ${AR:="lib"}
     2573      : ${AR_FLAGS:="-nologo -out:"}
     2574    else
     2575      : ${FFLAGS:="-g"}
     2576      : ${FCFLAGS:="-g"}
     2577      : ${CFLAGS:="-g"}
     2578      : ${CXXFLAGS:="-g"}
     2579    fi
     2580  else
     2581    if test "$enable_msvc" = yes ; then
     2582      : ${FFLAGS:="-nologo -fpp -O2 -MD"}
     2583      : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
     2584      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
     2585      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2586      : ${AR:="lib"}
     2587      : ${AR_FLAGS:="-nologo -out:"}
     2588    else
     2589      : ${FFLAGS:="-O2"}
     2590      : ${FCFLAGS:="-O2"}
     2591      : ${CFLAGS:="-O2 -DNDEBUG"}
     2592      : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2593    fi
     2594  fi
    25462595
    25472596{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     
    33533402
    33543403
    3355 # Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
    3356 # to invoke it from this macro first so that we can supply a parameter.
    3357 
    3358 
    3359 
    3360 # If enable-msvc, then test only for MS and Intel (on Windows) C compiler
    3361 # otherwise, test a long list of C compilers that comes into our mind
    3362 
     3404  # Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
     3405  # to invoke it from this macro first so that we can supply a parameter.
     3406
     3407
     3408  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
     3409  # explicitly and add compile-wrapper before AC_PROG_CC, because
     3410  # the compile-wrapper work around issues when having the wrong link.exe
     3411  # in the PATH first, which would upset tests in AC_PROG_CC.
     3412  # Further, if CC unset and not set by user, then stop with error.
    33633413  if test $enable_msvc = yes ; then
    3364     comps="icl cl"
    3365   else
    3366     # TODO old buildtools was doing some $build specific logic here, do we
    3367     # still need this?
    3368     comps="gcc clang cc icc icl cl cc xlc xlc_r pgcc"
     3414    for ac_prog in icl cl
     3415do
     3416  # Extract the first word of "$ac_prog", so it can be a program name with args.
     3417set dummy $ac_prog; ac_word=$2
     3418{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3419$as_echo_n "checking for $ac_word... " >&6; }
     3420if ${ac_cv_prog_CC+:} false; then :
     3421  $as_echo_n "(cached) " >&6
     3422else
     3423  if test -n "$CC"; then
     3424  ac_cv_prog_CC="$CC" # Let the user override the test.
     3425else
     3426as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3427for as_dir in $PATH
     3428do
     3429  IFS=$as_save_IFS
     3430  test -z "$as_dir" && as_dir=.
     3431    for ac_exec_ext in '' $ac_executable_extensions; do
     3432  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3433    ac_cv_prog_CC="$ac_prog"
     3434    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3435    break 2
    33693436  fi
     3437done
     3438  done
     3439IFS=$as_save_IFS
     3440
     3441fi
     3442fi
     3443CC=$ac_cv_prog_CC
     3444if test -n "$CC"; then
     3445  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3446$as_echo "$CC" >&6; }
     3447else
     3448  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3449$as_echo "no" >&6; }
     3450fi
     3451
     3452
     3453  test -n "$CC" && break
     3454done
     3455
     3456    if test -n "$CC" ; then
     3457      CC="$am_aux_dir/compile $CC"
     3458    else
     3459      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     3460    fi
     3461  fi
     3462
     3463  # look for some C compiler and check whether it works
     3464  # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
     3465  # other than CXX of F77, this macro also takes care of adding the compile-wrapper
    33703466  ac_ext=c
    33713467ac_cpp='$CPP $CPPFLAGS'
     
    33743470ac_compiler_gnu=$ac_cv_c_compiler_gnu
    33753471if test -n "$ac_tool_prefix"; then
    3376   for ac_prog in $comps
     3472  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
    33773473  do
    33783474    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     
    34183514if test -z "$CC"; then
    34193515  ac_ct_CC=$CC
    3420   for ac_prog in $comps
     3516  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
    34213517do
    34223518  # Extract the first word of "$ac_prog", so it can be a program name with args.
     
    41714267    unset F77
    41724268  else
    4173     # if enable-msvc, then test only for Intel (on Windows) Fortran compiler
     4269    # If enable-msvc, then test for Intel Fortran compiler for Windows
     4270    # explicitly and add compile-wrapper before AC_PROG_F77, because
     4271    # the compile-wrapper work around issues when having the wrong link.exe
     4272    # in the PATH first, which could upset tests in AC_PROG_F77.
    41744273    if test $enable_msvc = yes ; then
    4175       comps="ifort"
    4176     else
    4177       # TODO old buildtools was doing some $build specific logic here, do we still
    4178       # need this?
    4179       comps="gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32"
     4274      for ac_prog in ifort
     4275do
     4276  # Extract the first word of "$ac_prog", so it can be a program name with args.
     4277set dummy $ac_prog; ac_word=$2
     4278{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     4279$as_echo_n "checking for $ac_word... " >&6; }
     4280if ${ac_cv_prog_F77+:} false; then :
     4281  $as_echo_n "(cached) " >&6
     4282else
     4283  if test -n "$F77"; then
     4284  ac_cv_prog_F77="$F77" # Let the user override the test.
     4285else
     4286as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     4287for as_dir in $PATH
     4288do
     4289  IFS=$as_save_IFS
     4290  test -z "$as_dir" && as_dir=.
     4291    for ac_exec_ext in '' $ac_executable_extensions; do
     4292  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     4293    ac_cv_prog_F77="$ac_prog"
     4294    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     4295    break 2
     4296  fi
     4297done
     4298  done
     4299IFS=$as_save_IFS
     4300
     4301fi
     4302fi
     4303F77=$ac_cv_prog_F77
     4304if test -n "$F77"; then
     4305  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
     4306$as_echo "$F77" >&6; }
     4307else
     4308  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     4309$as_echo "no" >&6; }
     4310fi
     4311
     4312
     4313  test -n "$F77" && break
     4314done
     4315
     4316      if test -n "$F77" ; then
     4317        F77="$am_aux_dir/compile $F77"
     4318      fi
    41804319    fi
    4181     ac_ext=f
     4320
     4321    # if not msvc-enabled, then look for some Fortran compiler and check whether it works
     4322    # if F77 is set, then this only checks whether it works
     4323    if test $enable_msvc = no || test -n "$F77" ; then
     4324      ac_ext=f
    41824325ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
    41834326ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
    41844327ac_compiler_gnu=$ac_cv_f77_compiler_gnu
    41854328if test -n "$ac_tool_prefix"; then
    4186   for ac_prog in $comps
     4329  for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
    41874330  do
    41884331    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     
    42284371if test -z "$F77"; then
    42294372  ac_ct_F77=$F77
    4230   for ac_prog in $comps
     4373  for ac_prog in gfortran ifort g95 fort77 f77 f95 f90 g77 pgf90 pgf77 ifc frt af77 xlf_r fl32
    42314374do
    42324375  # Extract the first word of "$ac_prog", so it can be a program name with args.
     
    43904533ac_compiler_gnu=$ac_cv_c_compiler_gnu
    43914534
     4535    fi
    43924536  fi
    43934537
    4394 # Allow for the possibility that there is no Fortran compiler on the system.
    4395 
     4538  # Allow for the possibility that there is no Fortran compiler on the system.
    43964539  if test -z "$F77" ; then
    43974540    { $as_echo "$as_me:${as_lineno-$LINENO}: No Fortran 77 compiler available." >&5
     
    51755318
    51765319
     5320  # If enable-msvc, then test for Intel Fortran compiler for Windows
     5321  # explicitly and add compile-wrapper before AC_PROG_FC, because
     5322  # the compile-wrapper work around issues when having the wrong link.exe
     5323  # in the PATH first, which could upset tests in AC_PROG_FC.
    51775324  if test $enable_msvc = yes ; then
    5178     # if enable-msvc, then test only for Intel (on Windows) Fortran compiler
    5179     comps="ifort"
    5180   else
    5181     comps="gfortran ifort g95 f95 f90 pgf90 ifc frt xlf_r fl32"
     5325    for ac_prog in ifort
     5326do
     5327  # Extract the first word of "$ac_prog", so it can be a program name with args.
     5328set dummy $ac_prog; ac_word=$2
     5329{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     5330$as_echo_n "checking for $ac_word... " >&6; }
     5331if ${ac_cv_prog_FC+:} false; then :
     5332  $as_echo_n "(cached) " >&6
     5333else
     5334  if test -n "$FC"; then
     5335  ac_cv_prog_FC="$FC" # Let the user override the test.
     5336else
     5337as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     5338for as_dir in $PATH
     5339do
     5340  IFS=$as_save_IFS
     5341  test -z "$as_dir" && as_dir=.
     5342    for ac_exec_ext in '' $ac_executable_extensions; do
     5343  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     5344    ac_cv_prog_FC="$ac_prog"
     5345    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     5346    break 2
    51825347  fi
    5183 
    5184   ac_ext=${ac_fc_srcext-f}
     5348done
     5349  done
     5350IFS=$as_save_IFS
     5351
     5352fi
     5353fi
     5354FC=$ac_cv_prog_FC
     5355if test -n "$FC"; then
     5356  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5
     5357$as_echo "$FC" >&6; }
     5358else
     5359  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     5360$as_echo "no" >&6; }
     5361fi
     5362
     5363
     5364  test -n "$FC" && break
     5365done
     5366
     5367    if test -n "$FC" ; then
     5368      FC="$am_aux_dir/compile $FC"
     5369    fi
     5370  fi
     5371
     5372  # if not msvc-enabled, then look for some Fortran compiler and check whether it works
     5373  # if FC is set, then this only checks whether it works
     5374  if test $enable_msvc = no || test -n "$FC" ; then
     5375    ac_ext=${ac_fc_srcext-f}
    51855376ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
    51865377ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
    51875378ac_compiler_gnu=$ac_cv_fc_compiler_gnu
    51885379if test -n "$ac_tool_prefix"; then
    5189   for ac_prog in $comps
     5380  for ac_prog in gfortran ifort g95 f95 f90 pgf90 ifc frt xlf_r fl32
    51905381  do
    51915382    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     
    52315422if test -z "$FC"; then
    52325423  ac_ct_FC=$FC
    5233   for ac_prog in $comps
     5424  for ac_prog in gfortran ifort g95 f95 f90 pgf90 ifc frt xlf_r fl32
    52345425do
    52355426  # Extract the first word of "$ac_prog", so it can be a program name with args.
     
    53935584ac_compiler_gnu=$ac_cv_c_compiler_gnu
    53945585
     5586  fi
    53955587
    53965588  # check whether compile script should be used to wrap around Fortran compiler
     
    54575649    if test $ac_cv_prog_fc_c_o = no ; then
    54585650      FC="$am_aux_dir/compile $FC"
    5459     else
    5460       case "$FC" in *ifort ) FC="$am_aux_dir/compile $FC" ;; esac
    54615651    fi
    54625652  fi
Note: See TracChangeset for help on using the changeset viewer.