From 7eef010d0a780cb7227bf74c2247bf3c08419131 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Tue, 30 Apr 2002 19:35:49 +0000 Subject: Fix ogg/vorbis and Xvid checks. CVS patchset: 1819 CVS date: 2002/04/30 19:35:49 --- configure.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 166e0b1df..02453f2ec 100644 --- a/configure.in +++ b/configure.in @@ -426,20 +426,19 @@ dnl AM_CONDITIONAL(HAVE_DIVX4, test x"$no_divx4" != "xyes") dnl dnl Ogg/Vorbis libs. dnl - -AM_PATH_OGG([no_oggvorbis=no - AM_PATH_VORBIS(no_oggvorbis=no, - AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***]))], - AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***])) -AM_CONDITIONAL(HAVE_VORBIS, [test x"$no_oggvorbis" = "xno"]) +AM_PATH_OGG( + [ AM_PATH_VORBIS([], + AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***])) + ], + AC_MSG_RESULT([*** All of OGG/VORBIS dependent parts will be disabled ***])) +AM_CONDITIONAL(HAVE_VORBIS, [test x"$no_ogg" != "xyes" -a x"$no_vorbis" != "xyes"]) dnl dnl XviD libs. dnl - -AM_PATH_XVID(no_xvid=no, AC_MSG_RESULT([*** All of XviD dependent parts will be disabled ***])) -AM_CONDITIONAL(HAVE_XVID, [test x"$no_xvid" != "xyes"]) +AM_PATH_XVID([], AC_MSG_RESULT([*** All of XviD dependent parts will be disabled ***])) +AM_CONDITIONAL(HAVE_XVID, [test x"$no_xvid" != "xyes"]) dnl -- cgit v1.2.3