From bf1ebaf7f445cb5973bf729948ca2bedd8d234b0 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 24 Feb 2012 11:17:26 +0000 Subject: [PATCH] eet: add Exotic support SVN revision: 68400 --- legacy/eet/configure.ac | 13 +++++++++++++ legacy/eet/m4/efl_fnmatch.m4 | 12 ++++++++++++ legacy/eet/src/bin/Makefile.am | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index 30e2d381c2..70c8dbc21a 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -234,6 +234,19 @@ AC_SUBST(EET_LIBS) PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) requirement_eet="eina >= 1.1.0 ${requirement_eet}" +### Checks for portability layer + +PKG_CHECK_MODULES([EXOTIC], + [exotic], + [enable_exotic="yes"], + [enable_exotic="no"]) + +if test "x${enable_exotic}" = "xyes"; then + requirement_eet="exotic ${requirement_eet}" + + AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.]) +fi + # Gnutls support AC_ARG_ENABLE([gnutls], diff --git a/legacy/eet/m4/efl_fnmatch.m4 b/legacy/eet/m4/efl_fnmatch.m4 index a92ac6b636..b5555ee338 100644 --- a/legacy/eet/m4/efl_fnmatch.m4 +++ b/legacy/eet/m4/efl_fnmatch.m4 @@ -24,6 +24,18 @@ if (! test "x${ac_cv_search_fnmatch}" = "xnone required") && (! test "x${ac_cv_s EFL_FNMATCH_LIBS=${ac_cv_search_fnmatch} fi +if test "x${_efl_have_fnmatch}" != "xyes" -a "x${enable_exotic}" = "xyes"; then + LDFLAGS_SAVE="$LDFLAGS" + LDFLAGS="$LDFLAGS $EXOTIC_LIBS" + AC_CHECK_LIB([exotic], [fnmatch], + [_efl_have_fnmatch="yes"], + [_efl_have_fnmatch="no"]) + + if test "x${_efl_have_fnmatch}" = "xyes"; then + EFL_FNMATCH_LIBS="exotic" + fi +fi + AC_SUBST(EFL_FNMATCH_LIBS) AS_IF([test "x$_efl_have_fnmatch" = "xyes"], [$1], [$2]) diff --git a/legacy/eet/src/bin/Makefile.am b/legacy/eet/src/bin/Makefile.am index ba7d67e3b6..89c68f1dca 100644 --- a/legacy/eet/src/bin/Makefile.am +++ b/legacy/eet/src/bin/Makefile.am @@ -17,5 +17,5 @@ EXTRA_PROGRAMS = eet eet_SOURCES = eet_main.c eet_CFLAGS = @EET_CFLAGS@ -eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ +eet_LDADD = $(top_builddir)/src/lib/libeet.la @EINA_LIBS@ @EVIL_LIBS@ @EXOTIC_LIBS@ eet_LDFLAGS = @lt_enable_auto_import@