diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-02 18:31:50 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-02 18:31:50 +0000 |
| commit | 6e985884ff04d1a06c627fd3911a199a90f34bc8 (patch) | |
| tree | f90612b2cf306f80058db2a1cbe610a44d3733c7 /configure.ac | |
| parent | b44417f8c0b829a662d5523a9e7a3bc45ed0bf73 (diff) | |
| download | xine-lib-6e985884ff04d1a06c627fd3911a199a90f34bc8.tar.gz xine-lib-6e985884ff04d1a06c627fd3911a199a90f34bc8.tar.bz2 | |
fixing vcd checks
CVS patchset: 5678
CVS date: 2003/11/02 18:31:50
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 67532e6b7..0b4199463 100644 --- a/configure.ac +++ b/configure.ac @@ -1002,7 +1002,7 @@ dnl AC_ARG_ENABLE(vcdo,[ --disable-vcdo Do not compile old VCD plugin], dnl enable_vcdo="yes" -AC_ARG_WITH(internal-vcdnav,[ --with-internal-vcdnav Use internal libcdio/libvcd libraries ], +AC_ARG_WITH(internal-vcdnav,[ --with-internal-vcdlibs Force using internal libcdio/libvcd/libvcdinfo ], [external_vcdnav="no"], [external_vcdnav="yes"]) if test x"$enable_vcd" = "xyes"; then @@ -1029,10 +1029,7 @@ if test x"$enable_vcd" = "xyes"; then fi dnl empty_array_size - external_vcdnav="no" - no_vcdnav="yes" - - if test x"$PKG_CONFIG" != "xno" ; then + if test x"$external_vcdnav" = "xyes" && test x"$PKG_CONFIG" != "xno" ; then AC_MSG_CHECKING(for libcdio) if $PKG_CONFIG --atleast-version 0.64 libcdio; then AC_MSG_RESULT(found) @@ -1045,15 +1042,18 @@ if test x"$enable_vcd" = "xyes"; then 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]) - external_vcdnav="yes" - no_vcdnav="no" else AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) + external_vcdnav="no" fi else AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) + external_vcdnav="no" fi + else + AC_MSG_RESULT([Use included libcdio/libvcdinfo support]) + external_vcdnav="no" fi dnl check twice, fallback is internal copy @@ -1205,7 +1205,7 @@ AC_SUBST(LIBISO9660_LIBS) AC_SUBST(LIBVCD_CFLAGS) AC_SUBST(LIBVCD_LIBS) AC_SUBST(LIBVCDINFO_LIBS) -AM_CONDITIONAL(HAVE_VCDNAV, [test x"$no_vcdnav" != "xyes"]) +AM_CONDITIONAL(HAVE_VCDNAV, [test x"$external_vcdnav" = "xyes"]) AM_CONDITIONAL(ENABLE_VCD, [test x"$enable_vcd" = "xyes"]) |