Changeset 4127


Ignore:
Timestamp:
Mar 4, 2020 10:11:27 AM (4 weeks ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/configure

    r4115 r4127  
    808808with_lapack
    809809with_lapack_lflags
    810 with_lapack_cflags
    811810with_metis
    812811with_metis_lflags
     
    14861485  --with-lapack-lflags    Linker flags for lapack appropriate for your
    14871486                          environment. (Most often, -l specs for libraries.)
    1488   --with-lapack-cflags    Compiler flags for lapack appropriate for your
    1489                           environment. (Most often, -I specs for header file
    1490                           directories.)
    14911487  --with-metis            Use Metis. If an argument is given, 'yes' is
    14921488                          equivalent to --with-metis, 'no' is
     
    1603316029#    and explicitly dll-exporting them, leading to warnings about duplicates
    1603416030#    regarding those that are properly marked for dll-export in the source.
     16031# 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     16032#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
     16033# 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     16034#    the case due to point 5.
    1603516035#
    1603616036# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
     
    1703517035
    1703617036
    17037 # Check whether --with-lapack-cflags was given.
    17038 if test "${with_lapack_cflags+set}" = set; then :
    17039   withval=$with_lapack_cflags;
    17040 fi
    17041 
    1704217037
    1704317038
     
    1706517060# is assigned to prim_data.
    1706617061
    17067   withval=$with_lapack
     17062  withval="$with_lapack"
    1706817063  if test -n "$withval" ; then
    1706917064    case "$withval" in
     
    1707917074      * )
    1708017075        coin_has_lapack=yes
    17081         lapack_lflags=$withval
     17076        lapack_lflags="$withval"
    1708217077        ;;
    1708317078    esac
     
    1708917084
    1709017085  if test "$coin_has_lapack" != skipping ; then
    17091        withval=$with_lapack_lflags
     17086       withval="$with_lapack_lflags"
    1709217087       if test -n "$withval" ; then
    1709317088         case "$withval" in
     
    1709717092           * )
    1709817093             coin_has_lapack=yes
    17099              lapack_lflags=$withval
     17094             lapack_lflags="$withval"
    1710017095             ;;
    1710117096         esac
    1710217097       fi
    1710317098
    17104        withval=$with_lapack_cflags
     17099       withval="$with_lapack_cflags"
    1710517100       if test -n "$withval" ; then
    1710617101         case "$withval" in
     
    1719117186# Define BUILDTOOLS_DEBUG to enable debugging output
    1719217187
    17193     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    17194       { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&5
     17188  if test "$BUILDTOOLS_DEBUG" = 1 ; then
     17189    { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&5
    1719517190$as_echo "$as_me: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&6;}
    17196       { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'lapack'" >&5
     17191    { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'lapack'" >&5
    1719717192$as_echo "$as_me: Collected values for package 'lapack'" >&6;}
    17198       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_lflags is \"$lapack_lflags\"" >&5
     17193    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_lflags is \"$lapack_lflags\"" >&5
    1719917194$as_echo "$as_me: lapack_lflags is \"$lapack_lflags\"" >&6;}
    17200       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_cflags is \"$lapack_cflags\"" >&5
     17195    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_cflags is \"$lapack_cflags\"" >&5
    1720117196$as_echo "$as_me: lapack_cflags is \"$lapack_cflags\"" >&6;}
    17202       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_data is \"$lapack_data\"" >&5
     17197    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_data is \"$lapack_data\"" >&5
    1720317198$as_echo "$as_me: lapack_data is \"$lapack_data\"" >&6;}
    17204       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_pcfiles is \"$lapack_pcfiles\"" >&5
     17199    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_pcfiles is \"$lapack_pcfiles\"" >&5
    1720517200$as_echo "$as_me: lapack_pcfiles is \"$lapack_pcfiles\"" >&6;}
    17206     fi
     17201  fi
    1720717202
    1720817203
     
    1753317528
    1753417529      *-cygwin* | *-mingw* | *-msys*)
    17535         # check for 64-bit sequential MKL
    17536         if test "$enable_shared" = yes ; then
    17537 
    17538   # setup LIBS by adding mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib and those from
     17530        # check for 64-bit sequential MKL in $LIB
     17531        old_IFS="$IFS"
     17532        IFS=";"
     17533        for d in $LIB ; do
     17534          # turn $d into unix-style short path (no spaces); cannot do -us, so first do -ws, then -u
     17535          d=`cygpath -ws "$d"`
     17536          d=`cygpath -u "$d"`
     17537          if test "$enable_shared" = yes ; then
     17538            if test -e "$d/mkl_core_dll.lib" ; then
     17539              coin_mkl="$d/mkl_intel_lp64_dll.lib $d/mkl_sequential_dll.lib $d/mkl_core_dll.lib"
     17540              break
     17541            fi
     17542          else
     17543            if test -e "$d/mkl_core.lib" ; then
     17544              coin_mkl="$d/mkl_intel_lp64.lib $d/mkl_sequential.lib $d/mkl_core.lib"
     17545              break
     17546            fi
     17547          fi
     17548        done
     17549        IFS="$old_IFS"
     17550
     17551  # setup LIBS by adding $coin_mkl and those from
    1753917552  ac_save_LIBS="$LIBS"
    17540   LIBS="mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib $LIBS"
     17553  LIBS="$coin_mkl $LIBS"
    1754117554
    1754217555
     
    1760417617  if test $ac_success = yes ; then
    1760517618    coin_has_lapack=yes
    17606              lapack_lflags="mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib"
    17607 
    17608   fi
    17609 
    17610         else
    17611 
    17612   # setup LIBS by adding mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib and those from
     17619             lapack_lflags="$coin_mkl"
     17620
     17621  fi
     17622
     17623      ;;
     17624
     17625      *-darwin*)
     17626
     17627  # setup LIBS by adding -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm and those from
    1761317628  ac_save_LIBS="$LIBS"
    17614   LIBS="mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib $LIBS"
     17629  LIBS="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm $LIBS"
    1761517630
    1761617631
     
    1767717692
    1767817693  if test $ac_success = yes ; then
    17679     coin_has_lapack=yes
    17680              lapack_lflags="mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib"
    17681 
    17682   fi
    17683 
    17684         fi
    17685       ;;
    17686 
    17687       *-darwin*)
    17688 
    17689   # setup LIBS by adding -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm and those from
     17694
     17695          coin_has_lapack=yes
     17696          lapack_lflags="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm"
     17697
     17698  fi
     17699
     17700        if test "$coin_has_lapack" = no ; then
     17701
     17702  # setup LIBS by adding -framework Accelerate and those from
    1769017703  ac_save_LIBS="$LIBS"
    17691   LIBS="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm $LIBS"
     17704  LIBS="-framework Accelerate $LIBS"
    1769217705
    1769317706
     
    1775517768  if test $ac_success = yes ; then
    1775617769
    17757           coin_has_lapack=yes
    17758           lapack_lflags="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm"
    17759 
    17760   fi
    17761 
    17762         if test "$coin_has_lapack" = no ; then
    17763 
    17764   # setup LIBS by adding -framework Accelerate and those from
     17770            coin_has_lapack=yes
     17771            lapack_lflags="-framework Accelerate"
     17772
     17773  fi
     17774
     17775        fi
     17776      ;;
     17777    esac
     17778  fi
     17779
     17780# If none of the above worked, check whether lapack.pc blas.pc exists and links
     17781# We check for both to ensure that blas lib also appears on link line in case
     17782# someone wants to use Blas functions but tests only for Lapack.
     17783  if test "$coin_has_lapack" = no ; then
     17784    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lapack.pc and blas.pc" >&5
     17785$as_echo_n "checking for lapack.pc and blas.pc... " >&6; }
     17786
     17787
     17788
     17789  if test -n "$PKG_CONFIG" ; then
     17790    if PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --exists "lapack blas" ; then
     17791      LAPACK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "lapack blas" 2>/dev/null | tr '\n' ' '`
     17792      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     17793$as_echo "yes" >&6; }
     17794
     17795  # setup LIBS by adding  and those from lapack
    1776517796  ac_save_LIBS="$LIBS"
    17766   LIBS="-framework Accelerate $LIBS"
    17767 
     17797
     17798  if test -n "lapack" ; then
     17799
     17800      temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs lapack`
     17801      LIBS="$temp_LFLAGS $LIBS"
     17802    fi
    1776817803
    1776917804  dsyev_namemangling=unknown
     
    1782917864
    1783017865  if test $ac_success = yes ; then
    17831 
    17832             coin_has_lapack=yes
    17833             lapack_lflags="-framework Accelerate"
    17834 
    17835   fi
    17836 
    17837         fi
    17838       ;;
    17839     esac
    17840   fi
    17841 
    17842 # If none of the above worked, check whether lapack.pc blas.pc exists and links
     17866    coin_has_lapack=yes
     17867         lapack_pcfiles="lapack blas"
     17868    else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
     17869  fi
     17870
     17871    else
     17872      LAPACK_PKG_ERRORS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack blas"`
     17873      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     17874$as_echo "no" >&6; }
     17875    fi
     17876  else
     17877    as_fn_error $? "\"Cannot check for existence of module lapack without pkgconf\"" "$LINENO" 5
     17878  fi
     17879
     17880  fi
     17881
     17882# TODO do we need another check with lapack.pc only?
     17883
     17884# If none of the above worked, try the generic -llapack -lblas as last resort.
    1784317885# We check for both to ensure that blas lib also appears on link line in case
    1784417886# someone wants to use Blas functions but tests only for Lapack.
    1784517887  if test "$coin_has_lapack" = no ; then
    17846     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lapack.pc and blas.pc" >&5
    17847 $as_echo_n "checking for lapack.pc and blas.pc... " >&6; }
    17848 
    17849 
    17850 
    17851   if test -n "$PKG_CONFIG" ; then
    17852     if PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --exists "lapack blas" ; then
    17853       LAPACK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "lapack blas" 2>/dev/null | tr '\n' ' '`
    17854       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    17855 $as_echo "yes" >&6; }
    17856 
    17857   # setup LIBS by adding  and those from lapack
     17888
     17889  # setup LIBS by adding -llapack -lblas and those from
    1785817890  ac_save_LIBS="$LIBS"
    17859 
    17860   if test -n "lapack" ; then
    17861 
    17862       temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs lapack`
    17863       LIBS="$temp_LFLAGS $LIBS"
    17864     fi
     17891  LIBS="-llapack -lblas $LIBS"
     17892
    1786517893
    1786617894  dsyev_namemangling=unknown
     
    1792617954
    1792717955  if test $ac_success = yes ; then
    17928     coin_has_lapack=yes
    17929          lapack_pcfiles="lapack blas"
    17930     else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
    17931   fi
    17932 
    17933     else
    17934       LAPACK_PKG_ERRORS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack blas"`
    17935       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    17936 $as_echo "no" >&6; }
    17937     fi
    17938   else
    17939     as_fn_error $? "\"Cannot check for existence of module lapack without pkgconf\"" "$LINENO" 5
    17940   fi
    17941 
    17942   fi
    17943 
    17944 # TODO do we need another check with lapack.pc only?
    17945 
    17946 # If none of the above worked, try the generic -llapack -lblas as last resort.
    17947 # We check for both to ensure that blas lib also appears on link line in case
    17948 # someone wants to use Blas functions but tests only for Lapack.
    17949   if test "$coin_has_lapack" = no ; then
    17950 
    17951   # setup LIBS by adding -llapack -lblas and those from
    17952   ac_save_LIBS="$LIBS"
    17953   LIBS="-llapack -lblas $LIBS"
    17954 
    17955 
    17956   dsyev_namemangling=unknown
    17957 
    17958   # FIXME we had "extra underscore" as additional option for ac_extra
    17959   #   but since there is no use for ac_extra below, was there any use for it?
    17960   for ac_extra in "no extra underscore" ; do
    17961     for ac_case in "lower case" "upper case" ; do
    17962       for ac_trail in "underscore" "no underscore" ; do
    17963         #AC_MSG_NOTICE([Attempting link for ${ac_case}, ${ac_trail}, ${ac_extra}])
    17964         case $ac_case in
    17965           "lower case")
    17966             ac_name=dsyev
    17967             ;;
    17968           "upper case")
    17969             ac_name=DSYEV
    17970             ;;
    17971         esac
    17972         if test "$ac_trail" = underscore ; then
    17973           ac_name=${ac_name}_
    17974         fi
    17975         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for function $ac_name in $LIBS" >&5
    17976 $as_echo_n "checking for function $ac_name in $LIBS... " >&6; }
    17977         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    17978 /* end confdefs.h.  */
    17979 #ifdef __cplusplus
    17980              extern "C"
    17981              #endif
    17982              void $ac_name();
    17983 #ifdef FC_DUMMY_MAIN
    17984 #ifndef FC_DUMMY_MAIN_EQ_F77
    17985 #  ifdef __cplusplus
    17986      extern "C"
    17987 #  endif
    17988    int FC_DUMMY_MAIN() { return 1; }
    17989 #endif
    17990 #endif
    17991 int
    17992 main ()
    17993 {
    17994 $ac_name()
    17995   ;
    17996   return 0;
    17997 }
    17998 _ACEOF
    17999 if ac_fn_c_try_link "$LINENO"; then :
    18000   dsyev_namemangling="${ac_case}, ${ac_trail}, ${ac_extra}"
    18001            ac_success=yes
    18002 else
    18003   ac_success=no
    18004 fi
    18005 rm -f core conftest.err conftest.$ac_objext \
    18006     conftest$ac_exeext conftest.$ac_ext
    18007         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_success" >&5
    18008 $as_echo "$ac_success" >&6; }
    18009         if test $ac_success = yes ; then
    18010           break 3
    18011         fi
    18012       done
    18013     done
    18014   done
    18015   LIBS=$ac_save_LIBS
    18016 
    18017   if test $ac_success = yes ; then
    1801817956
    1801917957      coin_has_lapack=yes
     
    1817318111# is assigned to prim_data.
    1817418112
    18175   withval=$with_metis
     18113  withval="$with_metis"
    1817618114  if test -n "$withval" ; then
    1817718115    case "$withval" in
     
    1818718125      * )
    1818818126        coin_has_metis=yes
    18189         metis_lflags=$withval
     18127        metis_lflags="$withval"
    1819018128        ;;
    1819118129    esac
     
    1819718135
    1819818136  if test "$coin_has_metis" != skipping ; then
    18199        withval=$with_metis_lflags
     18137       withval="$with_metis_lflags"
    1820018138       if test -n "$withval" ; then
    1820118139         case "$withval" in
     
    1820518143           * )
    1820618144             coin_has_metis=yes
    18207              metis_lflags=$withval
     18145             metis_lflags="$withval"
    1820818146             ;;
    1820918147         esac
    1821018148       fi
    1821118149
    18212        withval=$with_metis_cflags
     18150       withval="$with_metis_cflags"
    1821318151       if test -n "$withval" ; then
    1821418152         case "$withval" in
     
    1829918237# Define BUILDTOOLS_DEBUG to enable debugging output
    1830018238
    18301     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    18302       { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&5
     18239  if test "$BUILDTOOLS_DEBUG" = 1 ; then
     18240    { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&5
    1830318241$as_echo "$as_me: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&6;}
    18304       { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'metis'" >&5
     18242    { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'metis'" >&5
    1830518243$as_echo "$as_me: Collected values for package 'metis'" >&6;}
    18306       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_lflags is \"$metis_lflags\"" >&5
     18244    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_lflags is \"$metis_lflags\"" >&5
    1830718245$as_echo "$as_me: metis_lflags is \"$metis_lflags\"" >&6;}
    18308       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_cflags is \"$metis_cflags\"" >&5
     18246    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_cflags is \"$metis_cflags\"" >&5
    1830918247$as_echo "$as_me: metis_cflags is \"$metis_cflags\"" >&6;}
    18310       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_data is \"$metis_data\"" >&5
     18248    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_data is \"$metis_data\"" >&5
    1831118249$as_echo "$as_me: metis_data is \"$metis_data\"" >&6;}
    18312       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_pcfiles is \"$metis_pcfiles\"" >&5
     18250    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_pcfiles is \"$metis_pcfiles\"" >&5
    1831318251$as_echo "$as_me: metis_pcfiles is \"$metis_pcfiles\"" >&6;}
    18314     fi
     18252  fi
    1831518253
    1831618254
     
    2099820936             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    2099920937             -e 's|always_export_symbols=yes|always_export_symbols=no|g' \
     20938             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
     20939             -e '/static library .deplib is not portable/a case $deplib in *mkl_*.lib) newdependency_libs="$deplib $newdependency_libs" ;; esac' \
    2100020940         libtool > libtool.tmp
    2100120941         mv libtool.tmp libtool
Note: See TracChangeset for help on using the changeset viewer.