Updated cvscompile.sh to look for configure.ac

Replaced configure.in with configure.ac
Remove acconfig.h (Unnecessary with autoconf 2.52 or above)
Updated configure.ac to remove deprecated macros, upgraded
  AC_DEFINE to include comments, merged in acconfig.h.
Combined libxine and libxineutils into one library. libxineutils
  is created but not installed. Its statically linked into libxine.
Advanced libxine version from 0.2.0 to 1.0.0
Removed references for skins.
Plugins now installed to <libdir>/xine/plugins/$XINE_MAJOR.$XINE_MORE.
$XINE_SUB
Xine-config updated for new location of plugins
Sorted file lists in Makefile.am to make them more readable.
TODO: remove skins references from xine-config

CVS patchset: 2705
CVS date: 2002/09/19 06:01:18

6 files changed, 60 insertions, 24 deletions

diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index fe6b04a02..41b11fd62 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -8,30 +8,55 @@ EXTRA_DIST = fdctref.c imgresample.c
 
 #CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@
 
-CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 noinst_LTLIBRARIES = libavcodec.la
 
-libavcodec_la_SOURCES = common.c utils.c mpegvideo.c h263.c jrevdct.c jfdctfst.c \
-			mjpeg.c dsputil.c svq1.c jfdctint.c \
-			motion_est.c imgconvert.c msmpeg4.c \
-			mpeg12.c h263dec.c rv10.c simple_idct.c \
-			ratecontrol.c mem.c eval.c
+libavcodec_la_SOURCES = \
+	common.c \
+	dsputil.c \
+	eval.c \
+	h263.c \
+	h263dec.c \
+	imgconvert.c \
+	jfdctfst.c \
+	jfdctint.c \
+	jrevdct.c \
+	mem.c \
+	mjpeg.c \
+	motion_est.c \
+	mpeg12.c
+	mpegvideo.c \
+	msmpeg4.c \
+	ratecontrol.c \
+	rv10.c \
+	simple_idct.c \
+	svq1.c \
+	utils.c	 
 #imgresample.c
 
 libavcodec_la_LDFLAGS = \
-		$(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \
-		$(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \
-		$(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \
-		-avoid-version -module
+	$(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \
+	$(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \
+	$(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \
+	-avoid-version -module
 
 
-noinst_HEADERS = avcodec.h    dsputil.h   mpegvideo.h \
-		 common.h     h263data.h  mpeg4data.h   msmpeg4data.h \
-		 mpeg12data.h simple_idct.h mangle.h svq1_cb.h
+noinst_HEADERS = \
+	avcodec.h \
+	common.h \
+	dsputil.h \
+	h263data.h \
+	mangle.h \
+	mpeg4data.h \
+	mpeg12data.h \
+	mpegvideo.h \
+	msmpeg4data.h \
+	simple_idct.h \
+	svq1_cb.h
 
 .s.lo:
 	$(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$<
diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am
index 5512f285e..84ddab118 100644
--- a/src/libffmpeg/libavcodec/alpha/Makefile.am
+++ b/src/libffmpeg/libavcodec/alpha/Makefile.am
@@ -1,4 +1,8 @@
-EXTRA_DIST = asm.h dsputil_alpha.c mpegvideo_alpha.c pixops.h motion_est_alpha.c
+EXTRA_DIST = asm.h \
+	dsputil_alpha.c \
+	mpegvideo_alpha.c \
+	pixops.h \
+	motion_est_alpha.c
 
 all:
 debug:
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index eb7470eeb..0cff3a2a4 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -4,14 +4,14 @@
 
 #CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@
 
-CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 noinst_LTLIBRARIES = libavcodec_armv4l.la
 
-libavcodec_armv4l_src =  jrevdct_arm.S dsputil_arm.c
+libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S 
 libavcodec_armv4l_dummy =  libavcodec_armv4l_dummy.c
 EXTRA_DIST =  $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy)
 
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index f960f8417..1d36c1da8 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -6,7 +6,7 @@
 
 # we must not use CFLAGS here, gcc optimizations produce
 # bad code if we do so.
-CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS)
 
 ASFLAGS =
 
@@ -14,13 +14,20 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 noinst_LTLIBRARIES = libavcodec_mmx.la
 
-libavcodec_mmx_src =  fdct_mmx.c \
-              dsputil_mmx.c mpegvideo_mmx.c \
-              idct_mmx.c motion_est_mmx.c \
-              simple_idct_mmx.c
+libavcodec_mmx_src = \
+	dsputil_mmx.c \
+	fdct_mmx.c \
+	idct_mmx.c \
+	motion_est_mmx.c \
+        mpegvideo_mmx.c \
+	simple_idct_mmx.c
+
 libavcodec_mmx_dummy = libavcodec_mmx_dummy.c
 
-EXTRA_DIST =  $(libavcodec_mmx_src) $(libavcodec_mmx_dummy) mpegvideo_mmx_template.c
+EXTRA_DIST = \
+	$(libavcodec_mmx_dummy) \
+	$(libavcodec_mmx_src) \
+	mpegvideo_mmx_template.c
 
 if HAVE_FFMMX
 mmx_modules = $(libavcodec_mmx_src)
diff --git a/src/libffmpeg/libavcodec/i386/fdct_mmx.c b/src/libffmpeg/libavcodec/i386/fdct_mmx.c
index 73b63ac63..abc5abeaa 100644
--- a/src/libffmpeg/libavcodec/i386/fdct_mmx.c
+++ b/src/libffmpeg/libavcodec/i386/fdct_mmx.c
@@ -10,7 +10,7 @@
 #include "../common.h"
 #include "mmx.h"
 
-#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
+//#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align)))
 
 //////////////////////////////////////////////////////////////////////
 //
diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index 0270fe107..68311e35c 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -4,7 +4,7 @@
 
 #CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@
 
-CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
+AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS)
 ASFLAGS =
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic