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. SVN revision: 77816
This commit is contained in:
parent
423ae915ee
commit
3cf32cca3f
26
configure.ac
26
configure.ac
|
@ -386,21 +386,6 @@ case "$host_vendor" in
|
||||||
;;
|
;;
|
||||||
esac
|
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
|
## Options
|
||||||
|
|
||||||
# Valgrind
|
# Valgrind
|
||||||
|
@ -605,17 +590,6 @@ case "$host_os" in
|
||||||
esac
|
esac
|
||||||
AC_SUBST(EFL_EET_BUILD)
|
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
|
## Secure layer
|
||||||
|
|
||||||
case "$build_crypto" in
|
case "$build_crypto" in
|
||||||
|
|
|
@ -19,12 +19,7 @@
|
||||||
#ifndef EINA_CONFIG_H_
|
#ifndef EINA_CONFIG_H_
|
||||||
#define EINA_CONFIG_H_
|
#define EINA_CONFIG_H_
|
||||||
|
|
||||||
#ifdef EINA_HAVE_EXOTIC_H
|
#ifdef HAVE_EXOTIC
|
||||||
# undef EINA_HAVE_EXOTIC_H
|
|
||||||
#endif
|
|
||||||
@EINA_CONFIGURE_HAVE_EXOTIC@
|
|
||||||
|
|
||||||
#ifdef EINA_HAVE_EXOTIC
|
|
||||||
# include <Exotic.h>
|
# include <Exotic.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ void *alloca (size_t);
|
||||||
# include <Escape.h>
|
# include <Escape.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_EXOTIC_H
|
#ifdef HAVE_EXOTIC
|
||||||
# include <Exotic.h>
|
# include <Exotic.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue