From 52f388580cc4bd1261003785206c64585565b5b8 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 5 Feb 2012 18:22:57 +0000 Subject: Fix xinerama & libcdio/libvcdinfo tests: didn't soft-fail properly. --HG-- branch : 1.2.1-branch --- m4/input.m4 | 14 +++++++++++--- m4/video_out.m4 | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'm4') diff --git a/m4/input.m4 b/m4/input.m4 index c337162c7..21d7e216f 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -140,9 +140,17 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ dnl XXX: This could be cleaned up so that code does not have it ifdef so much XINE_ARG_ENABLE([vcd], [Enable VCD (VideoCD) support]) if test x"$enable_vcd" != x"no"; then - PKG_CHECK_MODULES([LIBCDIO], [libcdio >= 0.71]) - PKG_CHECK_MODULES([LIBVCDINFO], [libvcdinfo >= 0.7.23]) - AC_DEFINE([HAVE_VCDNAV], 1, [Define this if you use external libcdio/libvcdinfo]) + no_vcd=no + PKG_CHECK_MODULES([LIBCDIO], [libcdio >= 0.71], + [PKG_CHECK_MODULES([LIBVCDINFO], [libvcdinfo >= 0.7.23], [], [no_vcd=yes])], + [if test x"$hard_enable_vcd" = 'xyes'; then + AC_MSG_ERROR([$LIBCDIO_PKG_ERRORS]) + fi + no_vcd=yes] + ) + if test "$no_vcd" = 'no'; then + AC_DEFINE([HAVE_VCDNAV], 1, [Define this if you use external libcdio/libvcdinfo]) + fi fi enable_vcdo=no diff --git a/m4/video_out.m4 b/m4/video_out.m4 index 2ac257fec..a7fec05c5 100644 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -315,7 +315,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [ [XINERAMA_LIBS="-lXinerama" have_xinerama="yes"], [], [$X_LIBS])]) fi - if test x"$enable_xinerama" = x"yes" && test x"$have_xinerama" != x"yes"; then + if test x"$hard_enable_xinerama" = x"yes" && test x"$have_xinerama" != x"yes"; then AC_MSG_ERROR([Xinerama support requested, but Xinerama not found or X disabled]) elif test x"$have_xinerama" = x"yes"; then AC_DEFINE([HAVE_XINERAMA], 1, [Define this if you have libXinerama installed]) -- cgit v1.2.3