Enlightenment CVS committal

Author  : vapier
Project : e17
Module  : libs/emotion

Dir     : e17/libs/emotion


Modified Files:
        configure.in 


Log Message:
only require xine or gstreamer, not both
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- configure.in        25 Oct 2005 04:40:17 -0000      1.25
+++ configure.in        13 Nov 2005 04:44:39 -0000      1.26
@@ -130,6 +130,8 @@
   [ AC_MSG_ERROR(Embryo isn't installed)]
 )
 
+requirements="eet evas edje ecore embryo"
+
 AC_ARG_ENABLE(xine,
        AC_HELP_STRING([--disable-xine],[disable xine support 
@<:@default=auto@:>@]),
        [enable_xine=$enableval],[enable_xine=auto])
@@ -138,6 +140,7 @@
        AC_PATH_GENERIC(xine, 1.0.0, [HAVE_XINE="yes"])
 
        if test "$HAVE_XINE" = "yes" ; then
+               requirements="$requirements libxine"
                xine_plugins=`$XINE_CONFIG --plugindir`
                AC_SUBST(xine_plugins)
        fi
@@ -179,6 +182,7 @@
                GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)"
        fi
 else
+       requirements="$requirements gstreamer"
        GSTPLUG_MSG="yes"
 fi
 
@@ -192,7 +196,6 @@
 AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
 AC_SUBST(dlopen_libs)
 
-requirements="eet evas ecore edje libxine gstreamer"
 AC_SUBST(requirements)
 
 AC_OUTPUT([




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to