Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in
Log Message:
its not an error until BOTH gstreamer and xine are not found.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- configure.in 4 Feb 2006 13:43:13 -0000 1.30
+++ configure.in 9 Feb 2006 06:12:39 -0000 1.31
@@ -146,7 +146,7 @@
fi
fi
if test "$enable_xine$HAVE_XINE" = "yesno" ; then
- AC_MSG_ERROR(xine not found)
+ AC_MSG_RESULT(xine not found)
fi
AC_ARG_ENABLE(gstreamer,
@@ -177,9 +177,9 @@
[HAVE_GSTFFMPEG="no"])
fi
if test "$enable_gstreamer$HAVE_GSTREAMER" = "yesno" ; then
- AC_MSG_ERROR(gstreamer not found)
+ AC_MSG_RESULT(gstreamer not found)
fi
-if test "$HAVE_GSTPLUG" = "no" -o test "$HAVE_GSTFFMPEG" = "no"; then
+if test "$HAVE_GSTPLUG" = "no"; then
if test "$HAVE_GSTREAMER" = "no" ; then
GSTPLUG_MSG="no"
else
@@ -187,10 +187,17 @@
GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
fi
else
- requirements="$requirements gstreamer"
- GSTPLUG_MSG="yes"
+ if test "$HAVE_GSTFFMPEG" = "no"; then
+ if test "$HAVE_GSTREAMER" = "no" ; then
+ GSTPLUG_MSG="no"
+ else
+ AC_MSG_WARN([You should install gstreamer plugins and
gst-ffmpeg to properly decode your video and audio files])
+ GSTPLUG_MSG="no (you should install gst-plugins and
gst-ffmpeg)"
+ fi
+ requirements="$requirements gstreamer"
+ GSTPLUG_MSG="yes"
+ fi
fi
-
if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then
AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
fi
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
