From f4da77932db96d0e4a090cbfd28f6983e28c46da Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 15 Mar 2013 13:35:31 +0000 Subject: [PATCH] add optional azy support to e --- configure.ac | 19 +++++++++++++++++++ src/bin/Makefile.am | 3 ++- src/modules/Makefile.am | 4 ++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c1106e064..784f4dc57 100644 --- a/configure.ac +++ b/configure.ac @@ -586,6 +586,25 @@ if test "x$want_emotion" != "xno"; then fi fi +want_azy=auto +have_azy=no +AC_ARG_ENABLE(azy, + AC_HELP_STRING([--enable-azy], [enable azy support @<:@default=detect@:>@]), + [want_azy=$enableval], + [want_azy=auto] +) +if test "x$want_azy" != "xno"; then + PKG_CHECK_MODULES(AZY, [azy], + [have_azy=yes], [have_azy=no]) + if test "x$want_azy" = "xyes" -a "x$have_azy" = "xno"; then + AC_MSG_ERROR([azy support requested but it was not found]) + fi + if test "x$have_azy" = "xyes"; then + AC_DEFINE([HAVE_AZY], 1, "Have azy support") + requirements_e="${requirements_e} azy" + fi +fi + PKG_CHECK_MODULES(E_OPEN, [ eina >= ${efl_version} ecore >= ${efl_version} diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 105ae48cb..fd930ef66 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ @ELM_CFLAGS@ \ +@AZY_CFLAGS@ \ @EMOTION_CFLAGS@ \ @WAYLAND_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ @@ -393,7 +394,7 @@ e_main.c \ $(enlightenment_src) enlightenment_LDFLAGS = -export-dynamic -enlightenment_LDADD = @e_libs@ @ELM_LIBS@ @EMOTION_LIBS@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ -lm +enlightenment_LDADD = @e_libs@ @ELM_LIBS@ @AZY_LIBS@ @EMOTION_LIBS@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ -lm enlightenment_imc_SOURCES = \ e.h \ diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index e2ef88a1b..bf229fb6f 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -13,8 +13,8 @@ AM_CPPFLAGS = -I. \ -I$(top_srcdir)/src/bin \ -I$(top_builddir)/src/bin \ -I$(top_srcdir)/src/modules -AM_CFLAGS = @e_cflags@ -LIBS += @e_libs@ @dlopen_libs@ +AM_CFLAGS = @e_cflags@ @AZY_CFLAGS@ +LIBS += @e_libs@ @dlopen_libs@ @AZY_LIBS@ EDJE_CC = $(EDJE_CC_$(V)) EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY))