Few updates. autoconf-2.52/automake-1.5 supported.

CVS patchset: 637
CVS date: 2001/09/16 00:01:38

10 files changed, 87 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 1e1291404..9ddf9d1b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,4 +46,4 @@ maintainer-clean-generic:
 	-rm -f Makefile.in configure acinclude.m4 aclocal.m4
 	-rm -f config.h.in stamp-h.in ltconfig ltmain.sh
 	-rm -f config.guess config.sub install-sh missing mkinstalldirs
-	-rm -f libtool-nofpic
+	-rm -f libtool-nofpic depcomp config.log
diff --git a/configure.in b/configure.in
index 199e4af3a..6549f40bd 100644
--- a/configure.in
+++ b/configure.in
@@ -79,6 +79,12 @@ AC_SUBST(STATIC)
 
 
 dnl
+dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL
+dnl
+AM_PROG_AS
+
+
+dnl
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl
 AC_C_BIGENDIAN
@@ -376,7 +382,7 @@ if test "$host_or_hostalias" = ""; then
 fi
 
 case "$host_or_hostalias" in
-i386-*-freebsd*)
+  i386-*-freebsd*)
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS"
     DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS"
@@ -389,7 +395,7 @@ i386-*-freebsd*)
     ;;
 
 
-i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
+  i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
 
     if test "$GCC" = yes; then
 	dnl Check for gcc cpu optimization support
@@ -460,26 +466,26 @@ i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
     AC_DEFINE(FPM_INTEL)
     ;;
 
-alphaev56-*)
+  alphaev56-*)
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mcpu=ev56 -mieee"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
     AC_DEFINE(FPM_64BIT)
     ;;
 
-alpha*)
+  alpha*)
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mieee"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
     AC_DEFINE(FPM_64BIT)
     ;;
 
-ppc-*-linux* | powerpc-*) 
+  ppc-*-linux* | powerpc-*) 
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
     FORCE_44K_MAX=yes
     AC_DEFINE(FPM_PPC)
     ;;
 
-sparc*-*-linux*)
+  sparc*-*-linux*)
     case $host_alias in
     sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
     sparc64-*)  cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
@@ -490,7 +496,7 @@ sparc*-*-linux*)
     AC_DEFINE(FPM_SPARC)
     ;;
 
-sparc-*-solaris*)
+  sparc-*-solaris*)
     if test "$GCC" = yes; then
 	case `uname -m` in
 	sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
@@ -509,19 +515,19 @@ sparc-*-solaris*)
     AC_DEFINE(FPM_SPARC)
     ;;
 
-mips-*)
+  mips-*)
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     AC_DEFINE(FPM_MIPS)
     ;;
 
-m68k-*)
+  m68k-*)
     GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O2"
     DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
     AC_DEFINE(FPM_M68K)
     ;;
 
-*)
+  *)
     echo "Host type '$host' ($host_alias) is currently not supported by xine"
     exit 1
     ;;
@@ -616,8 +622,8 @@ dnl
 case "`id`" in
   uid=0\(* )
     AC_MSG_CHECKING(for aclocal directory)
-    if(aclocal --version) < /dev/null > /dev/null 2>&1; then
-      ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`
+    if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+      ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
       AC_MSG_RESULT($ACLOCAL_DIR)
     else
       ACLOCAL_DIR="/usr/local/share/aclocal"
diff --git a/cvscompile.sh b/cvscompile.sh
index 79ad0a2fd..6cd96756a 100755
--- a/cvscompile.sh
+++ b/cvscompile.sh
@@ -1,17 +1,28 @@
 #!/bin/sh
 # Run this to generate all the initial Makefiles, etc.
 
+## extract autoconf version
+autoconf_2_5x=no
+AC="`autoconf --version | sed -n 1p | sed -e 's/[a-zA-Z\ \.\(\)]//g'`"
+if [ `expr $AC` -ge 250 ]; then
+    autoconf_2_5x=yes
+fi
+
 rm -f config.cache
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-#m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4 irixal.m4"
+m4_files="_xine.m4 alsa.m4 arts.m4 esd.m4 aa.m4 irixal.m4"
 if test -d $srcdir/m4; then
     rm -f acinclude.m4
-    for m4f in $srcdir/m4/*.m4; do
-	cat $m4f >> acinclude.m4
+    for m4f in $m4_files; do
+	cat $srcdir/m4/$m4f >> acinclude.m4
     done
+    ## autoconf 2.5x implement AM_PROG_AS, not older ones, so add it.
+    if test x"$autoconf_2_5x" = x"no"; then
+	cat $srcdir/m4/as.m4 >> acinclude.m4
+    fi
 else
     echo "Directory 'm4' is missing."
     exit 1
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d136b117a..78814ee4f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,9 @@
 
 SUBDIRS = man xine-lib-API
 
-EXTRA_DIST = $(docs_DOCS) FAQ FAQ_es MRL.txt README.solaris dataflow.dia\
-			  xine-lib-API.cfg FAQ_it
+EXTRA_DIST = $(docs_DOCS) FAQ FAQ_it FAQ_es FAQ_fr MRL.txt \
+	README.solaris README.freebsd README.irix \
+	dataflow.dia xine-lib-API.cfg
 
 docdir = $(prefix)/share/doc/xine
 docs_DOCS = README.xinerc README.dxr3
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 62ec11511..f0954207a 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -6,7 +6,7 @@ m4datadir = @ACLOCAL_DIR@
 m4data_DATA = xine.m4
 endif
 
-EXTRA_DIST = _xine.m4 alsa.m4 arts.m4 esd.m4 xine.m4 aa.m4 irixal.m4
+EXTRA_DIST = _xine.m4 alsa.m4 arts.m4 esd.m4 xine.m4 aa.m4 irixal.m4 as.m4
 
 debug:
 
diff --git a/m4/as.m4 b/m4/as.m4
new file mode 100644
index 000000000..461864018
--- /dev/null
+++ b/m4/as.m4
@@ -0,0 +1,17 @@
+dnl Extracted from automake-1.5 and sligtly modified for Xine usage.
+dnl Daniel Caujolle-Bert <segfault@club-internet.fr>
+
+# Figure out how to run the assembler.
+
+# AM_PROG_AS
+AC_DEFUN([AM_PROG_AS],
+[# By default we simply use the C compiler to build assembly code.
+AC_REQUIRE([AC_PROG_CC])
+: ${AS='$(CC)'}
+# Set ASFLAGS if not already set.
+: ${ASFLAGS='$(CFLAGS)'}
+# Set ASCOMPILE if not already set.
+: ${ASCOMPILE='$(AS) $(AM_ASFLAGS) $(ASFLAGS)'}
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)
+AC_SUBST(ASCOMPILE)])
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index 103343673..1ade8069f 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -19,47 +19,47 @@ BuildRoot:   /tmp/%{name}-root
 @HAVE_OSS_TRUE@%package oss
 @HAVE_OSS_TRUE@Summary:     XINE - oss support.
 @HAVE_OSS_TRUE@Group:       Development/Libraries
-@HAVE_OSS_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_OSS_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_ALSA05_TRUE@%package alsa05
 @HAVE_ALSA05_TRUE@Summary:     XINE - alsa 0.5.x support.
 @HAVE_ALSA05_TRUE@Group:       Development/Libraries
-@HAVE_ALSA05_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_ALSA05_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_ALSA09_TRUE@%package alsa09
 @HAVE_ALSA09_TRUE@Summary:     XINE - alsa >= 0.9.x support.
 @HAVE_ALSA09_TRUE@Group:       Development/Libraries
-@HAVE_ALSA09_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_ALSA09_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_ARTS_TRUE@%package arts
 @HAVE_ARTS_TRUE@Summary:     XINE - arts support.
 @HAVE_ARTS_TRUE@Group:       Development/Libraries
-@HAVE_ARTS_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_ARTS_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_ESD_TRUE@%package esd
 @HAVE_ESD_TRUE@Summary:     XINE - esd support.
 @HAVE_ESD_TRUE@Group:       Development/Libraries
-@HAVE_ESD_TRUE@Requires:    xine-lib >= 0.5.0, libesd
+@HAVE_ESD_TRUE@Requires:    xine-lib >= 0.9.0, libesd
 
 @HAVE_DXR3_TRUE@%package dxr3
 @HAVE_DXR3_TRUE@Summary:     XINE - DXR3 support.
 @HAVE_DXR3_TRUE@Group:       Development/Libraries
-@HAVE_DXR3_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_DXR3_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_XV_TRUE@%package xv
 @HAVE_XV_TRUE@Summary:     XINE - XFree XVideo support.
 @HAVE_XV_TRUE@Group:       Development/Libraries
-@HAVE_XV_TRUE@Requires:    xine-lib >= 0.5.0
+@HAVE_XV_TRUE@Requires:    xine-lib >= 0.9.0
 
 @HAVE_AA_TRUE@%package aa
 @HAVE_AA_TRUE@Summary:     XINE - Ascii Art support.
 @HAVE_AA_TRUE@Group:       Development/Libraries
-@HAVE_AA_TRUE@Requires:    xine-lib >= 0.5.0, libaa
+@HAVE_AA_TRUE@Requires:    xine-lib >= 0.9.0, libaa
 
 @W32DLL_DEP@%package w32dll
 @W32DLL_DEP@Summary:     XINE - win32dll decoder support.
 @W32DLL_DEP@Group:       Development/Libraries
-@W32DLL_DEP@Requires:    xine-lib >= 0.5.0
+@W32DLL_DEP@Requires:    xine-lib >= 0.9.0
 
 %package docs
 Summary:     XINE - html API documentation.
@@ -217,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 #%{prefix}/lib/xine/plugins/xineplug_decode_mpg123.so
 %{prefix}/lib/xine/plugins/xineplug_decode_spu.la
 %{prefix}/lib/xine/plugins/xineplug_decode_spu.so
+%{prefix}/lib/xine/plugins/xineplug_decode_dts.la
+%{prefix}/lib/xine/plugins/xineplug_decode_dts.so
+%{prefix}/lib/xine/plugins/xineplug_decode_vfill.la
+%{prefix}/lib/xine/plugins/xineplug_decode_vfill.so
 # audio driver plugins
 # see other packages.
 #
@@ -231,26 +235,32 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/xine/skins/*
 
 @HAVE_OSS_TRUE@%files oss
+@HAVE_OSS_TRUE@%defattr(-,root,root)
 @HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.la
 @HAVE_OSS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_oss.so
 
 @HAVE_ALSA05_TRUE@%files alsa05
+@HAVE_ALSA05_TRUE@%defattr(-,root,root)
 @HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.la
 @HAVE_ALSA05_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa05.so
 
 @HAVE_ALSA09_TRUE@%files alsa09
+@HAVE_ALSA09_TRUE@%defattr(-,root,root)
 @HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.la
 @HAVE_ALSA09_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_alsa.so
 
 @HAVE_ARTS_TRUE@%files arts
+@HAVE_ARTS_TRUE@%defattr(-,root,root)
 @HAVE_ARTS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_arts.la
 @HAVE_ARTS_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_arts.so
 
 @HAVE_ESD_TRUE@%files esd
+@HAVE_ESD_TRUE@%defattr(-,root,root)
 @HAVE_ESD_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_esd.la
 @HAVE_ESD_TRUE@%{prefix}/lib/xine/plugins/xineplug_ao_out_esd.so
 
 @HAVE_DXR3_TRUE@%files dxr3
+@HAVE_DXR3_TRUE@%defattr(-,root,root)
 @HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.la
 @HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_decode_dxr3.so
 @HAVE_DXR3_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_dxr3.la
@@ -258,21 +268,29 @@ rm -rf $RPM_BUILD_ROOT
 @HAVE_DXR3_TRUE@%{prefix}/include/dxr3_overlay.h
 
 @HAVE_XV_TRUE@%files xv
+@HAVE_XV_TRUE@%defattr(-,root,root)
 @HAVE_XV_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_xv.la
 @HAVE_XV_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_xv.so
 
 @HAVE_AA_TRUE@%files aa
+@HAVE_AA_TRUE@%defattr(-,root,root)
 @HAVE_AA_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.la
 @HAVE_AA_TRUE@%{prefix}/lib/xine/plugins/xineplug_vo_out_aa.so
 
 @W32DLL_DEP@%files w32dll
+@W32DLL_DEP@%defattr(-,root,root)
 @W32DLL_DEP@%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.la
 @W32DLL_DEP@%{prefix}/lib/xine/plugins/xineplug_decode_w32dll.so
 
 %files docs
+%defattr(-,root,root)
 %{prefix}/share/doc/xine/xine-lib-API/*
+%{prefix}/share/doc/xine/README.xinerc
+%{prefix}/share/doc/xine/README.dxr3
 
 %changelog
+* Sun Sep 16 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
+- Add missing files.
 * Sun Aug 19 2001 Matthias Dahl <matthew2k@web.de>
 - The usual update to the filelist :)
 - temporarily removed mpg123 decoder plugin from filelist cause it is not
diff --git a/src/Makefile.am b/src/Makefile.am
index df56389cc..b5f081872 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 
 SUBDIRS = audio_out video_out dxr3 input libmpeg2 libspudec demuxers \
-	  liba52 libffmpeg liblpcm libw32dll libmad xine-engine libdts libvfill
+	  liba52 libffmpeg liblpcm libw32dll libmad libdts libvfill xine-engine
 
 debug:
 	@list='$(SUBDIRS)'; for subdir in $$list; do \
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 915f13530..c2ffc84bc 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -5,6 +5,7 @@
 #CFLAGS = -D_FILE_OFFSET_BITS=64 @GLOBAL_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
 
 CFLAGS = @GLOBAL_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H
+ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
@@ -33,6 +34,9 @@ noinst_HEADERS = avcodec.h    dsputil.h   mpegvideo.h   dsputil_mmx_avg.h\
 		 common.h     h263data.h  mpeg4data.h   msmpeg4data.h \
 		 mpeg12data.h
 
+.s.lo:
+	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
+
 debug:
 	@$(MAKE) CFLAGS="@DEBUG_CFLAGS@ @LIBFFMPEG_CFLAGS@ -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H"
 
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 0448aba9d..9b8b24303 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -16,7 +16,7 @@ libxine_la_LIBADD = cpu_accel.lo \
 	$(DYNAMIC_LD_LIBS)		\
 	-lm 
 
-libxine_la_LDFLAGS =  -version-info 5:0:5
+libxine_la_LDFLAGS =  -version-info 9:0:9
 
 include_HEADERS  = buffer.h metronom.h configfile.h \
 	monitor.h cpu_accel.h attributes.h utils.h \