E SVN: barbieri IN trunk/efl: . src/lib/eina

[Enlightenment S. <no-...@en...>]

Log:
efl: 'fix' support for exotic library.
  
  it's still not merged into EFL single tree, but once it is we should
  use "HAVE_EXOTIC" define to work with it.
  
  Before we had: EINA_HAVE_EXOTIC (not used), HAVE_EXOTIC_H (used by
  eina_module.c). Since the other libs are all defined as HAVE_LIBNAME,
  we're using HAVE_EXOTIC everywhere now.
  
  

Author:       barbieri
Date:         2012-10-10 14:24:22 -0700 (Wed, 10 Oct 2012)
New Revision: 77816
Trac:         http://trac.enlightenment.org/e/changeset/77816

Modified:
  trunk/efl/configure.ac trunk/efl/src/lib/eina/eina_config.h.in trunk/efl/src/lib/eina/eina_module.c 

Modified: trunk/efl/configure.ac
===================================================================
--- trunk/efl/configure.ac	2012-10-10 21:15:54 UTC (rev 77815)
+++ trunk/efl/configure.ac	2012-10-10 21:24:22 UTC (rev 77816)
@@ -386,21 +386,6 @@
     ;;
 esac
 
-# Exotic library for compilation on Coyote
-
-# TODO: add back whenever exotic is merged into efl single tree
-#PKG_CHECK_EXISTS([exotic],
-#   [
-#    enable_exotic="yes"
-#    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
-#    EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC"
-#    requirements_pc_eina="exotic ${requirements_pc_eina}"
-#   ],
-#   [enable_exotic="no"])
-
-AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
-AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC])
-
 ## Options
 
 # Valgrind
@@ -605,17 +590,6 @@
 esac
 AC_SUBST(EFL_EET_BUILD)
 
-# Exotic library for compilation on Coyote
-
-# TODO: add back whenever exotic is merged into efl single tree
-#PKG_CHECK_EXISTS([exotic],
-#   [
-#    enable_exotic="yes"
-#    AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
-#    requirements_pc_eet="exotic ${requirements_pc_eet}"
-#   ],
-#   [enable_exotic="no"])
-
 ## Secure layer
 
 case "$build_crypto" in

Modified: trunk/efl/src/lib/eina/eina_config.h.in
===================================================================
--- trunk/efl/src/lib/eina/eina_config.h.in	2012-10-10 21:15:54 UTC (rev 77815)
+++ trunk/efl/src/lib/eina/eina_config.h.in	2012-10-10 21:24:22 UTC (rev 77816)
@@ -19,12 +19,7 @@
 #ifndef EINA_CONFIG_H_
 #define EINA_CONFIG_H_
 
-#ifdef EINA_HAVE_EXOTIC_H
-# undef EINA_HAVE_EXOTIC_H
-#endif
-@EINA_CONFIGURE_HAVE_EXOTIC@
-
-#ifdef EINA_HAVE_EXOTIC
+#ifdef HAVE_EXOTIC
 # include <Exotic.h>
 #endif
 

Modified: trunk/efl/src/lib/eina/eina_module.c
===================================================================
--- trunk/efl/src/lib/eina/eina_module.c	2012-10-10 21:15:54 UTC (rev 77815)
+++ trunk/efl/src/lib/eina/eina_module.c	2012-10-10 21:24:22 UTC (rev 77816)
@@ -58,7 +58,7 @@
 # include <Escape.h>
 #endif
 
-#ifdef HAVE_EXOTIC_H
+#ifdef HAVE_EXOTIC
 # include <Exotic.h>
 #endif