From 29ba62c5a1b1747ef7bff127ea78c665e8ce286d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 23 Sep 2014 16:23:42 -0400 Subject: [PATCH] update azy use to not require lib outside lyric plugin --- configure.ac | 5 ++++- src/modules/Makefile.mk | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b737f6d..ba1fefb 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AC_ARG_WITH([dbus-services], AC_SUBST(dbusservicedir) PKG_CHECK_MODULES([MPDCLIENT], [libmpdclient >= 2.9]) -PKG_CHECK_MODULES([EFL], [eina >= 1.11.2 ecore >= 1.11.2 ecore-con >= 1.11.2 eldbus >= 1.11.2 efreet >= 1.11.2 azy eet >= 1.11.2]) +PKG_CHECK_MODULES([EFL], [eina >= 1.11.2 ecore >= 1.11.2 ecore-con >= 1.11.2 eldbus >= 1.11.2 efreet >= 1.11.2 eet >= 1.11.2]) PKG_CHECK_MODULES([ELM], [evas >= 1.11.2 elementary >= 1.11.2]) PKG_CHECK_MODULES([ESQL], [esskyuehl], [have_esql=yes], [have_esql=no]) AC_PATH_PROG([AZY_PARSER], [azy_parser], [no]) @@ -136,6 +136,9 @@ want_elyr=yes AC_ARG_ENABLE([module-elyr], [AC_HELP_STRING([--disable-module-elyr], [disable elyr module. @<:@default=detect@:>@])], [want_elyr=$enableval], []) +if test "x$want_elyr" = "xyes" ; then + PKG_CHECK_MODULES([AZY], [azy]) +fi AM_CONDITIONAL([MOD_ELYR], [test "x$want_elyr" = "xyes"]) want_eet_saver=yes diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index 2dd0b51..113795d 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -107,10 +107,12 @@ $(AM_CFLAGS) \ $(mod_cppflags) \ @EFL_CFLAGS@ \ @ELM_CFLAGS@ \ +@AZY_CFLAGS@ \ -I$(top_srcdir)/src/bin \ -I$(top_builddir) src_modules_elyr_la_LIBADD = \ +@AZY_LIBS@ \ @EFL_LIBS@ \ @ELM_LIBS@