diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2002-09-25 01:54:26 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2002-09-25 01:54:26 +0000 |
| commit | b7d4ecaa6df1ddbbd2e4d61cf60b9003177c0664 (patch) | |
| tree | 416922aa71c78e5b2a32698a5a747a2cb83340f8 | |
| parent | c577573afd619b04e2680b0577919e63194af278 (diff) | |
| download | xine-lib-b7d4ecaa6df1ddbbd2e4d61cf60b9003177c0664.tar.gz xine-lib-b7d4ecaa6df1ddbbd2e4d61cf60b9003177c0664.tar.bz2 | |
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
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | misc/xine-config.in | 8 |
2 files changed, 29 insertions, 1 deletions
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 ******************************" @@ -930,6 +940,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 --------------------------------------------- AC_C_ATTRIBUTE_ALIGNED @@ -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" diff --git a/misc/xine-config.in b/misc/xine-config.in index 78006f158..c1ac67532 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -15,6 +15,7 @@ Options: [--exec-prefix[=DIR]] [--version] [--libs] + [--acflags] [--cflags] [--plugindir] [--datadir] @@ -56,6 +57,9 @@ while test $# -gt 0; do --version) echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ ;; + --acflags) + echo_acflags=yes + ;; --cflags) echo_cflags=yes ;; @@ -95,6 +99,10 @@ if test "$echo_exec_prefix" = "yes"; then echo $exec_prefix fi +if test "$echo_acflags" = "yes"; then + echo "@XINE_ACFLAGS@" +fi + if test "$echo_cflags" = "yes"; then echo -I@includedir@ @THREAD_CFLAGS@ fi |