Changeset 4126


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

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/configure

    r4123 r4126  
    830830with_lapack
    831831with_lapack_lflags
    832 with_lapack_cflags
    833832with_metis
    834833with_metis_lflags
     
    15131512  --with-lapack-lflags    Linker flags for lapack appropriate for your
    15141513                          environment. (Most often, -l specs for libraries.)
    1515   --with-lapack-cflags    Compiler flags for lapack appropriate for your
    1516                           environment. (Most often, -I specs for header file
    1517                           directories.)
    15181514  --with-metis            Use Metis. If an argument is given, 'yes' is
    15191515                          equivalent to --with-metis, 'no' is
     
    1988419880#    and explicitly dll-exporting them, leading to warnings about duplicates
    1988519881#    regarding those that are properly marked for dll-export in the source.
     19882# 5. Do not add mkl_*.lib to old_deplibs, which can result in trying to unpack and repack
     19883#    the MKL libraries (which are pretty big). Instead, treat them like other -l<...> libs.
     19884# 6. Add MKL libraries to dependency_libs in .la file, which I guess should be
     19885#    the case due to point 5.
    1988619886#
    1988719887# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
     
    2032820328
    2032920329
    20330 # Check whether --with-lapack-cflags was given.
    20331 if test "${with_lapack_cflags+set}" = set; then :
    20332   withval=$with_lapack_cflags;
    20333 fi
    20334 
    2033520330
    2033620331
     
    2035820353# is assigned to prim_data.
    2035920354
    20360   withval=$with_lapack
     20355  withval="$with_lapack"
    2036120356  if test -n "$withval" ; then
    2036220357    case "$withval" in
     
    2037220367      * )
    2037320368        coin_has_lapack=yes
    20374         lapack_lflags=$withval
     20369        lapack_lflags="$withval"
    2037520370        ;;
    2037620371    esac
     
    2038220377
    2038320378  if test "$coin_has_lapack" != skipping ; then
    20384        withval=$with_lapack_lflags
     20379       withval="$with_lapack_lflags"
    2038520380       if test -n "$withval" ; then
    2038620381         case "$withval" in
     
    2039020385           * )
    2039120386             coin_has_lapack=yes
    20392              lapack_lflags=$withval
     20387             lapack_lflags="$withval"
    2039320388             ;;
    2039420389         esac
    2039520390       fi
    2039620391
    20397        withval=$with_lapack_cflags
     20392       withval="$with_lapack_cflags"
    2039820393       if test -n "$withval" ; then
    2039920394         case "$withval" in
     
    2048420479# Define BUILDTOOLS_DEBUG to enable debugging output
    2048520480
    20486     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    20487       { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&5
     20481  if test "$BUILDTOOLS_DEBUG" = 1 ; then
     20482    { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&5
    2048820483$as_echo "$as_me: FIND_PRIM_PKG result for lapack: \"$coin_has_lapack\"" >&6;}
    20489       { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'lapack'" >&5
     20484    { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'lapack'" >&5
    2049020485$as_echo "$as_me: Collected values for package 'lapack'" >&6;}
    20491       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_lflags is \"$lapack_lflags\"" >&5
     20486    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_lflags is \"$lapack_lflags\"" >&5
    2049220487$as_echo "$as_me: lapack_lflags is \"$lapack_lflags\"" >&6;}
    20493       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_cflags is \"$lapack_cflags\"" >&5
     20488    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_cflags is \"$lapack_cflags\"" >&5
    2049420489$as_echo "$as_me: lapack_cflags is \"$lapack_cflags\"" >&6;}
    20495       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_data is \"$lapack_data\"" >&5
     20490    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_data is \"$lapack_data\"" >&5
    2049620491$as_echo "$as_me: lapack_data is \"$lapack_data\"" >&6;}
    20497       { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_pcfiles is \"$lapack_pcfiles\"" >&5
     20492    { $as_echo "$as_me:${as_lineno-$LINENO}: lapack_pcfiles is \"$lapack_pcfiles\"" >&5
    2049820493$as_echo "$as_me: lapack_pcfiles is \"$lapack_pcfiles\"" >&6;}
    20499     fi
     20494  fi
    2050020495
    2050120496
     
    2082620821
    2082720822      *-cygwin* | *-mingw* | *-msys*)
    20828         # check for 64-bit sequential MKL
    20829         if test "$enable_shared" = yes ; then
    20830 
    20831   # setup LIBS by adding mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib and those from
     20823        # check for 64-bit sequential MKL in $LIB
     20824        old_IFS="$IFS"
     20825        IFS=";"
     20826        for d in $LIB ; do
     20827          # turn $d into unix-style short path (no spaces); cannot do -us, so first do -ws, then -u
     20828          d=`cygpath -ws "$d"`
     20829          d=`cygpath -u "$d"`
     20830          if test "$enable_shared" = yes ; then
     20831            if test -e "$d/mkl_core_dll.lib" ; then
     20832              coin_mkl="$d/mkl_intel_lp64_dll.lib $d/mkl_sequential_dll.lib $d/mkl_core_dll.lib"
     20833              break
     20834            fi
     20835          else
     20836            if test -e "$d/mkl_core.lib" ; then
     20837              coin_mkl="$d/mkl_intel_lp64.lib $d/mkl_sequential.lib $d/mkl_core.lib"
     20838              break
     20839            fi
     20840          fi
     20841        done
     20842        IFS="$old_IFS"
     20843
     20844  # setup LIBS by adding $coin_mkl and those from
    2083220845  ac_save_LIBS="$LIBS"
    20833   LIBS="mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib $LIBS"
     20846  LIBS="$coin_mkl $LIBS"
    2083420847
    2083520848
     
    2089720910  if test $ac_success = yes ; then
    2089820911    coin_has_lapack=yes
    20899              lapack_lflags="mkl_intel_lp64_dll.lib mkl_sequential_dll.lib mkl_core_dll.lib"
     20912             lapack_lflags="$coin_mkl"
    2090020913
    2090120914  fi
    2090220915
    20903         else
    20904 
    20905   # setup LIBS by adding mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib and those from
     20916      ;;
     20917
     20918      *-darwin*)
     20919
     20920  # setup LIBS by adding -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm and those from
    2090620921  ac_save_LIBS="$LIBS"
    20907   LIBS="mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib $LIBS"
     20922  LIBS="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm $LIBS"
    2090820923
    2090920924
     
    2097020985
    2097120986  if test $ac_success = yes ; then
    20972     coin_has_lapack=yes
    20973              lapack_lflags="mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib"
     20987
     20988          coin_has_lapack=yes
     20989          lapack_lflags="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm"
    2097420990
    2097520991  fi
    2097620992
    20977         fi
    20978       ;;
    20979 
    20980       *-darwin*)
    20981 
    20982   # setup LIBS by adding -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm and those from
     20993        if test "$coin_has_lapack" = no ; then
     20994
     20995  # setup LIBS by adding -framework Accelerate and those from
    2098320996  ac_save_LIBS="$LIBS"
    20984   LIBS="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm $LIBS"
     20997  LIBS="-framework Accelerate $LIBS"
    2098520998
    2098620999
     
    2104821061  if test $ac_success = yes ; then
    2104921062
    21050           coin_has_lapack=yes
    21051           lapack_lflags="-lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lm"
     21063            coin_has_lapack=yes
     21064            lapack_lflags="-framework Accelerate"
    2105221065
    2105321066  fi
    2105421067
    21055         if test "$coin_has_lapack" = no ; then
    21056 
    21057   # setup LIBS by adding -framework Accelerate and those from
     21068        fi
     21069      ;;
     21070    esac
     21071  fi
     21072
     21073# If none of the above worked, check whether lapack.pc blas.pc exists and links
     21074# We check for both to ensure that blas lib also appears on link line in case
     21075# someone wants to use Blas functions but tests only for Lapack.
     21076  if test "$coin_has_lapack" = no ; then
     21077    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lapack.pc and blas.pc" >&5
     21078$as_echo_n "checking for lapack.pc and blas.pc... " >&6; }
     21079
     21080
     21081
     21082  if test -n "$PKG_CONFIG" ; then
     21083    if PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --exists "lapack blas" ; then
     21084      LAPACK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "lapack blas" 2>/dev/null | tr '\n' ' '`
     21085      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
     21086$as_echo "yes" >&6; }
     21087
     21088  # setup LIBS by adding  and those from lapack
    2105821089  ac_save_LIBS="$LIBS"
    21059   LIBS="-framework Accelerate $LIBS"
    21060 
     21090
     21091  if test -n "lapack" ; then
     21092
     21093      temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs lapack`
     21094      LIBS="$temp_LFLAGS $LIBS"
     21095    fi
    2106121096
    2106221097  dsyev_namemangling=unknown
     
    2112221157
    2112321158  if test $ac_success = yes ; then
    21124 
    21125             coin_has_lapack=yes
    21126             lapack_lflags="-framework Accelerate"
    21127 
     21159    coin_has_lapack=yes
     21160         lapack_pcfiles="lapack blas"
     21161    else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
    2112821162  fi
    2112921163
    21130         fi
    21131       ;;
    21132     esac
     21164    else
     21165      LAPACK_PKG_ERRORS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack blas"`
     21166      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     21167$as_echo "no" >&6; }
     21168    fi
     21169  else
     21170    as_fn_error $? "\"Cannot check for existence of module lapack without pkgconf\"" "$LINENO" 5
    2113321171  fi
    2113421172
    21135 # If none of the above worked, check whether lapack.pc blas.pc exists and links
     21173  fi
     21174
     21175# TODO do we need another check with lapack.pc only?
     21176
     21177# If none of the above worked, try the generic -llapack -lblas as last resort.
    2113621178# We check for both to ensure that blas lib also appears on link line in case
    2113721179# someone wants to use Blas functions but tests only for Lapack.
    2113821180  if test "$coin_has_lapack" = no ; then
    21139     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lapack.pc and blas.pc" >&5
    21140 $as_echo_n "checking for lapack.pc and blas.pc... " >&6; }
    21141 
    21142 
    21143 
    21144   if test -n "$PKG_CONFIG" ; then
    21145     if PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --exists "lapack blas" ; then
    21146       LAPACK_VERSIONS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --modversion "lapack blas" 2>/dev/null | tr '\n' ' '`
    21147       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    21148 $as_echo "yes" >&6; }
    21149 
    21150   # setup LIBS by adding  and those from lapack
     21181
     21182  # setup LIBS by adding -llapack -lblas and those from
    2115121183  ac_save_LIBS="$LIBS"
    21152 
    21153   if test -n "lapack" ; then
    21154 
    21155       temp_LFLAGS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --libs lapack`
    21156       LIBS="$temp_LFLAGS $LIBS"
    21157     fi
     21184  LIBS="-llapack -lblas $LIBS"
     21185
    2115821186
    2115921187  dsyev_namemangling=unknown
     
    2121921247
    2122021248  if test $ac_success = yes ; then
    21221     coin_has_lapack=yes
    21222          lapack_pcfiles="lapack blas"
    21223     else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
    21224   fi
    21225 
    21226     else
    21227       LAPACK_PKG_ERRORS=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "lapack blas"`
    21228       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    21229 $as_echo "no" >&6; }
    21230     fi
    21231   else
    21232     as_fn_error $? "\"Cannot check for existence of module lapack without pkgconf\"" "$LINENO" 5
    21233   fi
    21234 
    21235   fi
    21236 
    21237 # TODO do we need another check with lapack.pc only?
    21238 
    21239 # If none of the above worked, try the generic -llapack -lblas as last resort.
    21240 # We check for both to ensure that blas lib also appears on link line in case
    21241 # someone wants to use Blas functions but tests only for Lapack.
    21242   if test "$coin_has_lapack" = no ; then
    21243 
    21244   # setup LIBS by adding -llapack -lblas and those from
    21245   ac_save_LIBS="$LIBS"
    21246   LIBS="-llapack -lblas $LIBS"
    21247 
    21248 
    21249   dsyev_namemangling=unknown
    21250 
    21251   # FIXME we had "extra underscore" as additional option for ac_extra
    21252   #   but since there is no use for ac_extra below, was there any use for it?
    21253   for ac_extra in "no extra underscore" ; do
    21254     for ac_case in "lower case" "upper case" ; do
    21255       for ac_trail in "underscore" "no underscore" ; do
    21256         #AC_MSG_NOTICE([Attempting link for ${ac_case}, ${ac_trail}, ${ac_extra}])
    21257         case $ac_case in
    21258           "lower case")
    21259             ac_name=dsyev
    21260             ;;
    21261           "upper case")
    21262             ac_name=DSYEV
    21263             ;;
    21264         esac
    21265         if test "$ac_trail" = underscore ; then
    21266           ac_name=${ac_name}_
    21267         fi
    21268         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for function $ac_name in $LIBS" >&5
    21269 $as_echo_n "checking for function $ac_name in $LIBS... " >&6; }
    21270         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    21271 /* end confdefs.h.  */
    21272 #ifdef __cplusplus
    21273              extern "C"
    21274              #endif
    21275              void $ac_name();
    21276 #ifdef F77_DUMMY_MAIN
    21277 
    21278 #  ifdef __cplusplus
    21279      extern "C"
    21280 #  endif
    21281    int F77_DUMMY_MAIN() { return 1; }
    21282 
    21283 #endif
    21284 int
    21285 main ()
    21286 {
    21287 $ac_name()
    21288   ;
    21289   return 0;
    21290 }
    21291 _ACEOF
    21292 if ac_fn_c_try_link "$LINENO"; then :
    21293   dsyev_namemangling="${ac_case}, ${ac_trail}, ${ac_extra}"
    21294            ac_success=yes
    21295 else
    21296   ac_success=no
    21297 fi
    21298 rm -f core conftest.err conftest.$ac_objext \
    21299     conftest$ac_exeext conftest.$ac_ext
    21300         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_success" >&5
    21301 $as_echo "$ac_success" >&6; }
    21302         if test $ac_success = yes ; then
    21303           break 3
    21304         fi
    21305       done
    21306     done
    21307   done
    21308   LIBS=$ac_save_LIBS
    21309 
    21310   if test $ac_success = yes ; then
    2131121249
    2131221250      coin_has_lapack=yes
     
    2147921417# is assigned to prim_data.
    2148021418
    21481   withval=$with_metis
     21419  withval="$with_metis"
    2148221420  if test -n "$withval" ; then
    2148321421    case "$withval" in
     
    2149321431      * )
    2149421432        coin_has_metis=yes
    21495         metis_lflags=$withval
     21433        metis_lflags="$withval"
    2149621434        ;;
    2149721435    esac
     
    2150321441
    2150421442  if test "$coin_has_metis" != skipping ; then
    21505        withval=$with_metis_lflags
     21443       withval="$with_metis_lflags"
    2150621444       if test -n "$withval" ; then
    2150721445         case "$withval" in
     
    2151121449           * )
    2151221450             coin_has_metis=yes
    21513              metis_lflags=$withval
     21451             metis_lflags="$withval"
    2151421452             ;;
    2151521453         esac
    2151621454       fi
    2151721455
    21518        withval=$with_metis_cflags
     21456       withval="$with_metis_cflags"
    2151921457       if test -n "$withval" ; then
    2152021458         case "$withval" in
     
    2160521543# Define BUILDTOOLS_DEBUG to enable debugging output
    2160621544
    21607     if test "$BUILDTOOLS_DEBUG" = 1 ; then
    21608       { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&5
     21545  if test "$BUILDTOOLS_DEBUG" = 1 ; then
     21546    { $as_echo "$as_me:${as_lineno-$LINENO}: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&5
    2160921547$as_echo "$as_me: FIND_PRIM_PKG result for metis: \"$coin_has_metis\"" >&6;}
    21610       { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'metis'" >&5
     21548    { $as_echo "$as_me:${as_lineno-$LINENO}: Collected values for package 'metis'" >&5
    2161121549$as_echo "$as_me: Collected values for package 'metis'" >&6;}
    21612       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_lflags is \"$metis_lflags\"" >&5
     21550    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_lflags is \"$metis_lflags\"" >&5
    2161321551$as_echo "$as_me: metis_lflags is \"$metis_lflags\"" >&6;}
    21614       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_cflags is \"$metis_cflags\"" >&5
     21552    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_cflags is \"$metis_cflags\"" >&5
    2161521553$as_echo "$as_me: metis_cflags is \"$metis_cflags\"" >&6;}
    21616       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_data is \"$metis_data\"" >&5
     21554    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_data is \"$metis_data\"" >&5
    2161721555$as_echo "$as_me: metis_data is \"$metis_data\"" >&6;}
    21618       { $as_echo "$as_me:${as_lineno-$LINENO}: metis_pcfiles is \"$metis_pcfiles\"" >&5
     21556    { $as_echo "$as_me:${as_lineno-$LINENO}: metis_pcfiles is \"$metis_pcfiles\"" >&5
    2161921557$as_echo "$as_me: metis_pcfiles is \"$metis_pcfiles\"" >&6;}
    21620     fi
     21558  fi
    2162121559
    2162221560
     
    2465224590             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
    2465324591              \
     24592             -e '/func_append old_deplibs/s/\(.*\)/case $arg in *mkl_*.lib) ;; *) \1 ;; esac/g' \
     24593             -e '/static library .deplib is not portable/a case $deplib in *mkl_*.lib) newdependency_libs="$deplib $newdependency_libs" ;; esac' \
    2465424594         libtool > libtool.tmp
    2465524595         mv libtool.tmp libtool
Note: See TracChangeset for help on using the changeset viewer.