Changeset 3862


Ignore:
Timestamp:
Oct 16, 2018 12:39:10 PM (11 months ago)
Author:
stefan
Message:

replace tabs by spaces

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r3859 r3862  
    249249      AC_CONFIG_COMMANDS([libtoolpatch],
    250250        [sed -e 's|AR_FLAGS |AR_FLAGS|g' libtool > libtool.tmp
    251         mv libtool.tmp libtool
    252         chmod 755 libtool])
     251        mv libtool.tmp libtool
     252        chmod 755 libtool])
    253253      ;;
    254254  esac
     
    527527
    528528       if test 1 = 1 ; then
    529         AC_MSG_NOTICE([CHK_HERE adding $1 to myvar:])
    530         AC_MSG_NOTICE([m4_toupper(myvar)_PCFILES: "${m4_toupper(myvar)_PCFILES}"])
    531         AC_MSG_NOTICE([m4_toupper(myvar)_LFLAGS: "${m4_toupper(myvar)_LFLAGS}"])
    532         AC_MSG_NOTICE([m4_toupper(myvar)_CFLAGS: "${m4_toupper(myvar)_CFLAGS}"])
     529        AC_MSG_NOTICE([CHK_HERE adding $1 to myvar:])
     530        AC_MSG_NOTICE([m4_toupper(myvar)_PCFILES: "${m4_toupper(myvar)_PCFILES}"])
     531        AC_MSG_NOTICE([m4_toupper(myvar)_LFLAGS: "${m4_toupper(myvar)_LFLAGS}"])
     532        AC_MSG_NOTICE([m4_toupper(myvar)_CFLAGS: "${m4_toupper(myvar)_CFLAGS}"])
    533533       fi
    534534      ])
     
    572572      m4_case($3$4$5,nonono,,
    573573        nonoyes,
    574         Any other argument is applied as for --with-m4_tolower($1)-data,
    575         noyesno,
    576         Any other argument is applied as for --with-m4_tolower($1)-cflags,
    577         noyesyes,
    578         Any other argument is applied as for --with-m4_tolower($1)-cflags,
    579         Any other argument is applied as for --with-m4_tolower($1)-lflags))])
     574        Any other argument is applied as for --with-m4_tolower($1)-data,
     575        noyesno,
     576        Any other argument is applied as for --with-m4_tolower($1)-cflags,
     577        noyesyes,
     578        Any other argument is applied as for --with-m4_tolower($1)-cflags,
     579        Any other argument is applied as for --with-m4_tolower($1)-lflags))])
    580580
    581581  m4_if($2,yes,
     
    586586    [AC_ARG_WITH([m4_tolower($1)-lflags],
    587587       AS_HELP_STRING([--with-m4_tolower($1)-lflags],
    588         [Linker flags for $1 appropriate for your environment.
    589           (Most often, -l specs for libraries.)]))])
     588        [Linker flags for $1 appropriate for your environment.
     589          (Most often, -l specs for libraries.)]))])
    590590
    591591  m4_if($4,yes,
     
    593593       AS_HELP_STRING([--with-m4_tolower($1)-cflags],
    594594         [Compiler flags for $1 appropriate for your environment.
    595           (Most often, -I specs for header file directories.)]))])
     595          (Most often, -I specs for header file directories.)]))])
    596596
    597597  m4_if($5,yes,
    598598    [AC_ARG_WITH([m4_tolower($1)-data],
    599599       AS_HELP_STRING([--with-m4_tolower($1)-data],
    600         [A data directory specification for $1 appropriate for your
    601           environment.]))])
     600        [A data directory specification for $1 appropriate for your
     601          environment.]))])
    602602])   # COIN_DEF_PRIM_ARGS
    603603
     
    668668    case "$withval" in
    669669      no )
    670         m4_tolower(coin_has_$1)=skipping
    671         ;;
     670        m4_tolower(coin_has_$1)=skipping
     671        ;;
    672672      yes )
    673         m4_tolower(coin_has_$1)=requested
    674         ;;
     673        m4_tolower(coin_has_$1)=requested
     674        ;;
    675675      build )
    676         m4_tolower(coin_has_$1)=build
    677         ;;
     676        m4_tolower(coin_has_$1)=build
     677        ;;
    678678      * )
    679         m4_tolower(coin_has_$1)=yes
    680         m4_if(m4_default($4,nodata),dataonly,
    681           [m4_tolower($1_data)=$withval],
    682           [m4_tolower($1_lflags)=$withval])
    683         ;;
     679        m4_tolower(coin_has_$1)=yes
     680        m4_if(m4_default($4,nodata),dataonly,
     681          [m4_tolower($1_data)=$withval],
     682          [m4_tolower($1_lflags)=$withval])
     683        ;;
    684684    esac
    685685  fi
     
    693693       withval=$m4_tolower(with_$1_lflags)
    694694       if test -n "$withval" ; then
    695         case "$withval" in
    696            build | no | yes )
    697              AC_MSG_ERROR(["$withval" is not valid here; please specify linker flags appropriate for your environment.])
    698              ;;
    699            * )
    700              m4_tolower(coin_has_$1)=yes
    701              m4_tolower($1_lflags)=$withval
    702              ;;
    703         esac
     695        case "$withval" in
     696           build | no | yes )
     697             AC_MSG_ERROR(["$withval" is not valid here; please specify linker flags appropriate for your environment.])
     698             ;;
     699           * )
     700             m4_tolower(coin_has_$1)=yes
     701             m4_tolower($1_lflags)=$withval
     702             ;;
     703        esac
    704704       fi
    705705
    706706       withval=$m4_tolower(with_$1_cflags)
    707707       if test -n "$withval" ; then
    708         case "$withval" in
    709            build | no | yes )
    710              AC_MSG_ERROR(["$withval" is not valid here; please specify compiler flags appropriate for your environment.])
    711              ;;
    712            * )
    713              m4_tolower(coin_has_$1)=yes
    714              m4_tolower($1_cflags)="$withval"
    715              ;;
    716         esac
     708        case "$withval" in
     709           build | no | yes )
     710             AC_MSG_ERROR(["$withval" is not valid here; please specify compiler flags appropriate for your environment.])
     711             ;;
     712           * )
     713             m4_tolower(coin_has_$1)=yes
     714             m4_tolower($1_cflags)="$withval"
     715             ;;
     716        esac
    717717       fi
    718718     fi])
     
    725725       withval=$m4_tolower(with_$1_data)
    726726       if test -n "$withval" ; then
    727         case "$withval" in
    728            build | no | yes )
    729              AC_MSG_ERROR(["$withval" is not valid here; please give a data directory specification appropriate for your environment.])
    730              ;;
    731            * )
    732              m4_tolower(coin_has_$1)=yes
    733              m4_tolower($1_data)="$withval"
    734              ;;
    735         esac
     727        case "$withval" in
     728           build | no | yes )
     729             AC_MSG_ERROR(["$withval" is not valid here; please give a data directory specification appropriate for your environment.])
     730             ;;
     731           * )
     732             m4_tolower(coin_has_$1)=yes
     733             m4_tolower($1_data)="$withval"
     734             ;;
     735        esac
    736736       fi
    737737     fi])
     
    750750    case $dflt_action in
    751751      no )
    752         m4_tolower(coin_has_$1)=skipping
    753         ;;
     752        m4_tolower(coin_has_$1)=skipping
     753        ;;
    754754      build )
    755         m4_tolower(coin_has_$1)=build
    756         ;;
     755        m4_tolower(coin_has_$1)=build
     756        ;;
    757757      * )
    758758        m4_tolower(coin_has_$1)=requested
    759         ;;
     759        ;;
    760760    esac
    761761  fi
     
    769769    requested | build )
    770770      if test -n "$PKG_CONFIG" ; then
    771         m4_ifnblank($2,
    772           [pcfile=$2],
    773           [if test $m4_tolower(coin_has_$1) = build ; then
    774              pcfile=m4_tolower(coin$1)
    775            else
    776              pcfile=m4_tolower($1)
    777            fi])
    778         AC_COIN_CHK_MOD_EXISTS([$1],[$pcfile],
    779           [m4_tolower(coin_has_$1)=yes
    780            m4_tolower($1_data)=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
    781            m4_tolower($1_pcfiles)="$pcfile"],
    782           [m4_tolower(coin_has_$1)=no])
     771        m4_ifnblank($2,
     772          [pcfile=$2],
     773          [if test $m4_tolower(coin_has_$1) = build ; then
     774             pcfile=m4_tolower(coin$1)
     775           else
     776             pcfile=m4_tolower($1)
     777           fi])
     778        AC_COIN_CHK_MOD_EXISTS([$1],[$pcfile],
     779          [m4_tolower(coin_has_$1)=yes
     780           m4_tolower($1_data)=`PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" $PKG_CONFIG --variable=datadir $pcfile 2>/dev/null`
     781           m4_tolower($1_pcfiles)="$pcfile"],
     782          [m4_tolower(coin_has_$1)=no])
    783783      else
    784         m4_tolower(coin_has_$1)=yes
    785         # AC_MSG_WARN([skipped check via pkgconf as no pkgconf available])
     784        m4_tolower(coin_has_$1)=yes
     785        # AC_MSG_WARN([skipped check via pkgconf as no pkgconf available])
    786786      fi
    787787      ;;
     
    875875    for pkg in $COIN_SKIP_PROJECTS ; do
    876876      if test "$m4_tolower(pkg)" = "$m4_tolower($1)" ; then
    877         m4_tolower(coin_has_$1)=skipping
     877        m4_tolower(coin_has_$1)=skipping
    878878      fi
    879879    done
     
    904904
    905905  AM_CONDITIONAL(m4_toupper(COIN_HAS_$1),
    906                 [test $m4_tolower(coin_has_$1) = yes])
     906                  [test $m4_tolower(coin_has_$1) = yes])
    907907
    908908# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     
    10001000    case "$withval" in
    10011001      no )
    1002         m4_tolower(coin_has_$1)=skipping
    1003         ;;
     1002        m4_tolower(coin_has_$1)=skipping
     1003        ;;
    10041004      yes )
    1005         m4_tolower(coin_has_$1)=requested
    1006         ;;
     1005        m4_tolower(coin_has_$1)=requested
     1006        ;;
    10071007      build )
    1008         m4_tolower(coin_has_$1)=build
    1009         ;;
     1008        m4_tolower(coin_has_$1)=build
     1009        ;;
    10101010      * )
    1011         m4_tolower(coin_has_$1)=yes
    1012         m4_if(m4_default($8,nodata),dataonly,
    1013           [m4_tolower($1_data)=$withval],
    1014           [m4_tolower($1_lflags)=$withval])
    1015         ;;
     1011        m4_tolower(coin_has_$1)=yes
     1012        m4_if(m4_default($8,nodata),dataonly,
     1013          [m4_tolower($1_data)=$withval],
     1014          [m4_tolower($1_lflags)=$withval])
     1015        ;;
    10161016    esac
    10171017  fi
     
    10251025       withval=$m4_tolower(with_$1_lflags)
    10261026       if test -n "$withval" ; then
    1027         case "$withval" in
    1028            build | no | yes )
    1029              AC_MSG_ERROR(["$withval" is not valid here; please specify linker flags appropriate for your environment.])
    1030              ;;
    1031            * )
    1032              m4_tolower(coin_has_$1)=yes
    1033              m4_tolower($1_lflags)=$withval
    1034              ;;
    1035         esac
     1027        case "$withval" in
     1028           build | no | yes )
     1029             AC_MSG_ERROR(["$withval" is not valid here; please specify linker flags appropriate for your environment.])
     1030             ;;
     1031           * )
     1032             m4_tolower(coin_has_$1)=yes
     1033             m4_tolower($1_lflags)=$withval
     1034             ;;
     1035        esac
    10361036       fi
    10371037
    10381038       withval=$m4_tolower(with_$1_cflags)
    10391039       if test -n "$withval" ; then
    1040         case "$withval" in
    1041            build | no | yes )
    1042              AC_MSG_ERROR(["$withval" is not valid here; please specify compiler flags appropriate for your environment.])
    1043              ;;
    1044            * )
    1045              m4_tolower(coin_has_$1)=yes
    1046              m4_tolower($1_cflags)="$withval"
    1047              ;;
    1048         esac
     1040        case "$withval" in
     1041           build | no | yes )
     1042             AC_MSG_ERROR(["$withval" is not valid here; please specify compiler flags appropriate for your environment.])
     1043             ;;
     1044           * )
     1045             m4_tolower(coin_has_$1)=yes
     1046             m4_tolower($1_cflags)="$withval"
     1047             ;;
     1048        esac
    10491049       fi
    10501050     fi])
     
    10571057       withval=$m4_tolower(with_$1_data)
    10581058       if test -n "$withval" ; then
    1059         case "$withval" in
    1060            build | no | yes )
    1061              AC_MSG_ERROR(["$withval" is not valid here; please give a data directory specification appropriate for your environment.])
    1062              ;;
    1063            * )
    1064              m4_tolower(coin_has_$1)=yes
    1065              m4_tolower($1_data)="$withval"
    1066              ;;
    1067         esac
     1059        case "$withval" in
     1060           build | no | yes )
     1061             AC_MSG_ERROR(["$withval" is not valid here; please give a data directory specification appropriate for your environment.])
     1062             ;;
     1063           * )
     1064             m4_tolower(coin_has_$1)=yes
     1065             m4_tolower($1_data)="$withval"
     1066             ;;
     1067        esac
    10681068       fi
    10691069     fi])
     
    10821082    case $dflt_action in
    10831083      no )
    1084         m4_tolower(coin_has_$1)=skipping
    1085         ;;
     1084        m4_tolower(coin_has_$1)=skipping
     1085        ;;
    10861086      build )
    1087         m4_tolower(coin_has_$1)=build
    1088         ;;
     1087        m4_tolower(coin_has_$1)=build
     1088        ;;
    10891089      * )
    10901090        m4_tolower(coin_has_$1)=requested
    1091         ;;
     1091        ;;
    10921092    esac
    10931093  fi
     
    11001100      m4_if(m4_default($8,nodata),dataonly,[],
    11011101        [m4_ifnblank([$2],
    1102            [m4_tolower($1_lflags)=$2],
     1102           [m4_tolower($1_lflags)=$2],
    11031103           [if test "$m4_tolower(coin_has_$1)" = build ; then
    1104               m4_tolower($1_lflags)="-L\$(libdir) -l[]m4_tolower(coin$1)"
    1105             else
    1106               m4_tolower($1_lflags)="-l[]m4_tolower($1)"
    1107             fi])
     1104              m4_tolower($1_lflags)="-L\$(libdir) -l[]m4_tolower(coin$1)"
     1105            else
     1106              m4_tolower($1_lflags)="-l[]m4_tolower($1)"
     1107            fi])
    11081108         m4_ifnblank([$3],
    1109            [m4_tolower($1_cflags)=$3],
     1109           [m4_tolower($1_cflags)=$3],
    11101110           [if test "$m4_tolower(coin_has_$1)" = build ; then
    1111               m4_tolower($1_cflags)="-I\$(pkgincludedir)/ThirdParty"
    1112             fi])])
     1111              m4_tolower($1_cflags)="-I\$(pkgincludedir)/ThirdParty"
     1112            fi])])
    11131113      m4_if(m4_default($8,nodata),nodata,[],
    11141114        [m4_tolower($1_data)=m4_default([$3],
    11151115           [if test "$m4_tolower(coin_has_$1)" = build ; then
    1116               m4_tolower($1_data)="\$(pkgdatadir)"
    1117             else
    1118               m4_tolower($1_data)="/usr/local/share"
    1119             fi])])
     1116              m4_tolower($1_data)="\$(pkgdatadir)"
     1117            else
     1118              m4_tolower($1_data)="/usr/local/share"
     1119            fi])])
    11201120      m4_tolower(coin_has_$1)=yes
    11211121      ;;
     
    11381138       AC_LINK_IFELSE(
    11391139        [AC_LANG_PROGRAM(
    1140           [#ifdef __cplusplus
    1141              extern "C"
    1142            #endif
    1143            void $5();],
    1144           [$5()])],
     1140          [#ifdef __cplusplus
     1141             extern "C"
     1142           #endif
     1143           void $5();],
     1144          [$5()])],
    11451145       [],
    11461146       [m4_tolower(coin_has_$1)=no])
     
    12271227    for pkg in $COIN_SKIP_PROJECTS ; do
    12281228      if test "$m4_tolower(pkg)" = "$m4_tolower($1)" ; then
    1229         m4_tolower(coin_has_$1)=skipping
     1229        m4_tolower(coin_has_$1)=skipping
    12301230      fi
    12311231    done
     
    12561256
    12571257  AM_CONDITIONAL(m4_toupper(COIN_HAS_$1),
    1258                 [test $m4_tolower(coin_has_$1) = yes])
     1258                  [test $m4_tolower(coin_has_$1) = yes])
    12591259
    12601260# If we've located the package, define preprocessor symbol COIN_HAS_PRIM
     
    12951295    [if test "$ac_cv_search_cos" != 'none required' ; then
    12961296       m4_foreach_w([myvar],[$1],
    1297         [m4_toupper(myvar)_LFLAGS="$ac_cv_search_cos $m4_toupper(myvar)_LFLAGS"
    1298         ])
     1297        [m4_toupper(myvar)_LFLAGS="$ac_cv_search_cos $m4_toupper(myvar)_LFLAGS"
     1298        ])
    12991299     fi])
    13001300  LIBS="$coin_save_LIBS"
     
    13311331    if test x$coin_has_zlib = xyes ; then
    13321332      m4_foreach_w([myvar],[$1],
    1333         [m4_toupper(myvar)_LFLAGS="-lz $m4_toupper(myvar)_LFLAGS"
    1334         ])
     1333        [m4_toupper(myvar)_LFLAGS="-lz $m4_toupper(myvar)_LFLAGS"
     1334        ])
    13351335      AC_DEFINE([COIN_HAS_ZLIB],[1],[Define to 1 if zlib is available])
    13361336    fi
     
    13721372      m4_foreach_w([myvar],[$1],
    13731373        [m4_toupper(myvar)_LFLAGS="-lbz2 $m4_toupper(myvar)_LFLAGS"
    1374         ])
     1374        ])
    13751375      AC_DEFINE([COIN_HAS_BZLIB],[1],[Define to 1 if bzlib is available])
    13761376    fi
     
    14091409    if test $coin_has_gmp = yes ; then
    14101410      m4_foreach_w([myvar],[$1],
    1411         [m4_toupper(myvar)_LFLAGS="-lgmp $m4_toupper(myvar)_LFLAGS"
    1412         ])
     1411        [m4_toupper(myvar)_LFLAGS="-lgmp $m4_toupper(myvar)_LFLAGS"
     1412        ])
    14131413      AC_DEFINE([COIN_HAS_GMP],[1],[Define to 1 if GMP is available])
    14141414    fi
     
    14601460      m4_foreach_w([myvar],[$1],
    14611461        [m4_toupper(myvar)_LFLAGS="-lreadline $m4_toupper(myvar)_LFLAGS"
    1462         ])
     1462        ])
    14631463      AC_DEFINE([COIN_HAS_READLINE],[1],[Define to 1 if readline is available])
    14641464    fi
     
    14791479
    14801480# This macro will define the following variables:
    1481 #  coin_have_doxygen    Yes if doxygen is found, no otherwise
     1481#  coin_have_doxygen        Yes if doxygen is found, no otherwise
    14821482#  coin_doxy_usedot     Defaults to `yes'; --with-dot will still check to see
    1483 #                       if dot is available
    1484 #  coin_doxy_tagname    Name of doxygen tag file (placed in doxydoc directory)
     1483#                        if dot is available
     1484#  coin_doxy_tagname        Name of doxygen tag file (placed in doxydoc directory)
    14851485#  coin_doxy_logname    Name of doxygen log file (placed in doxydoc directory)
    14861486#  coin_doxy_tagfiles   List of doxygen tag files used to reference other
     
    15121512AC_ARG_WITH([dot],
    15131513  AS_HELP_STRING([--with-dot],
    1514                 [use dot (from graphviz) when creating documentation with
    1515                   doxygen if available; --without-dot to disable]),
     1514                [use dot (from graphviz) when creating documentation with
     1515                  doxygen if available; --without-dot to disable]),
    15161516  [],[withval=yes])
    15171517if test x"$withval" = xno ; then
  • trunk/coin_fortran.m4

    r3852 r3862  
    145145     for ac_case in "lower case" "upper case" ; do
    146146       for ac_trail in "underscore" "no underscore" ; do
    147         for ac_extra in "no extra underscore" "extra underscore" ; do
    148            ac_cv_f77_mangling="${ac_case}, ${ac_trail}, ${ac_extra}"
    149            # AC_MSG_NOTICE([Attempting link for $ac_cv_f77_mangling])
    150            case $ac_case in
    151              "lower case")
    152                ac_name=m4_tolower($2)
    153                ;;
    154              "upper case")
    155                ac_name=m4_toupper($2)
    156                ;;
    157            esac
    158            if test "$ac_trail" = underscore ; then
    159              ac_name=${ac_name}_
    160            fi
    161            # AC_MSG_CHECKING([$2 -> $ac_name])
    162            AC_LINK_IFELSE(
    163              [AC_LANG_PROGRAM(
    164                 [#ifdef __cplusplus
    165                   extern "C"
    166                 #endif
    167                 void $ac_name();],
    168                 [$ac_name()])],
    169              [ac_result=success],
    170              [ac_result=failure])
    171            # AC_MSG_RESULT([$result])
    172            if test $ac_result = success ; then
    173              break 3
    174            fi
    175         done
     147        for ac_extra in "no extra underscore" "extra underscore" ; do
     148           ac_cv_f77_mangling="${ac_case}, ${ac_trail}, ${ac_extra}"
     149           # AC_MSG_NOTICE([Attempting link for $ac_cv_f77_mangling])
     150           case $ac_case in
     151             "lower case")
     152               ac_name=m4_tolower($2)
     153               ;;
     154             "upper case")
     155               ac_name=m4_toupper($2)
     156               ;;
     157           esac
     158           if test "$ac_trail" = underscore ; then
     159             ac_name=${ac_name}_
     160           fi
     161           # AC_MSG_CHECKING([$2 -> $ac_name])
     162           AC_LINK_IFELSE(
     163             [AC_LANG_PROGRAM(
     164                [#ifdef __cplusplus
     165                  extern "C"
     166                #endif
     167                void $ac_name();],
     168                [$ac_name()])],
     169             [ac_result=success],
     170             [ac_result=failure])
     171           # AC_MSG_RESULT([$result])
     172           if test $ac_result = success ; then
     173             break 3
     174           fi
     175        done
    176176       done
    177177     done
     
    236236      # AC_MSG_NOTICE([COIN_TRY_FLINK: $1 -> $cfunc$1])
    237237      AC_LINK_IFELSE(
    238         [AC_LANG_PROGRAM([void $cfunc$1();],[$cfunc$1()])],
    239         [flink_try=yes],
    240         [if test x"$FLIBS" != x ; then
    241            flink_save_libs="$LIBS"
    242            LIBS="$LIBS $FLIBS"
    243            AC_LINK_IFELSE(
    244              [AC_LANG_PROGRAM([void $cfunc$1();],[$cfunc$1()])],
    245              [coin_need_flibs=yes
    246               flink_try=yes]
    247            )
    248            LIBS="$flink_save_libs"
    249         fi
    250         ]
     238        [AC_LANG_PROGRAM([void $cfunc$1();],[$cfunc$1()])],
     239        [flink_try=yes],
     240        [if test x"$FLIBS" != x ; then
     241           flink_save_libs="$LIBS"
     242           LIBS="$LIBS $FLIBS"
     243           AC_LINK_IFELSE(
     244             [AC_LANG_PROGRAM([void $cfunc$1();],[$cfunc$1()])],
     245             [coin_need_flibs=yes
     246              flink_try=yes]
     247           )
     248           LIBS="$flink_save_libs"
     249        fi
     250        ]
    251251      )
    252252      ;;
     
    256256      AC_COIN_F77_FUNC($1,cfunc$1)
    257257      AC_LINK_IFELSE(
    258         [AC_LANG_PROGRAM([extern "C" {void $cfunc$1();}],[$cfunc$1()])],
    259         [flink_try=yes],
    260         [if test x"$FLIBS" != x ; then
    261            flink_save_libs="$LIBS"
    262            LIBS="$LIBS $FLIBS"
    263            AC_LINK_IFELSE(
    264              [AC_LANG_PROGRAM([extern "C" {void $cfunc$1();}],[$cfunc$1()])],
    265              [coin_need_flibs=yes
    266               flink_try=yes]
    267            )
    268            LIBS="$flink_save_libs"
    269         fi
    270         ]
     258        [AC_LANG_PROGRAM([extern "C" {void $cfunc$1();}],[$cfunc$1()])],
     259        [flink_try=yes],
     260        [if test x"$FLIBS" != x ; then
     261           flink_save_libs="$LIBS"
     262           LIBS="$LIBS $FLIBS"
     263           AC_LINK_IFELSE(
     264             [AC_LANG_PROGRAM([extern "C" {void $cfunc$1();}],[$cfunc$1()])],
     265             [coin_need_flibs=yes
     266              flink_try=yes]
     267           )
     268           LIBS="$flink_save_libs"
     269        fi
     270        ]
    271271      )
    272272      ;;
     
    374374    case $build in
    375375      *-sgi-*)
    376         AC_MSG_CHECKING([for BLAS in -lcomplib.sgimath])
    377         AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-lcomplib.sgimath])
    378         ;;
     376        AC_MSG_CHECKING([for BLAS in -lcomplib.sgimath])
     377        AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-lcomplib.sgimath])
     378        ;;
    379379
    380380      *-*-solaris*)
    381         # Ideally, we'd use -library=sunperf, but it's an imperfect world.
    382         # Studio cc doesn't recognise -library, it wants -xlic_lib. Studio 12
    383         # CC doesn't recognise -xlic_lib. Libtool doesn't like -xlic_lib
    384         # anyway. Sun claims that CC and cc will understand -library in Studio
    385         # 13. The main extra function of -xlic_lib and -library is to arrange
    386         # for the Fortran run-time libraries to be linked for C++ and C. We
    387         # can arrange that explicitly.
    388         AC_MSG_CHECKING([for BLAS in -lsunperf])
    389         AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-lsunperf])
    390         ;;
    391        
     381        # Ideally, we'd use -library=sunperf, but it's an imperfect world.
     382        # Studio cc doesn't recognise -library, it wants -xlic_lib. Studio 12
     383        # CC doesn't recognise -xlic_lib. Libtool doesn't like -xlic_lib
     384        # anyway. Sun claims that CC and cc will understand -library in Studio
     385        # 13. The main extra function of -xlic_lib and -library is to arrange
     386        # for the Fortran run-time libraries to be linked for C++ and C. We
     387        # can arrange that explicitly.
     388        AC_MSG_CHECKING([for BLAS in -lsunperf])
     389        AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-lsunperf])
     390        ;;
     391       
    392392      *-cygwin* | *-mingw*)
    393         case "$CC" in
    394           clang* ) ;;
    395           cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    396             AC_MSG_CHECKING([for BLAS in MKL (32bit)])
    397             AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],
    398               [mkl_intel_c.lib mkl_sequential.lib mkl_core.lib])
    399             if test -z "$blas_lflags" ; then
    400               AC_MSG_CHECKING([for BLAS in MKL (64bit)])
    401               AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],
    402                 [mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib])
    403             fi
    404             ;;
    405         esac
    406         ;;
    407        
     393        case "$CC" in
     394          clang* ) ;;
     395          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     396            AC_MSG_CHECKING([for BLAS in MKL (32bit)])
     397            AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],
     398              [mkl_intel_c.lib mkl_sequential.lib mkl_core.lib])
     399            if test -z "$blas_lflags" ; then
     400              AC_MSG_CHECKING([for BLAS in MKL (64bit)])
     401              AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],
     402                [mkl_intel_lp64.lib mkl_sequential.lib mkl_core.lib])
     403            fi
     404            ;;
     405        esac
     406        ;;
     407       
    408408       *-darwin*)
    409         AC_MSG_CHECKING([for BLAS in Veclib])
    410         AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-framework Accelerate])
    411         ;;
     409        AC_MSG_CHECKING([for BLAS in Veclib])
     410        AC_COIN_CHK_PKG_FLINK([blas_lflags],[daxpy],[-framework Accelerate])
     411        ;;
    412412    esac
    413413    if test -z "$blas_lflags" ; then
     
    510510    case $build in
    511511      *-sgi-*)
    512         AC_MSG_CHECKING([for LAPACK in -lcomplib.sgimath])
    513         AC_COIN_CHK_PKG_FLINK([lapack_lflags],[dsyev],[-lcomplib.sgimath])
    514         ;;
     512        AC_MSG_CHECKING([for LAPACK in -lcomplib.sgimath])
     513        AC_COIN_CHK_PKG_FLINK([lapack_lflags],[dsyev],[-lcomplib.sgimath])
     514        ;;
    515515
    516516      *-*-solaris*)
    517         # See comments in COIN_CHK_PKG_BLAS.
    518         AC_MSG_CHECKING([for LAPACK in -lsunperf])
    519         AC_COIN_CHK_PKG_FLINK([lapack_lflags],[dsyev],[-lsunperf])
    520         ;;
    521 
    522         # On cygwin, do this check only if doscompile is disabled. The
    523         # prebuilt library will want to link with cygwin, hence won't run
    524         # standalone in DOS.
     517        # See comments in COIN_CHK_PKG_BLAS.
     518        AC_MSG_CHECKING([for LAPACK in -lsunperf])
     519        AC_COIN_CHK_PKG_FLINK([lapack_lflags],[dsyev],[-lsunperf])
     520        ;;
     521
     522        # On cygwin, do this check only if doscompile is disabled. The
     523        # prebuilt library will want to link with cygwin, hence won't run
     524        # standalone in DOS.
    525525
    526526    esac
Note: See TracChangeset for help on using the changeset viewer.