From 7fa94f42de26c1b07f33844502083bab291865c6 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Thu, 14 Jun 2001 22:04:56 +0000
Subject: Kill the recurrent libXv.so problem with MDK. Switch to libtool 1.4,
 1.3.x are no more supported. Add a path for automake, to use it with libtool
 1.4.

CVS patchset: 183
CVS date: 2001/06/14 22:04:56
---
 Makefile.am               |  2 +-
 README                    | 11 +++++++++++
 automake.diff             | 11 +++++++++++
 configure.in              | 20 ++++++++++++++------
 m4/_xine.m4               |  4 ++--
 misc/autogen.sh           |  2 +-
 src/video_out/Makefile.am |  2 +-
 7 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 automake.diff

diff --git a/Makefile.am b/Makefile.am
index 9b9d4b7d4..2bafc11c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = 1.3
 
 SUBDIRS = doc m4 src misc include
 
-EXTRA_DIST = cvscompile.sh
+EXTRA_DIST = cvscompile.sh automake.diff
 
 noinst_HEADERS = config.h
 
diff --git a/README b/README
index 8c30c831c..b52e78bbe 100644
--- a/README
+++ b/README
@@ -1,2 +1,13 @@
 
 *** see doc directory. ***
+
+			 !! IMPORTANT NOTE !!
+
+LIBTOOL version:
+	you should have libtool >= 1.4 installed to compile xine-lib. You 
+can grab the source tarball from an official GNU ftp server if there is no 
+binary package available for your distro.
+
+Also, You should probably apply the patch (automake.diff) to automake (will
+be unnecessary in futur automake release).
+
diff --git a/automake.diff b/automake.diff
new file mode 100644
index 000000000..ae16fcd40
--- /dev/null
+++ b/automake.diff
@@ -0,0 +1,11 @@
+--- /usr/bin/automake	Sat Mar 11 09:25:33 2000
++++ automake	Thu Sep  7 22:08:33 2000
+@@ -187,7 +187,7 @@ $seen_libtool = 0;
+ $libtool_line = 0;
+ 
+ # Files installed by libtoolize.
+-@libtoolize_files = ('ltconfig', 'ltmain.sh', 'config.guess', 'config.sub');
++@libtoolize_files = ('ltmain.sh', 'config.guess', 'config.sub');
+ 
+ # TRUE if we've seen AM_MAINTAINER_MODE.
+ $seen_maint_mode = 0;
diff --git a/configure.in b/configure.in
index 3ff8b6070..8219c6dd4 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PREREQ(2.13)
 dnl
 dnl Require libtool minimum version 1.3.5
 dnl
-AC_PREREQ_LIBTOOL(1.3.5,,AC_MSG_ERROR(*** You should have libtool >= 1.3.5 installed ***))
+AC_PREREQ_LIBTOOL(1.4.0,,AC_MSG_ERROR(*** You should have libtool >= 1.4 installed ***))
 
 
 XINE_MAJOR=0
@@ -165,14 +165,22 @@ AM_CONDITIONAL(HAVE_X11, test x"$no_x" != "xyes")
 dnl
 dnl Checks for Xv extension
 dnl
+AC_ARG_WITH(xv-path,[  --with-xv-path=path    Where libXv.a is installed],
+            xv_path="$withval", xv_path="/usr/X11R6/lib")
 
 AC_CHECK_LIB(Xv, XvShmCreateImage, 
-             X_LIBS="$X_LIBS -lXv"
-	     AC_DEFINE(HAVE_XV)
-	     ac_have_xv="yes",,
-             $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
+             [ AC_MSG_CHECKING(for libXv.a location)
+               if test -f "$xv_path/libXv.a"; then
+                 AC_MSG_RESULT(found in $xv_path)
+               else
+                 AC_MSG_RESULT(not found in $xv_path)
+                 AC_MSG_ERROR(try to use --with-xv-path to set the location of libXv.a)
+               fi
+               XV_LIB="$xv_path/libXv.a"
+	       AC_DEFINE(HAVE_XV)
+	       ac_have_xv="yes" ],, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
 AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
-
+AC_SUBST(XV_LIB)
 
 dnl
 dnl Checks for Xinerama extension
diff --git a/m4/_xine.m4 b/m4/_xine.m4
index 6577faa63..7f0c72e58 100644
--- a/m4/_xine.m4
+++ b/m4/_xine.m4
@@ -5,9 +5,9 @@ AC_DEFUN([AC_PREREQ_LIBTOOL],
   [
     lt_min_full=ifelse([$1], ,1.3.5,$1)
     lt_min=`echo $lt_min_full | sed -e 's/\.//g'`
-    AC_MSG_CHECKING(checking for libtool >= $lt_min_full)
+    AC_MSG_CHECKING(for libtool >= $lt_min_full)
     lpwd="`pwd`"
-    lt_pathname="`echo $lpwd/ltconfig | sed -e 's/\=build\///g'`"
+    lt_pathname="`echo $lpwd/ltmain.sh | sed -e 's/\=build\///g'`"
     lt_version="`grep ^VERSION $lt_pathname | sed -e 's/\.//g;s/VERSION\=//g;s/[a-zA-Z]//g;s/-//g'`"
 
     if test $lt_version -lt 100; then
diff --git a/misc/autogen.sh b/misc/autogen.sh
index 2d347ee18..f988e5950 100755
--- a/misc/autogen.sh
+++ b/misc/autogen.sh
@@ -49,7 +49,7 @@ aclocalinclude="$ACLOCAL_FLAGS"; \
     aclocal $aclocalinclude; \
  echo "done.") && \
 (echo -n " + Running libtoolize: "; \
-    libtoolize --force; \
+    libtoolize --force >/dev/null 2>&1; \
  echo "done.") && \
 (echo -n " + Running autoheader: "; \
     autoheader; \
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index bb976c938..8adc4322d 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -25,7 +25,7 @@ endif
 lib_LTLIBRARIES = $(xv_module) $(syncfb_module) $(xshm_module) $(aa_module)
 
 xineplug_vo_out_xv_la_SOURCES = video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD = $(X_LIBS)
+xineplug_vo_out_xv_la_LIBADD =  $(XV_LIB) $(X_LIBS)
 xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
 
 xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_xshm.c
-- 
cgit v1.2.3