Changeset 2096


Ignore:
Timestamp:
Jan 22, 2011 2:12:34 PM (9 years ago)
Author:
stefan
Message:

print warning if pkg-config is used with cygwin/cl; require pkg-config >= 0.16 because of URL field in .pc files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2094 r2096  
    26872687# is available.  If so, then the variable PKGCONFIG is set to its path.
    26882688# If not, PKGCONFIG is set to "".  The minimal version number can be given
    2689 # as first parameter, by default it is 0.9.0.  This macro is a modified
    2690 # version of PKG_PROG_PKG_CONFIG in pkg.m4.  Further, the AM_CONDITIONAL
    2691 # COIN_HAS_PKGCONFIG is set and PKGCONFIG is AC_SUBST'ed.  Finally, if this
    2692 # setup belongs to a project directory, then the search path for .pc files
    2693 # is assembled from the value of $PKG_CONFIG_PATH, the values of --prefix,
    2694 # --coin-instdir, and the directory named in a file ../coin_subdirs.txt
    2695 # or ../../coin_subdirs.txt in a variable COIN_PKG_CONFIG_PATH, which is
    2696 # also AC_SUBST'ed. For a path xxx given in the coin-subdirs.txt, also
    2697 # the directory xxx/pkgconfig is added, if existing.
     2689# as first parameter, by default it is 0.16.0, since COIN-OR .pc files now
     2690# include an URL field, which breaks pkg-config version <= 0.15.
     2691# This macro is a modified version of PKG_PROG_PKG_CONFIG in pkg.m4.
     2692# Further, the AM_CONDITIONAL COIN_HAS_PKGCONFIG is set and PKGCONFIG is
     2693# AC_SUBST'ed.  Finally, if this setup belongs to a project directory, then
     2694# the search path for .pc files is assembled from the value of
     2695# $PKG_CONFIG_PATH, the values of --prefix, --coin-instdir, and the directories
     2696# named in a file ../coin_subdirs.txt or ../../coin_subdirs.txt in a variable
     2697# COIN_PKG_CONFIG_PATH, which is also AC_SUBST'ed. For a path xxx given in the
     2698# coin-subdirs.txt, also the directory xxx/pkgconfig is added, if existing.
    26982699
    26992700AC_DEFUN([AC_COIN_HAS_PKGCONFIG],
     
    27102711  fi
    27112712  if test -n "$PKG_CONFIG"; then
    2712     _pkg_min_version=m4_default([$1], [0.9.0])
     2713    _pkg_min_version=m4_default([$1], [0.16.0])
    27132714    AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
    27142715    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
     
    27852786
    27862787  AC_SUBST(COIN_PKG_CONFIG_PATH_UNINSTALLED)
     2788fi
     2789
     2790if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
     2791  AC_MSG_WARN([Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config.])
    27872792fi
    27882793
Note: See TracChangeset for help on using the changeset viewer.