Enlightenment CVS committal
Author : technikolor
Project : misc
Module : eplayer
Dir : misc/eplayer
Modified Files:
configure.ac
Log Message:
A fix, abiet not the best, for AVcodecs recent desire to break Eplayer as a whole.
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.ac 24 Jan 2004 20:25:18 -0000 1.16
+++ configure.ac 28 Jan 2004 09:46:23 -0000 1.17
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.16 2004/01/24 20:25:18 tsauerbeck Exp $
+dnl $Id: configure.ac,v 1.17 2004/01/28 09:46:23 technikolor Exp $
AC_INIT(src/eplayer.c)
@@ -84,11 +84,15 @@
dnl Check for libavcodec
tmp=$LIBS
-AC_CHECK_LIB(avcodec, avcodec_init,
- [have_avcodec="yes"; LIBS="$LIBS -lavcodec"], have_avcodec="no")
+AC_ARG_ENABLE(debug,
+ [ --enable-avcodec Build AVcodec support (default: no)],
+
+ [
+ AC_CHECK_LIB(avcodec, avcodec_init,
+ [have_avcodec="yes"; LIBS="$LIBS -lavcodec"], have_avcodec="no")
-if test "x$have_avcodec" = "xyes"; then
- AC_CHECK_LIB(avformat, av_register_all,
+ if test "x$have_avcodec" = "xyes"; then
+ AC_CHECK_LIB(avformat, av_register_all,
[
AVCODEC_CFLAGS="-I/usr/include/ffmpeg"
AVCODEC_LIBS="-lavcodec -lavformat"
@@ -96,10 +100,12 @@
AC_SUBST(AVCODEC_CFLAGS)
AC_SUBST(AVCODEC_LIBS)
], have_avcodec="no")
-fi
+ fi
-LIBS=$tmp
-AM_CONDITIONAL(HAVE_AVCODEC, test "$have_avcodec" = "yes")
+ LIBS=$tmp
+ AM_CONDITIONAL(HAVE_AVCODEC, test "$have_avcodec" = "yes")
+ ], have_avcodec="no")
+
dnl Check for OSS
AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, [have_oss="yes"; break],
have_oss="no")
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
