Changeset 2038


Ignore:
Timestamp:
Dec 31, 2010 8:15:54 AM (9 years ago)
Author:
stefan
Message:

try to improve messages from AC_COIN_MAIN_PACKAGEDIR again

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2036 r2038  
    38053805AC_DEFUN([AC_COIN_MAIN_PACKAGEDIR],
    38063806[AC_REQUIRE([AC_COIN_HAS_PKGCONFIG])
    3807 AC_MSG_CHECKING([whether project m4_ifval([$2],[$2/])$1 is available])
     3807AC_MSG_CHECKING([whether project $1 is available])
    38083808
    38093809m4_tolower(coin_has_$1)=notGiven
     
    38253825if test $m4_tolower(coin_has_$1) != skipping; then
    38263826  if test $PACKAGE_TARNAME = m4_tolower($1); then
    3827     m4_tolower(coin_has_$1)=.
     3827    m4_tolower(coin_has_$1)=yes
    38283828    coin_have_project_dir=yes
    38293829  fi
     
    38323832    AC_HELP_STRING([--with-m4_tolower($1)-lib],
    38333833                   [linker flags for using project $1]),
    3834       [m4_tolower(coin_has_$1)=installed],
     3834      [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-lib"],
    38353835      [])
    38363836
     
    38383838    AC_HELP_STRING([--with-m4_tolower($1)-incdir],
    38393839                   [directory with header files for using project $1]),
    3840     [m4_tolower(coin_has_$1)=installed],
     3840    [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-incdir"],
    38413841    [])
    38423842
     
    38443844    AC_HELP_STRING([--with-m4_tolower($1)-datadir],
    38453845                   [directory with data files for using project $1]),
    3846     [m4_tolower(coin_has_$1)=installed],
     3846    [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-datadir"],
    38473847    [])
    38483848
     
    38543854           coin_has_blas=notGiven
    38553855         else
    3856            coin_has_blas=installed
     3856           coin_has_blas="yes, via --with-blas"
    38573857         fi],
    38583858        [])])
     
    38653865           coin_has_lapack=notGiven
    38663866         else
    3867            coin_has_lapack=installed
     3867           coin_has_lapack="yes, via --with-lapack"
    38683868         fi],
    38693869        [])])
     
    38853885      [ coin_have_project_dir=yes ])
    38863886    if test $coin_have_project_dir = yes; then
    3887       m4_tolower(coin_has_$1)=m4_ifval($2,[$2/],)$1
     3887      m4_tolower(coin_has_$1)="yes, source in m4_ifval($2,[$2/],)$1"
    38883888    fi
    38893889  fi
     
    38913891
    38923892# check for project by using pkg-config, if pkg-config is available
    3893 if test $m4_tolower(coin_has_$1) = notGiven; then
     3893if test "$m4_tolower(coin_has_$1)" = notGiven; then
    38943894  #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED
    38953895  if test -n "$PKG_CONFIG" ; then
     
    38983898      m4_ifval([$4],
    38993899        [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$4],
    3900                 [m4_tolower(coin_has_$1)="$m4_toupper([$4])_VERSION"])],
     3900                [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$4])_VERSION"])],
    39013901              [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$1],
    3902                 [m4_tolower(coin_has_$1)="$m4_toupper([$1])_VERSION"])])
     3902                [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$1])_VERSION"])])
    39033903    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    39043904    export PKG_CONFIG_PATH
     
    39063906fi
    39073907
    3908 AC_MSG_RESULT([$m4_tolower(coin_has_$1)])
     3908if test "$m4_tolower(coin_has_$1)" = notGiven; then
     3909  m4_case(m4_tolower($1),
     3910    [blas],
     3911    [AC_MSG_RESULT([no (but will check for system blas later)])],
     3912    [lapack],
     3913    [AC_MSG_RESULT([no (but will check for system lapack later)])],
     3914    [AC_MSG_RESULT([not given])]
     3915  )
     3916else
     3917  AC_MSG_RESULT([$m4_tolower(coin_has_$1)])
     3918fi
    39093919
    39103920AC_MSG_CHECKING(whether project m4_ifval([$2],[$2/])$1 needs to be configured)
Note: See TracChangeset for help on using the changeset viewer.