Changeset 4000


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

rerun autotools

Location:
ThirdParty/Metis/branches/autotools-update
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/branches/autotools-update/Makefile.in

    r3986 r4000  
    12201220        rmdir $(DESTDIR)$(pkgdocdir) || true
    12211221
    1222 install-doc: $(DocFiles)
     1222install-doc:
    12231223        $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
    12241224        for file in $(DocFiles); do \
    12251225          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    12261226          if test -f "$$dir$$file"; then \
    1227             $(INSTALL_DATA) "$$dir$$file" \
    1228                 "$(DESTDIR)$(pkgdocdir)/$$file"; \
     1227            $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(pkgdocdir)/$$file"; \
    12291228          fi; \
    12301229        done
  • ThirdParty/Metis/branches/autotools-update/compile

    r3977 r4000  
    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/Metis/branches/autotools-update/configure

    r3986 r4000  
    687687LDFLAGS
    688688CFLAGS
    689 CC
    690689MAINT
    691690MAINTAINER_MODE_FALSE
     
    722721host_cpu
    723722host
     723CC
    724724build_os
    725725build_vendor
     
    22522252
    22532253
    2254 
    2255   # Check whether --enable-msvc was given.
    2256 if test "${enable_msvc+set}" = set; then :
    2257   enableval=$enable_msvc; enable_msvc=$enableval
    2258 else
    2259   enable_msvc=no
    2260 fi
    2261 
    2262 
    2263 
    2264   # We want --enable-msvc setup and checked
    2265 
    2266 
    2267   # Check whether --enable-debug was given.
    2268 if test "${enable_debug+set}" = set; then :
    2269   enableval=$enable_debug; enable_debug=$enableval
    2270 else
    2271   enable_debug=no
    2272 fi
    2273 
    2274 
    2275 # This macro should run before the compiler checks (doesn't seem to be
    2276 # sufficient for CFLAGS)
    2277 
    2278 
    2279 
    2280 
    2281 
    2282 
    2283 # change default compiler flags
    2284 # - debugging enabled: enable debug symbols (-g/-Z7)
    2285 # - debugging disabled: disable debug code (-DNDEBUG); enable (more) optimization (-O2)
    2286 # - enable exceptions for (i)cl
    2287 
    2288   if test "$enable_debug" = yes ; then
    2289     if test "$enable_msvc" = yes ; then
    2290       : ${FFLAGS:="-nologo -Z7 -MDd"}
    2291       : ${FCFLAGS:="-nologo -Z7 -MDd"}
    2292       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2293       : ${CXXFLAGS:="-nologo -EHsc -Z7 -MDd"}
    2294       : ${AR:="lib"}
    2295       : ${AR_FLAGS:="-nologo -out:"}
    2296     else
    2297       : ${FFLAGS:="-g"}
    2298       : ${FCFLAGS:="-g"}
    2299       : ${CFLAGS:="-g"}
    2300       : ${CXXFLAGS:="-g"}
    2301     fi
    2302   else
    2303     if test "$enable_msvc" = yes ; then
    2304       : ${FFLAGS:="-nologo -O2 -MD"}
    2305       : ${FCFLAGS:="-nologo -O2 -MD"}
    2306       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2307       : ${CXXFLAGS:="-nologo -EHsc -DNDEBUG -O2 -MD"}
    2308       : ${AR:="lib"}
    2309       : ${AR_FLAGS:="-nologo -out:"}
    2310     else
    2311       : ${FFLAGS:="-O2"}
    2312       : ${FCFLAGS:="-O2"}
    2313       : ${CFLAGS:="-O2 -DNDEBUG"}
    2314       : ${CXXFLAGS:="-O2 -DNDEBUG"}
    2315     fi
    2316   fi
    2317 
    23182254ac_aux_dir=
    23192255for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
     
    23822318case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
    23832319
     2320
     2321
     2322
     2323
     2324  # Check whether --enable-msvc was given.
     2325if test "${enable_msvc+set}" = set; then :
     2326  enableval=$enable_msvc; enable_msvc=$enableval
     2327else
     2328  enable_msvc=no
     2329     case $build in
     2330       *-mingw* | *-cygwin* | *-msys* )
     2331         for ac_prog in gcc clang icl cl
     2332do
     2333  # Extract the first word of "$ac_prog", so it can be a program name with args.
     2334set dummy $ac_prog; ac_word=$2
     2335{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     2336$as_echo_n "checking for $ac_word... " >&6; }
     2337if ${ac_cv_prog_CC+:} false; then :
     2338  $as_echo_n "(cached) " >&6
     2339else
     2340  if test -n "$CC"; then
     2341  ac_cv_prog_CC="$CC" # Let the user override the test.
     2342else
     2343as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2344for as_dir in $PATH
     2345do
     2346  IFS=$as_save_IFS
     2347  test -z "$as_dir" && as_dir=.
     2348    for ac_exec_ext in '' $ac_executable_extensions; do
     2349  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2350    ac_cv_prog_CC="$ac_prog"
     2351    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     2352    break 2
     2353  fi
     2354done
     2355  done
     2356IFS=$as_save_IFS
     2357
     2358fi
     2359fi
     2360CC=$ac_cv_prog_CC
     2361if test -n "$CC"; then
     2362  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     2363$as_echo "$CC" >&6; }
     2364else
     2365  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     2366$as_echo "no" >&6; }
     2367fi
     2368
     2369
     2370  test -n "$CC" && break
     2371done
     2372
     2373         case "$CC" in *cl ) enable_msvc=yes ;; esac
     2374       ;;
     2375     esac
     2376fi
     2377
     2378
     2379
     2380  # We want --enable-msvc setup and checked
     2381
     2382
     2383  # Check whether --enable-debug was given.
     2384if test "${enable_debug+set}" = set; then :
     2385  enableval=$enable_debug; enable_debug=$enableval
     2386else
     2387  enable_debug=no
     2388fi
     2389
     2390
     2391# This macro should run before the compiler checks (doesn't seem to be
     2392# sufficient for CFLAGS)
     2393
     2394
     2395
     2396
     2397
     2398
     2399# change default compiler flags
     2400# - debugging enabled: enable debug symbols (-g/-Z7)
     2401# - debugging disabled: disable debug code (-DNDEBUG); enable (more) optimization (-O2)
     2402# - enable exceptions for (i)cl
     2403
     2404  if test "$enable_debug" = yes ; then
     2405    if test "$enable_msvc" = yes ; then
     2406      : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
     2407      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
     2408      : ${CFLAGS:="-nologo -Z7 -MDd"}
     2409      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2410      : ${AR:="lib"}
     2411      : ${AR_FLAGS:="-nologo -out:"}
     2412    else
     2413      : ${FFLAGS:="-g"}
     2414      : ${FCFLAGS:="-g"}
     2415      : ${CFLAGS:="-g"}
     2416      : ${CXXFLAGS:="-g"}
     2417    fi
     2418  else
     2419    if test "$enable_msvc" = yes ; then
     2420      : ${FFLAGS:="-nologo -fpp -O2 -MD"}
     2421      : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
     2422      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
     2423      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2424      : ${AR:="lib"}
     2425      : ${AR_FLAGS:="-nologo -out:"}
     2426    else
     2427      : ${FFLAGS:="-O2"}
     2428      : ${FCFLAGS:="-O2"}
     2429      : ${CFLAGS:="-O2 -DNDEBUG"}
     2430      : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2431    fi
     2432  fi
    23842433
    23852434{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     
    31903239
    31913240
    3192 # Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
    3193 # to invoke it from this macro first so that we can supply a parameter.
    3194 
    3195 
    3196 
    3197 # If enable-msvc, then test only for MS and Intel (on Windows) C compiler
    3198 # otherwise, test a long list of C compilers that comes into our mind
    3199 
     3241  # Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
     3242  # to invoke it from this macro first so that we can supply a parameter.
     3243
     3244
     3245  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
     3246  # explicitly and add compile-wrapper before AC_PROG_CC, because
     3247  # the compile-wrapper work around issues when having the wrong link.exe
     3248  # in the PATH first, which would upset tests in AC_PROG_CC.
     3249  # Further, if CC unset and not set by user, then stop with error.
    32003250  if test $enable_msvc = yes ; then
    3201     comps="icl cl"
    3202   else
    3203     # TODO old buildtools was doing some $build specific logic here, do we
    3204     # still need this?
    3205     comps="gcc clang cc icc icl cl cc xlc xlc_r pgcc"
     3251    for ac_prog in icl cl
     3252do
     3253  # Extract the first word of "$ac_prog", so it can be a program name with args.
     3254set dummy $ac_prog; ac_word=$2
     3255{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3256$as_echo_n "checking for $ac_word... " >&6; }
     3257if ${ac_cv_prog_CC+:} false; then :
     3258  $as_echo_n "(cached) " >&6
     3259else
     3260  if test -n "$CC"; then
     3261  ac_cv_prog_CC="$CC" # Let the user override the test.
     3262else
     3263as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3264for as_dir in $PATH
     3265do
     3266  IFS=$as_save_IFS
     3267  test -z "$as_dir" && as_dir=.
     3268    for ac_exec_ext in '' $ac_executable_extensions; do
     3269  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3270    ac_cv_prog_CC="$ac_prog"
     3271    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3272    break 2
    32063273  fi
     3274done
     3275  done
     3276IFS=$as_save_IFS
     3277
     3278fi
     3279fi
     3280CC=$ac_cv_prog_CC
     3281if test -n "$CC"; then
     3282  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
     3283$as_echo "$CC" >&6; }
     3284else
     3285  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3286$as_echo "no" >&6; }
     3287fi
     3288
     3289
     3290  test -n "$CC" && break
     3291done
     3292
     3293    if test -n "$CC" ; then
     3294      CC="$am_aux_dir/compile $CC"
     3295    else
     3296      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     3297    fi
     3298  fi
     3299
     3300  # look for some C compiler and check whether it works
     3301  # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
     3302  # other than CXX of F77, this macro also takes care of adding the compile-wrapper
    32073303  ac_ext=c
    32083304ac_cpp='$CPP $CPPFLAGS'
     
    32113307ac_compiler_gnu=$ac_cv_c_compiler_gnu
    32123308if test -n "$ac_tool_prefix"; then
    3213   for ac_prog in $comps
     3309  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
    32143310  do
    32153311    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     
    32553351if test -z "$CC"; then
    32563352  ac_ct_CC=$CC
    3257   for ac_prog in $comps
     3353  for ac_prog in gcc clang cc icc icl cl cc xlc xlc_r pgcc
    32583354do
    32593355  # Extract the first word of "$ac_prog", so it can be a program name with args.
Note: See TracChangeset for help on using the changeset viewer.