From b7d4ecaa6df1ddbbd2e4d61cf60b9003177c0664 Mon Sep 17 00:00:00 2001
From: Stephen Torri <storri@users.sourceforge.net>
Date: Wed, 25 Sep 2002 01:54:26 +0000
Subject: Added ability for xine-config.in to determine location of xine.m4 by
 adding -I $(prefix)/share/aclocal to the XINE_ACFLAGS.

CVS patchset: 2746
CVS date: 2002/09/25 01:54:26
---
 configure.ac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 504e34d17..b85bfb654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ AC_PROG_AWK
 dnl ---------------------------------------------
 dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL
 dnl ---------------------------------------------
-AM_PROG_AS_MOD
+AM_PROG_AS
 
 dnl ---------------------------------------------
 dnl Libtool
@@ -705,6 +705,7 @@ DEBUG_CFLAGS="$DEBUG_CFLAGS $wall -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COM
 
 enable_w32dll="no"
 enable_ffmmx="no"
+enable_armv4l="no"
 
 case "$host_or_hostalias" in
   i386-*-freebsd*)
@@ -720,6 +721,7 @@ case "$host_or_hostalias" in
     ;;
 
 
+
   i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
     if test "$GCC" = yes; then
 	dnl Check for gcc cpu optimization support
@@ -893,6 +895,14 @@ case "$host_or_hostalias" in
     AC_DEFINE_UNQUOTED(FPM_DEFAULT,,[Define to select libmad fixed point arithmetic implementation])
     ;;
 
+  armv4l-*-linux*)
+    CFLAGS="$CFLAGS -O2  -fsigned-char  -ffast-math -mcpu=strongarm1100 -fomit-frame-pointer -fthread-jumps  -fregmove"
+    dnl    CFLAGS="$CFLAGS -O1 -fforce-mem -fforce-addr -fthread-jumps -fcse-follow-jumps -fcse-skip-blocks -fexpensive-optimizations -fregmove -fschedule-insns2 -finline-functions -fsigned-char -fomit-frame-pointer -march=armv4 -mtune=strongarm"
+    DEBUG_CFLAGS="$DEBUG_CFLAGS -O2"
+    AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation])
+    enable_armv4l="yes"
+    ;;
+
   *)
     echo
     echo "****************************** WARNING ******************************"
@@ -929,6 +939,12 @@ AC_SUBST(W32DLL_DEP)
 
 AM_CONDITIONAL(HAVE_FFMMX, test x"$enable_ffmmx" = "xyes")
 
+dnl ---------------------------------------------
+dnl HAVE_ARMV4L is currently used in libavcodec makefile.am
+dnl ---------------------------------------------
+AM_CONDITIONAL(HAVE_ARMV4L, test x"$enable_armv4l" = "xyes")
+
+
 dnl ---------------------------------------------
 dnl gcc __attribute__ ((aligned ()))
 dnl ---------------------------------------------
@@ -965,6 +981,10 @@ AC_SUBST(XINE_PLUGINDIR)
 AC_SUBST(XINE_FONTDIR)
 AC_SUBST(XINE_LOCALEDIR)
 
+dnl Where aclocal m4 files should be installed
+XINE_ACFLAGS="-I ${datadir}/aclocal"
+AC_DEFINE_UNQUOTED(XINE_ACFLAGS, "$XINE_ACFLAGS", [Path where aclocal m4 files will be.])
+AC_SUBST(XINE_ACFLAGS)
 
 dnl Where architecture independent data (e.g. logo) will/should be installed
 eval XINE_DATADIR="${datadir}/xine"
-- 
cgit v1.2.3