diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-16 02:35:29 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-16 02:35:29 +0000 |
| commit | 9db0ca44fdce4a9d096e3f29e2f49e4d02968f2c (patch) | |
| tree | 408ddecfb78afaf323b31d1fbd2c65a21e0d5775 | |
| parent | 5209be88bb1d9c256f6af79ad3de8d64c01364c1 (diff) | |
| download | xine-lib-9db0ca44fdce4a9d096e3f29e2f49e4d02968f2c.tar.gz xine-lib-9db0ca44fdce4a9d096e3f29e2f49e4d02968f2c.tar.bz2 | |
Cleanup pkg-config checks for libcdio/libvcdinfo.
CVS patchset: 8674
CVS date: 2007/03/16 02:35:29
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index cc282970d..03ff55a34 100644 --- a/configure.ac +++ b/configure.ac @@ -1754,35 +1754,18 @@ if test "x$enable_vcd" = "xyes"; then fi dnl empty_array_size - if test "x$internal_vcdnav" = "xno" && test "x$PKG_CONFIG" != "xno" ; then - AC_MSG_CHECKING(for libcdio) - if $PKG_CONFIG --atleast-version 0.71 libcdio; then - AC_MSG_RESULT(found) - LIBCDIO_CFLAGS=`$PKG_CONFIG --cflags libcdio` - LIBCDIO_LIBS=`$PKG_CONFIG --libs libcdio` - - AC_MSG_CHECKING(for libvcdinfo) - if $PKG_CONFIG --atleast-version 0.7.23 libvcdinfo; then - AC_MSG_RESULT(found) - LIBVCDINFO_CFLAGS=`$PKG_CONFIG --cflags libvcdinfo` - LIBVCDINFO_LIBS=`$PKG_CONFIG --libs libvcdinfo` - AC_DEFINE(HAVE_VCDNAV,1,[Define this if you have a suitable version of libcdio/libvcd]) - else - AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) - internal_vcdnav="yes" - fi - - else - AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) - internal_vcdnav="yes" + if test "x$internal_vcdnav" = "xno" ; then + PKG_CHECK_MODULES([LIBCDIO], [libcdio >= 0.71], [], [internal_vcdnav=yes]) + PKG_CHECK_MODULES([LIBVCDINFO], [libvcdinfo >= 0.7.23], [], [internal_vcdnav=yes]) + if "x$internal_vcdnav" = "xyes"; then + AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) fi - else - AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) - internal_vcdnav="yes" fi dnl check twice, fallback is internal copy - if test "x$internal_vcdnav" = "xyes"; then + if test "x$internal_vcdnav" = "xno"; then + AC_DEFINE([HAVE_VCDNAV], [1], [Define this if you use external libcdio/libvcdinfo]) + else AC_DEFINE_UNQUOTED(HOST_ARCH, "$host_os/$host_cpu", [host os/cpu identifier]) AC_DEFINE(_DEVELOPMENT_, [], enable warnings about being development release) |