diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-11-04 13:24:45 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-11-04 13:24:45 +0000 |
| commit | 6b1091ff5033a312fff4fb11827304601d0cd934 (patch) | |
| tree | b8ff0c771ad70fb195844a22234d967f5cdc1cb1 | |
| parent | c6d3fb751199f94c262c44be0e21b7e15b2fd818 (diff) | |
| download | xine-lib-6b1091ff5033a312fff4fb11827304601d0cd934.tar.gz xine-lib-6b1091ff5033a312fff4fb11827304601d0cd934.tar.bz2 | |
Remove the pkg-config check and use PKG_CHECK_MODULES to check for directfb.
CVS patchset: 8357
CVS date: 2006/11/04 13:24:45
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index c2d539579..d2247865e 100644 --- a/configure.ac +++ b/configure.ac @@ -928,17 +928,6 @@ AM_CONDITIONAL(HAVE_COREAUDIO, [test x"$have_coreaudio" = "xyes"]) dnl --------------------------------------------- -dnl Find pkg-config -dnl --------------------------------------------- - -AC_PATH_TOOL(PKG_CONFIG, pkg-config, no) -if test x$PKG_CONFIG = xno ; then - echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net" - echo "*** All of DIRECTFB dependent parts will be disabled" -else - - -dnl --------------------------------------------- dnl Check for DirectFB dnl --------------------------------------------- AC_ARG_ENABLE(directfb, @@ -946,18 +935,8 @@ AC_ARG_ENABLE(directfb, enable_directfb=$enableval, enable_directfb=no) - DIRECTFB_REQUIRED_VERSION=0.9.22 if test x$enable_directfb = "xyes"; then - AC_MSG_CHECKING(for DirectFB) - if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then - AC_MSG_RESULT(found) - DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb` - DIRECTFB_LIBS=`$PKG_CONFIG --libs directfb` - have_directfb="yes" - else - AC_MSG_RESULT([*** All of DIRECTFB dependent parts will be disabled ***]) - fi -fi + PKG_CHECK_MODULES([DIRECTFB], [directfb >= 0.9.22], [have_directfb="yes"], [have_directfb="no"]) fi AC_SUBST(DIRECTFB_CFLAGS) |