Changeset 4137


Ignore:
Timestamp:
Mar 19, 2020 1:13:58 PM (2 weeks ago)
Author:
stefan
Message:

rerun autotools, add ar-lib

Location:
ThirdParty/Metis/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/trunk/Makefile.am

    r4120 r4137  
    22# All Rights Reserved.
    33# This file is distributed under the Eclipse Public License.
    4 
    5 AUTOMAKE_OPTIONS = foreign subdir-objects
    64
    75EXTRA_DIST = get.metis INSTALL.METIS
  • ThirdParty/Metis/trunk/Makefile.in

    r4120 r4137  
    421421top_builddir = @top_builddir@
    422422top_srcdir = @top_srcdir@
    423 AUTOMAKE_OPTIONS = foreign subdir-objects
    424423EXTRA_DIST = get.metis INSTALL.METIS
    425424lib_LTLIBRARIES = libcoinmetis.la
  • ThirdParty/Metis/trunk/configure

    r4113 r4137  
    660660MANIFEST_TOOL
    661661RANLIB
    662 ac_ct_AR
    663 AR
    664662DLLTOOL
    665663OBJDUMP
     
    674672SED
    675673LIBTOOL
     674ac_ct_AR
     675AR
    676676ADD_CFLAGS
    677677am__fastdepCC_FALSE
     
    24212421      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
    24222422      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    2423       : ${AR:="lib"}
    2424       : ${AR_FLAGS:="-nologo -out:"}
    24252423    else
    24262424      : ${FFLAGS:="-g $ADD_FFLAGS"}
     
    24352433      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
    24362434      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    2437       : ${AR:="lib"}
    2438       : ${AR_FLAGS:="-nologo -out:"}
    24392435    else
    24402436      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     
    30223018
    30233019# Initialize automake
     3020# - do not be as strict as for GNU projects
    30243021# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
    30253022#   variables in configure, and as make variables).
    30263023# - disable dist target
     3024# - place objects from sources in subdirs into corresponding subdirs
    30273025# - enable all automake warnings
    30283026
     
    33293327      ac_cv_prog_CC="$CC"
    33303328      LD="$CC"
     3329      : ${AR:=lib}
    33313330    else
    33323331      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    41304129# Initialize libtool
    41314130# Disable win32-dll, so we get all Metis symbols exported with a DLL.
     4131
    41324132case `pwd` in
    41334133  *\ * | *\     *)
     
    56225622sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
    56235623test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
    5624 
    56255624
    56265625
     
    78297828
    78307829
     7830# checkout AR and decide whether to use ar-lib wrapper
     7831  if test -n "$ac_tool_prefix"; then
     7832  for ac_prog in ar lib "link -lib"
     7833  do
     7834    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
     7835set dummy $ac_tool_prefix$ac_prog; ac_word=$2
     7836{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7837$as_echo_n "checking for $ac_word... " >&6; }
     7838if ${ac_cv_prog_AR+:} false; then :
     7839  $as_echo_n "(cached) " >&6
     7840else
     7841  if test -n "$AR"; then
     7842  ac_cv_prog_AR="$AR" # Let the user override the test.
     7843else
     7844as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7845for as_dir in $PATH
     7846do
     7847  IFS=$as_save_IFS
     7848  test -z "$as_dir" && as_dir=.
     7849    for ac_exec_ext in '' $ac_executable_extensions; do
     7850  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7851    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     7852    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7853    break 2
     7854  fi
     7855done
     7856  done
     7857IFS=$as_save_IFS
     7858
     7859fi
     7860fi
     7861AR=$ac_cv_prog_AR
     7862if test -n "$AR"; then
     7863  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
     7864$as_echo "$AR" >&6; }
     7865else
     7866  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7867$as_echo "no" >&6; }
     7868fi
     7869
     7870
     7871    test -n "$AR" && break
     7872  done
     7873fi
     7874if test -z "$AR"; then
     7875  ac_ct_AR=$AR
     7876  for ac_prog in ar lib "link -lib"
     7877do
     7878  # Extract the first word of "$ac_prog", so it can be a program name with args.
     7879set dummy $ac_prog; ac_word=$2
     7880{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7881$as_echo_n "checking for $ac_word... " >&6; }
     7882if ${ac_cv_prog_ac_ct_AR+:} false; then :
     7883  $as_echo_n "(cached) " >&6
     7884else
     7885  if test -n "$ac_ct_AR"; then
     7886  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
     7887else
     7888as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7889for as_dir in $PATH
     7890do
     7891  IFS=$as_save_IFS
     7892  test -z "$as_dir" && as_dir=.
     7893    for ac_exec_ext in '' $ac_executable_extensions; do
     7894  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     7895    ac_cv_prog_ac_ct_AR="$ac_prog"
     7896    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7897    break 2
     7898  fi
     7899done
     7900  done
     7901IFS=$as_save_IFS
     7902
     7903fi
     7904fi
     7905ac_ct_AR=$ac_cv_prog_ac_ct_AR
     7906if test -n "$ac_ct_AR"; then
     7907  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
     7908$as_echo "$ac_ct_AR" >&6; }
     7909else
     7910  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7911$as_echo "no" >&6; }
     7912fi
     7913
     7914
     7915  test -n "$ac_ct_AR" && break
     7916done
     7917
     7918  if test "x$ac_ct_AR" = x; then
     7919    AR="false"
     7920  else
     7921    case $cross_compiling:$ac_tool_warned in
     7922yes:)
     7923{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     7924$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     7925ac_tool_warned=yes ;;
     7926esac
     7927    AR=$ac_ct_AR
     7928  fi
     7929fi
     7930
     7931: ${AR=ar}
     7932
     7933{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
     7934$as_echo_n "checking the archiver ($AR) interface... " >&6; }
     7935if ${am_cv_ar_interface+:} false; then :
     7936  $as_echo_n "(cached) " >&6
     7937else
     7938  ac_ext=c
     7939ac_cpp='$CPP $CPPFLAGS'
     7940ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     7941ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     7942ac_compiler_gnu=$ac_cv_c_compiler_gnu
     7943
     7944   am_cv_ar_interface=ar
     7945   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     7946/* end confdefs.h.  */
     7947int some_variable = 0;
     7948_ACEOF
     7949if ac_fn_c_try_compile "$LINENO"; then :
     7950  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
     7951      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     7952  (eval $am_ar_try) 2>&5
     7953  ac_status=$?
     7954  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7955  test $ac_status = 0; }
     7956      if test "$ac_status" -eq 0; then
     7957        am_cv_ar_interface=ar
     7958      else
     7959        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
     7960        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
     7961  (eval $am_ar_try) 2>&5
     7962  ac_status=$?
     7963  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
     7964  test $ac_status = 0; }
     7965        if test "$ac_status" -eq 0; then
     7966          am_cv_ar_interface=lib
     7967        else
     7968          am_cv_ar_interface=unknown
     7969        fi
     7970      fi
     7971      rm -f conftest.lib libconftest.a
     7972
     7973fi
     7974rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     7975   ac_ext=c
     7976ac_cpp='$CPP $CPPFLAGS'
     7977ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     7978ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
     7979ac_compiler_gnu=$ac_cv_c_compiler_gnu
     7980
     7981fi
     7982{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
     7983$as_echo "$am_cv_ar_interface" >&6; }
     7984
     7985case $am_cv_ar_interface in
     7986ar)
     7987  ;;
     7988lib)
     7989  # Microsoft lib, so override with the ar-lib wrapper script.
     7990  # FIXME: It is wrong to rewrite AR.
     7991  # But if we don't then we get into trouble of one sort or another.
     7992  # A longer-term fix would be to have automake use am__AR in this case,
     7993  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
     7994  # similar.
     7995  AR="$am_aux_dir/ar-lib $AR"
     7996  ;;
     7997unknown)
     7998  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
     7999  ;;
     8000esac
     8001
     8002
    78318003# Create libtool.
    7832 
    78338004
    78348005
     
    1212812299# Patch libtool to circumvent some issues when using MSVC and MS lib.
    1212912300# This needs to be run after config.status has created libtool.
    12130 # 1. Eliminate a trailing space after AR_FLAGS. Apparently necessary on
    12131 #    Windows when AR=lib.exe.
    12132 # 2. Patch libtool's func_extract_an_archive in case of $AR=lib. The current
    12133 #    libtool implementation assumes that it can do $AR x to extract an archive.
    12134 #    We replace this two-liner in func_extract_an_archive by replacing the first
    12135 #    line by something clunky that works with lib and making sure that the following
    12136 #    line is ignored (by finishing with ": \"). We completely disregard running the
    12137 #    command through func_show_eval and do not stop if it fails.
    12138 # 3. Relax check which libraries can be used when linking a DLL.
     12301# 1. Relax check which libraries can be used when linking a DLL.
    1213912302#    libtool's func_mode_link() would reject linking a .lib file when building a DLL,
    1214012303#    even though this .lib file may just be the one that eventually loads a depending DLL,
    1214112304#    e.g., mkl_core_dll.lib. Setting deplibs_check_method=pass_all will still print a
    1214212305#    warning, but the .lib is still passed to the linker.
    12143 # 4. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
     12306# 2. Ensure always_export_symbols=no if win32-dll. Even when we pass win32-dll,
    1214412307#    libtool forces always_export_symbols=yes for --tag=CXX if using MS compiler.
    1214512308#    This leads to a nm call that collects ALL C-functions from a library
    1214612309#    and explicitly dll-exporting them, leading to warnings about duplicates
    1214712310#    regarding those that are properly marked for dll-export in the source.
     12311# 3. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     12312#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
     12313# 4. Add MKL libraries to dependency_libs in .la file, which I guess should be
     12314#    the case due to point 5.
    1214812315#
    1214912316# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
     
    1215512322#    this faulty check.
    1215612323
    12157   case "$AR" in
    12158     *lib* | *LIB* )
     12324  case "$am_cv_ar_interface" in
     12325    lib )
    1215912326      ac_config_commands="$ac_config_commands libtoolclpatch"
    1216012327
     
    1445114618
    1445214619 ;;
    14453     "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    14454              -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    14455              -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     14620    "libtoolclpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    1445614621              \
     14622             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
     14623             -e '/static library .deplib is not portable/a case $deplib in *mkl_*.lib) newdependency_libs="$deplib $newdependency_libs" ;; esac' \
    1445714624         libtool > libtool.tmp
    1445814625         mv libtool.tmp libtool
Note: See TracChangeset for help on using the changeset viewer.