From 8c93ac2293f6ff52826dcc39af634911046de19c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 13 Nov 2005 04:44:39 +0000 Subject: [PATCH] only require xine or gstreamer, not both SVN revision: 18448 --- legacy/emotion/configure.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in index 4bda0c2b4d..d98b6b5acb 100644 --- a/legacy/emotion/configure.in +++ b/legacy/emotion/configure.in @@ -130,6 +130,8 @@ AC_PATH_GENERIC(embryo, 0.9.1, [ 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 @@ if test "$enable_xine" != "no" ; then 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 @@ if test "$HAVE_GSTPLUG" = "no" ; then GSTPLUG_MSG="no (you should install gst-plugins and gst-ffmpeg)" fi else + requirements="$requirements gstreamer" GSTPLUG_MSG="yes" fi @@ -192,7 +196,6 @@ AM_CONDITIONAL([BUILD_GSTREAMER_MODULE], [test "$HAVE_GSTREAMER" = yes]) AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) AC_SUBST(dlopen_libs) -requirements="eet evas ecore edje libxine gstreamer" AC_SUBST(requirements) AC_OUTPUT([