Changeset 2862


Ignore:
Timestamp:
Aug 23, 2013 10:34:28 PM (7 years ago)
Author:
tkr
Message:

Undoing quoting of PKGCONFIG

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2861 r2862  
    868868      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
    869869    fi ;;
     870  * )
     871    CYGPATH_W = echo
     872    ;;
    870873esac
    871874CFLAGS="$save_cflags"
     
    877880  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    878881    coin_cc_is_cl=true
    879     ;;
    880   * )
    881     CYGPATH_W=echo
    882882    ;;
    883883esac
     
    32223222    _pkg_min_version=m4_default([$1], [0.16.0])
    32233223    AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
    3224     if "$PKG_CONFIG" --atleast-pkgconfig-version $_pkg_min_version; then
     3224    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
    32253225      AC_MSG_RESULT([yes])
    32263226    else
     
    32323232  # check if pkg-config supports the short-errors flag
    32333233  if test -n "$PKG_CONFIG" && \
    3234     "$PKG_CONFIG" --atleast-pkgconfig-version 0.20; then
     3234    $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    32353235    pkg_short_errors=" --short-errors "
    32363236  else
     
    33153315[AC_REQUIRE([AC_COIN_HAS_PKGCONFIG])
    33163316if test -n "$PKG_CONFIG" ; then
    3317   if "$PKG_CONFIG" --exists "m4_tolower($1)"; then
    3318     m4_toupper($1)[]_VERSION=`"$PKG_CONFIG" --modversion "m4_tolower($1)" 2>/dev/null`
     3317  if $PKG_CONFIG --exists "m4_tolower($1)"; then
     3318    m4_toupper($1)[]_VERSION=`$PKG_CONFIG --modversion "m4_tolower($1)" 2>/dev/null`
    33193319    m4_ifval([$2], [$2], [:])
    33203320  else
    3321     m4_toupper($1)_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "m4_tolower($1)"`
     3321    m4_toupper($1)_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "m4_tolower($1)"`
    33223322    $3
    33233323  fi
     
    33393339[AC_REQUIRE([AC_COIN_HAS_PKGCONFIG])
    33403340if test -n "$PKG_CONFIG" ; then
    3341   if "$PKG_CONFIG" --exists "$2"; then
    3342     m4_toupper($1)[]_VERSIONS=`"$PKG_CONFIG" --modversion "$2" 2>/dev/null | tr '\n' ' '`
     3341  if $PKG_CONFIG --exists "$2"; then
     3342    m4_toupper($1)[]_VERSIONS=`$PKG_CONFIG --modversion "$2" 2>/dev/null | tr '\n' ' '`
    33433343    $3
    33443344  else
    3345     m4_toupper($1)_PKG_ERRORS=`"$PKG_CONFIG" $pkg_short_errors --errors-to-stdout --print-errors "$2"`
     3345    m4_toupper($1)_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "$2"`
    33463346    $4
    33473347  fi
     
    33673367
    33683368AC_COIN_PKG_CHECK_MODULE_EXISTS([$1],[$2],
    3369   [ cflags=`"$PKG_CONFIG" --cflags "$2" 2>/dev/null`
     3369  [ cflags=`$PKG_CONFIG --cflags "$2" 2>/dev/null`
    33703370    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    33713371        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    33763376    fi
    33773377    m4_toupper($1)[]_CFLAGS="$cflags"
    3378     m4_toupper($1)[]_LIBS=`"$PKG_CONFIG" --libs "$2" 2>/dev/null`
    3379     m4_toupper($1)[]_DATA=`"$PKG_CONFIG" --variable=datadir "$2" 2>/dev/null`
     3378    m4_toupper($1)[]_LIBS=`$PKG_CONFIG --libs "$2" 2>/dev/null`
     3379    m4_toupper($1)[]_DATA=`$PKG_CONFIG --variable=datadir "$2" 2>/dev/null`
    33803380    $3
    33813381  ],
Note: See TracChangeset for help on using the changeset viewer.