diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-01-06 17:31:55 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-01-06 17:31:55 +0000 |
| commit | 8ffd2c737b116f21998061d5c5da1149f1540b18 (patch) | |
| tree | 889a85a2c4c93d2f87bd6592b9acf877b07560b9 | |
| parent | d3ef731119e486081d9581670c7e34c94b94879d (diff) | |
| download | xine-lib-8ffd2c737b116f21998061d5c5da1149f1540b18.tar.gz xine-lib-8ffd2c737b116f21998061d5c5da1149f1540b18.tar.bz2 | |
Use AM_PROG_AS instead of our AM_PROG_AS_MOD.
CVS patchset: 8489
CVS date: 2007/01/06 17:31:55
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | m4/as.m4 | 21 |
2 files changed, 11 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 0abcd1251..0442334a5 100644 --- a/configure.ac +++ b/configure.ac @@ -136,7 +136,7 @@ dnl --------------------------------------------- dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL dnl --------------------------------------------- -AM_PROG_AS_MOD +AM_PROG_AS dnl --------------------------------------------- @@ -365,8 +365,17 @@ AC_SUBST(LIBMPEG2_CFLAGS) AC_ARG_WITH([external-ffmpeg], AC_HELP_STRING([--with-external-ffmpeg], [use external ffmpeg library])) +case "x$with_external_ffmpeg" in + xyes) + PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0]) + ;; + xsoft) + with_external_ffmpeg=yes + PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0], [], + [AC_MSG_RESULT(no); with_external_ffmpeg=no]) + ;; +esac if test "x$with_external_ffmpeg" = "xyes"; then - PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.20.0]) PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc]) AC_SUBST([FFMPEG_CFLAGS]) AC_SUBST([FFMPEG_LIBS]) diff --git a/m4/as.m4 b/m4/as.m4 deleted file mode 100644 index 96a44e239..000000000 --- a/m4/as.m4 +++ /dev/null @@ -1,21 +0,0 @@ -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_MOD -AC_DEFUN([AM_PROG_AS_MOD], -[# By default we simply use the C compiler to build assembly code. -AC_REQUIRE([AC_PROG_CC]) -: ${CCAS='$(CC)'} -# Set CCASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} -# Set ASCOMPILE if not already set. -if test $CCAS = '$'CC; then -: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS) -c'} -else -: ${CCASCOMPILE='$(LIBTOOL) --mode=compile $(CCAS) $(AM_ASFLAGS) $(CCASFLAGS)'} -fi -AC_SUBST(CCAS) -AC_SUBST(CCASFLAGS) -AC_SUBST(CCASCOMPILE)]) |