Changeset 4046


Ignore:
Timestamp:
Jan 7, 2020 5:48:41 AM (5 months ago)
Author:
stefan
Message:

check for pkg-config also if no ma57 or higher

Location:
ThirdParty/HSL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/configure

    r4023 r4046  
    651651COIN_HAS_LAPACK_FALSE
    652652COIN_HAS_LAPACK_TRUE
    653 COIN_PKG_CONFIG_PATH
    654 COIN_HAS_PKGCONFIG_FALSE
    655 COIN_HAS_PKGCONFIG_TRUE
    656 ac_ct_PKG_CONFIG
    657 PKG_CONFIG
    658653HSL_PCFILES
    659654HSL_LFLAGS
     
    677672COIN_HAS_MC19_FALSE
    678673COIN_HAS_MC19_TRUE
     674COIN_PKG_CONFIG_PATH
     675COIN_HAS_PKGCONFIG_FALSE
     676COIN_HAS_PKGCONFIG_TRUE
     677ac_ct_PKG_CONFIG
     678PKG_CONFIG
    679679LT_LDFLAGS
    680680CPP
     
    1986719867#############################################################################
    1986819868
    19869 
    19870 
    19871 
    19872 
    19873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MC19" >&5
    19874 $as_echo_n "checking for MC19... " >&6; }
    19875 if test -r "$srcdir/coinhsl/mc19/mc19d.f" ; then
    19876 
    19877 $as_echo "#define COINHSL_HAS_MC19 1" >>confdefs.h
    19878 
    19879   coin_has_mc19=yes
    19880 else
    19881   coin_has_mc19=no
    19882 fi
    19883 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_mc19" >&5
    19884 $as_echo "$coin_has_mc19" >&6; }
    19885  if test $coin_has_mc19 = yes; then
    19886   COIN_HAS_MC19_TRUE=
    19887   COIN_HAS_MC19_FALSE='#'
    19888 else
    19889   COIN_HAS_MC19_TRUE='#'
    19890   COIN_HAS_MC19_FALSE=
    19891 fi
    19892 
    19893 
    19894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA27" >&5
    19895 $as_echo_n "checking for MA27... " >&6; }
    19896 if test -r "$srcdir/coinhsl/ma27/ma27d.f" ; then
    19897 
    19898 $as_echo "#define COINHSL_HAS_MA27 1" >>confdefs.h
    19899 
    19900   coin_has_ma27=yes
    19901 else
    19902   coin_has_ma27=no
    19903 fi
    19904 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma27" >&5
    19905 $as_echo "$coin_has_ma27" >&6; }
    19906  if test $coin_has_ma27 = yes; then
    19907   COIN_HAS_MA27_TRUE=
    19908   COIN_HAS_MA27_FALSE='#'
    19909 else
    19910   COIN_HAS_MA27_TRUE='#'
    19911   COIN_HAS_MA27_FALSE=
    19912 fi
    19913 
    19914 
    19915 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA28" >&5
    19916 $as_echo_n "checking for MA28... " >&6; }
    19917 if test -r "$srcdir/coinhsl/ma28/ma28d.f" ; then
    19918 
    19919 $as_echo "#define COINHSL_HAS_MA28 1" >>confdefs.h
    19920 
    19921   coin_has_ma28=yes
    19922 else
    19923   coin_has_ma28=no
    19924 fi
    19925 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma28" >&5
    19926 $as_echo "$coin_has_ma28" >&6; }
    19927  if test $coin_has_ma28 = yes; then
    19928   COIN_HAS_MA28_TRUE=
    19929   COIN_HAS_MA28_FALSE='#'
    19930 else
    19931   COIN_HAS_MA28_TRUE='#'
    19932   COIN_HAS_MA28_FALSE=
    19933 fi
    19934 
    19935 
    19936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA57" >&5
    19937 $as_echo_n "checking for MA57... " >&6; }
    19938 if test -r "$srcdir/coinhsl/ma57/ma57d.f" ; then
    19939 
    19940 $as_echo "#define COINHSL_HAS_MA57 1" >>confdefs.h
    19941 
    19942   coin_has_ma57=yes
    19943 else
    19944   coin_has_ma57=no
    19945 fi
    19946 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma57" >&5
    19947 $as_echo "$coin_has_ma57" >&6; }
    19948  if test $coin_has_ma57 = yes; then
    19949   COIN_HAS_MA57_TRUE=
    19950   COIN_HAS_MA57_FALSE='#'
    19951 else
    19952   COIN_HAS_MA57_TRUE='#'
    19953   COIN_HAS_MA57_FALSE=
    19954 fi
    19955 
    19956 
    19957 if test -n "$FC" ; then
    19958    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA77" >&5
    19959 $as_echo_n "checking for MA77... " >&6; }
    19960    if test -r "$srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90" ; then
    19961 
    19962 $as_echo "#define COINHSL_HAS_MA77 1" >>confdefs.h
    19963 
    19964      coin_has_hsl_ma77=yes
    19965    else
    19966      coin_has_hsl_ma77=no
    19967    fi
    19968    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma77" >&5
    19969 $as_echo "$coin_has_hsl_ma77" >&6; }
    19970 else
    19971   coin_has_hsl_ma77=no
    19972 fi
    19973  if test $coin_has_hsl_ma77 = yes; then
    19974   COIN_HAS_HSL_MA77_TRUE=
    19975   COIN_HAS_HSL_MA77_FALSE='#'
    19976 else
    19977   COIN_HAS_HSL_MA77_TRUE='#'
    19978   COIN_HAS_HSL_MA77_FALSE=
    19979 fi
    19980 
    19981 
    19982 if test -n "$FC" ; then
    19983    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA86" >&5
    19984 $as_echo_n "checking for MA86... " >&6; }
    19985    if test -r "$srcdir/coinhsl/hsl_ma86/hsl_ma86d.f90" ; then
    19986 
    19987 $as_echo "#define COINHSL_HAS_MA86 1" >>confdefs.h
    19988 
    19989      coin_has_hsl_ma86=yes
    19990    else
    19991      coin_has_hsl_ma86=no
    19992    fi
    19993    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma86" >&5
    19994 $as_echo "$coin_has_hsl_ma86" >&6; }
    19995 else
    19996   coin_has_hsl_ma86=no
    19997 fi
    19998  if test $coin_has_hsl_ma86 = yes; then
    19999   COIN_HAS_HSL_MA86_TRUE=
    20000   COIN_HAS_HSL_MA86_FALSE='#'
    20001 else
    20002   COIN_HAS_HSL_MA86_TRUE='#'
    20003   COIN_HAS_HSL_MA86_FALSE=
    20004 fi
    20005 
    20006 
    20007 if test -n "$FC" ; then
    20008    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA97" >&5
    20009 $as_echo_n "checking for MA97... " >&6; }
    20010    if test -r "$srcdir/coinhsl/hsl_ma97/hsl_ma97d.f90" ; then
    20011 
    20012 $as_echo "#define COINHSL_HAS_MA97 1" >>confdefs.h
    20013 
    20014      coin_has_hsl_ma97=yes
    20015    else
    20016      coin_has_hsl_ma97=no
    20017    fi
    20018    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma97" >&5
    20019 $as_echo "$coin_has_hsl_ma97" >&6; }
    20020 else
    20021   coin_has_hsl_ma97=no
    20022 fi
    20023  if test $coin_has_hsl_ma97 = yes; then
    20024   COIN_HAS_HSL_MA97_TRUE=
    20025   COIN_HAS_HSL_MA97_FALSE='#'
    20026 else
    20027   COIN_HAS_HSL_MA97_TRUE='#'
    20028   COIN_HAS_HSL_MA97_FALSE=
    20029 fi
    20030 
    20031 
    20032 
    20033 coin_has_hsl_mc68=no
    20034 if test -n "$F90"; then
    20035   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C interface to MC68" >&5
    20036 $as_echo_n "checking for C interface to MC68... " >&6; }
    20037   if test -r "$srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90" ; then
    20038 
    20039 $as_echo "#define COINHSL_HAS_MC68 1" >>confdefs.h
    20040 
    20041     coin_has_hsl_mc68=yes
    20042   fi
    20043   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_mc68" >&5
    20044 $as_echo "$coin_has_hsl_mc68" >&6; }
    20045 fi
    20046  if test $coin_has_hsl_mc68 = yes; then
    20047   COIN_HAS_HSL_MC68_TRUE=
    20048   COIN_HAS_HSL_MC68_FALSE='#'
    20049 else
    20050   COIN_HAS_HSL_MC68_TRUE='#'
    20051   COIN_HAS_HSL_MC68_FALSE=
    20052 fi
    20053 
    20054 
    20055 # the F90 codes depend on deps90.f90
    20056 coin_has_depsf90=no
    20057 if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
    20058   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deps90.f90" >&5
    20059 $as_echo_n "checking for deps90.f90... " >&6; }
    20060   if test -r "$srcdir/coinhsl/common/deps90.f90" ; then
    20061     coin_has_depsf90=yes
    20062   fi
    20063   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_depsf90" >&5
    20064 $as_echo "$coin_has_depsf90" >&6; }
    20065   if test $coin_has_depsf90 = no; then
    20066     as_fn_error $? "Required file common/deps90.f90 not found" "$LINENO" 5
    20067   fi
    20068 fi
    20069  if test $coin_has_depsf90 = yes; then
    20070   COIN_HAS_DEPSF90_TRUE=
    20071   COIN_HAS_DEPSF90_FALSE='#'
    20072 else
    20073   COIN_HAS_DEPSF90_TRUE='#'
    20074   COIN_HAS_DEPSF90_FALSE=
    20075 fi
    20076 
    20077 
    20078 # MA57, MA77, and MA86 require BLAS, MA97 requires LAPACK
    20079 if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
     19869# do this unconditionally to make sure COIN_HAS_PKGCONFIG is also defined if no >= MA57
    2008019870
    2008119871
     
    2024020030
    2024120031
     20032
     20033
     20034
     20035
     20036
     20037{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MC19" >&5
     20038$as_echo_n "checking for MC19... " >&6; }
     20039if test -r "$srcdir/coinhsl/mc19/mc19d.f" ; then
     20040
     20041$as_echo "#define COINHSL_HAS_MC19 1" >>confdefs.h
     20042
     20043  coin_has_mc19=yes
     20044else
     20045  coin_has_mc19=no
     20046fi
     20047{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_mc19" >&5
     20048$as_echo "$coin_has_mc19" >&6; }
     20049 if test $coin_has_mc19 = yes; then
     20050  COIN_HAS_MC19_TRUE=
     20051  COIN_HAS_MC19_FALSE='#'
     20052else
     20053  COIN_HAS_MC19_TRUE='#'
     20054  COIN_HAS_MC19_FALSE=
     20055fi
     20056
     20057
     20058{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA27" >&5
     20059$as_echo_n "checking for MA27... " >&6; }
     20060if test -r "$srcdir/coinhsl/ma27/ma27d.f" ; then
     20061
     20062$as_echo "#define COINHSL_HAS_MA27 1" >>confdefs.h
     20063
     20064  coin_has_ma27=yes
     20065else
     20066  coin_has_ma27=no
     20067fi
     20068{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma27" >&5
     20069$as_echo "$coin_has_ma27" >&6; }
     20070 if test $coin_has_ma27 = yes; then
     20071  COIN_HAS_MA27_TRUE=
     20072  COIN_HAS_MA27_FALSE='#'
     20073else
     20074  COIN_HAS_MA27_TRUE='#'
     20075  COIN_HAS_MA27_FALSE=
     20076fi
     20077
     20078
     20079{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA28" >&5
     20080$as_echo_n "checking for MA28... " >&6; }
     20081if test -r "$srcdir/coinhsl/ma28/ma28d.f" ; then
     20082
     20083$as_echo "#define COINHSL_HAS_MA28 1" >>confdefs.h
     20084
     20085  coin_has_ma28=yes
     20086else
     20087  coin_has_ma28=no
     20088fi
     20089{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma28" >&5
     20090$as_echo "$coin_has_ma28" >&6; }
     20091 if test $coin_has_ma28 = yes; then
     20092  COIN_HAS_MA28_TRUE=
     20093  COIN_HAS_MA28_FALSE='#'
     20094else
     20095  COIN_HAS_MA28_TRUE='#'
     20096  COIN_HAS_MA28_FALSE=
     20097fi
     20098
     20099
     20100{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA57" >&5
     20101$as_echo_n "checking for MA57... " >&6; }
     20102if test -r "$srcdir/coinhsl/ma57/ma57d.f" ; then
     20103
     20104$as_echo "#define COINHSL_HAS_MA57 1" >>confdefs.h
     20105
     20106  coin_has_ma57=yes
     20107else
     20108  coin_has_ma57=no
     20109fi
     20110{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_ma57" >&5
     20111$as_echo "$coin_has_ma57" >&6; }
     20112 if test $coin_has_ma57 = yes; then
     20113  COIN_HAS_MA57_TRUE=
     20114  COIN_HAS_MA57_FALSE='#'
     20115else
     20116  COIN_HAS_MA57_TRUE='#'
     20117  COIN_HAS_MA57_FALSE=
     20118fi
     20119
     20120
     20121if test -n "$FC" ; then
     20122   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA77" >&5
     20123$as_echo_n "checking for MA77... " >&6; }
     20124   if test -r "$srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90" ; then
     20125
     20126$as_echo "#define COINHSL_HAS_MA77 1" >>confdefs.h
     20127
     20128     coin_has_hsl_ma77=yes
     20129   else
     20130     coin_has_hsl_ma77=no
     20131   fi
     20132   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma77" >&5
     20133$as_echo "$coin_has_hsl_ma77" >&6; }
     20134else
     20135  coin_has_hsl_ma77=no
     20136fi
     20137 if test $coin_has_hsl_ma77 = yes; then
     20138  COIN_HAS_HSL_MA77_TRUE=
     20139  COIN_HAS_HSL_MA77_FALSE='#'
     20140else
     20141  COIN_HAS_HSL_MA77_TRUE='#'
     20142  COIN_HAS_HSL_MA77_FALSE=
     20143fi
     20144
     20145
     20146if test -n "$FC" ; then
     20147   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA86" >&5
     20148$as_echo_n "checking for MA86... " >&6; }
     20149   if test -r "$srcdir/coinhsl/hsl_ma86/hsl_ma86d.f90" ; then
     20150
     20151$as_echo "#define COINHSL_HAS_MA86 1" >>confdefs.h
     20152
     20153     coin_has_hsl_ma86=yes
     20154   else
     20155     coin_has_hsl_ma86=no
     20156   fi
     20157   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma86" >&5
     20158$as_echo "$coin_has_hsl_ma86" >&6; }
     20159else
     20160  coin_has_hsl_ma86=no
     20161fi
     20162 if test $coin_has_hsl_ma86 = yes; then
     20163  COIN_HAS_HSL_MA86_TRUE=
     20164  COIN_HAS_HSL_MA86_FALSE='#'
     20165else
     20166  COIN_HAS_HSL_MA86_TRUE='#'
     20167  COIN_HAS_HSL_MA86_FALSE=
     20168fi
     20169
     20170
     20171if test -n "$FC" ; then
     20172   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MA97" >&5
     20173$as_echo_n "checking for MA97... " >&6; }
     20174   if test -r "$srcdir/coinhsl/hsl_ma97/hsl_ma97d.f90" ; then
     20175
     20176$as_echo "#define COINHSL_HAS_MA97 1" >>confdefs.h
     20177
     20178     coin_has_hsl_ma97=yes
     20179   else
     20180     coin_has_hsl_ma97=no
     20181   fi
     20182   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_ma97" >&5
     20183$as_echo "$coin_has_hsl_ma97" >&6; }
     20184else
     20185  coin_has_hsl_ma97=no
     20186fi
     20187 if test $coin_has_hsl_ma97 = yes; then
     20188  COIN_HAS_HSL_MA97_TRUE=
     20189  COIN_HAS_HSL_MA97_FALSE='#'
     20190else
     20191  COIN_HAS_HSL_MA97_TRUE='#'
     20192  COIN_HAS_HSL_MA97_FALSE=
     20193fi
     20194
     20195
     20196
     20197coin_has_hsl_mc68=no
     20198if test -n "$F90"; then
     20199  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C interface to MC68" >&5
     20200$as_echo_n "checking for C interface to MC68... " >&6; }
     20201  if test -r "$srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90" ; then
     20202
     20203$as_echo "#define COINHSL_HAS_MC68 1" >>confdefs.h
     20204
     20205    coin_has_hsl_mc68=yes
     20206  fi
     20207  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_hsl_mc68" >&5
     20208$as_echo "$coin_has_hsl_mc68" >&6; }
     20209fi
     20210 if test $coin_has_hsl_mc68 = yes; then
     20211  COIN_HAS_HSL_MC68_TRUE=
     20212  COIN_HAS_HSL_MC68_FALSE='#'
     20213else
     20214  COIN_HAS_HSL_MC68_TRUE='#'
     20215  COIN_HAS_HSL_MC68_FALSE=
     20216fi
     20217
     20218
     20219# the F90 codes depend on deps90.f90
     20220coin_has_depsf90=no
     20221if test $coin_has_hsl_mc68$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
     20222  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deps90.f90" >&5
     20223$as_echo_n "checking for deps90.f90... " >&6; }
     20224  if test -r "$srcdir/coinhsl/common/deps90.f90" ; then
     20225    coin_has_depsf90=yes
     20226  fi
     20227  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_depsf90" >&5
     20228$as_echo "$coin_has_depsf90" >&6; }
     20229  if test $coin_has_depsf90 = no; then
     20230    as_fn_error $? "Required file common/deps90.f90 not found" "$LINENO" 5
     20231  fi
     20232fi
     20233 if test $coin_has_depsf90 = yes; then
     20234  COIN_HAS_DEPSF90_TRUE=
     20235  COIN_HAS_DEPSF90_FALSE='#'
     20236else
     20237  COIN_HAS_DEPSF90_TRUE='#'
     20238  COIN_HAS_DEPSF90_FALSE=
     20239fi
     20240
     20241
     20242# MA57, MA77, and MA86 require BLAS, MA97 requires LAPACK
     20243if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_ma86$coin_has_hsl_ma97 != nononono ; then
    2024220244
    2024320245# Make sure the necessary variables exist for each client package.
     
    2190621908Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2190721909fi
     21910if test -z "${COIN_HAS_PKGCONFIG_TRUE}" && test -z "${COIN_HAS_PKGCONFIG_FALSE}"; then
     21911  as_fn_error $? "conditional \"COIN_HAS_PKGCONFIG\" was never defined.
     21912Usually this means the macro was only invoked conditionally." "$LINENO" 5
     21913fi
    2190821914if test -z "${COIN_HAS_MC19_TRUE}" && test -z "${COIN_HAS_MC19_FALSE}"; then
    2190921915  as_fn_error $? "conditional \"COIN_HAS_MC19\" was never defined.
     
    2194021946if test -z "${COIN_HAS_DEPSF90_TRUE}" && test -z "${COIN_HAS_DEPSF90_FALSE}"; then
    2194121947  as_fn_error $? "conditional \"COIN_HAS_DEPSF90\" was never defined.
    21942 Usually this means the macro was only invoked conditionally." "$LINENO" 5
    21943 fi
    21944 if test -z "${COIN_HAS_PKGCONFIG_TRUE}" && test -z "${COIN_HAS_PKGCONFIG_FALSE}"; then
    21945   as_fn_error $? "conditional \"COIN_HAS_PKGCONFIG\" was never defined.
    2194621948Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2194721949fi
  • ThirdParty/HSL/trunk/configure.ac

    r4023 r4046  
    5151#                    Find out which files are available                     #
    5252#############################################################################
     53
     54# do this unconditionally to make sure COIN_HAS_PKGCONFIG is also defined if no >= MA57
     55AC_COIN_HAS_PKGCONFIG
    5356
    5457AC_DEFUN([MY_CHECK_HSLFILE],
Note: See TracChangeset for help on using the changeset viewer.