From 91c75489c506bc8791c9c55bdc6c9efd67c58384 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Mon, 8 Oct 2001 21:52:09 +0000
Subject: Fixed ogg/vorbis stuff (don't link vorbis plusgin to libogg, etc...).
 Clean up the ogg/vorbis check (overriding $LIBS is gone now).

CVS patchset: 771
CVS date: 2001/10/08 21:52:09
---
 m4/_xine.m4 | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'm4')

diff --git a/m4/_xine.m4 b/m4/_xine.m4
index a738fd732..5f8708f60 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -3,27 +3,22 @@ dnl Check for divx4.
 dnl AC_CHECK_DIVX4([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]])
 AC_DEFUN([AC_CHECK_DIVX4],
   [
-    ac_save_LIBS="$LIBS"
-
-    DIVX4_LIBS="$DIVX4_LIBS -lstdc++"
-    LIBS="$DIVX4_LIBS"
 
     AC_CHECK_HEADER(decore.h,
                     [ no_divx4=no;
-	              AC_CHECK_LIB(divxdecore, decore, no_divx4=no, no_divx4=yes) ]
-	            , no_divx4=yes)
+	              AC_CHECK_LIB(divxdecore, decore, 
+				   [ no_divx4=no; DIVX4_LIBS="$DIVX4_LIBS -ldivxdecore" ], 
+			           no_divx4=yes)
+                    ], no_divx4=yes)
 
-    LIBS="$ac_save_LIBS"
+    AC_SUBST(DIVX4_LIBS)
 
     if test x"$no_divx4" = "xno" ; then
-       DIVX4_LIBS="$DIVX4_LIBS -ldivxdecore"
-       AC_SUBST(DIVX4_LIBS)
        ifelse([$1], , :, [$1])
     else
-       DIVX4_LIBS=""
-       AC_SUBST(DIVX4_LIBS)
        ifelse([$2], , :, [$2])
     fi
+
 ])
 
 dnl
-- 
cgit v1.2.3