From 2926465e701f9a6735ae719fc3607269ff4f5b7b Mon Sep 17 00:00:00 2001 From: tilman Date: Fri, 23 Mar 2007 10:20:47 +0000 Subject: [PATCH] cleaned up requirements SVN revision: 28956 --- legacy/emotion/configure.in | 11 ----------- legacy/emotion/emotion.pc.in | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in index 8674914913..d36f8dbcf5 100644 --- a/legacy/emotion/configure.in +++ b/legacy/emotion/configure.in @@ -92,18 +92,12 @@ CPPFLAGS="$CPPFLAGS $ECORE_CFLAGS" AC_CHECK_HEADERS(Ecore_X.h Ecore_Fb.h) CPPFLAGS=$save_CPPFLAGS -requirements="eet evas edje ecore ecore-evas embryo" - AC_ARG_ENABLE(xine, AC_HELP_STRING([--disable-xine],[disable xine support @<:@default=auto@:>@]), [enable_xine=$enableval],[enable_xine=auto]) HAVE_XINE="no" if test "$enable_xine" != "no" ; then PKG_CHECK_MODULES(XINE, [libxine >= 1.1.1], [HAVE_XINE="yes"]) - - if test "$HAVE_XINE" = "yes" ; then - requirements="$requirements libxine" - fi fi if test "$enable_xine$HAVE_XINE" = "yesno" ; then AC_MSG_RESULT(xine not found) @@ -159,17 +153,14 @@ 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-base and gst-ffmpeg)" fi - requirements="$requirements gstreamer" GSTPLUG_MSG="yes" else - requirements="$requirements gstreamer" GSTPLUG_MSG="yes" fi if test "$HAVE_GSTCDIOCDDASRC" = "no"; then AC_MSG_WARN([You should install gstreamer-plugins-good and make sure that the cdiocddasrc element is installed]) GSTCDDA_MSG="no (you should install gst-plugins-good and the cdiocddasrc element)" else - requirements="$requirements gstreamer" GSTCDDA_MSG="yes" fi fi @@ -183,8 +174,6 @@ AM_CONDITIONAL([BUILD_GSTREAMER_MODULE], [test "$HAVE_GSTREAMER" = yes]) AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) AC_SUBST(dlopen_libs) -AC_SUBST(requirements) - AC_OUTPUT([ Makefile emotion.pc diff --git a/legacy/emotion/emotion.pc.in b/legacy/emotion/emotion.pc.in index a33aa78a12..6e98ace69f 100644 --- a/legacy/emotion/emotion.pc.in +++ b/legacy/emotion/emotion.pc.in @@ -5,7 +5,8 @@ includedir=@includedir@ Name: emotion Description: Emotion evas based multimedia library -Requires: @requirements@ +Requires: evas Version: @VERSION@ Libs: -L${libdir} -lemotion +Libs.private: @EET_LIBS@ @EDJE_LIBS@ @ECORE_LIBS@ @EMBRYO_LIBS@ @XINE_LIBS@ @GST_LIBS@ Cflags: -I${includedir}