summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-02-24 11:15:14 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-02-24 11:15:14 +0000
commit423cc7ba43c498d7fd04fcbf4008bc0ad0a442d0 (patch)
tree647cb84e53400620be7a8680492f91655c560410 /legacy
parentac0d52f04d4273d9205365778d85a2c262549051 (diff)
eina: add Exotic support.
SVN revision: 68398
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eina/configure.ac31
-rw-r--r--legacy/eina/src/include/eina_config.h.in9
-rw-r--r--legacy/eina/src/lib/eina_module.c4
3 files changed, 37 insertions, 7 deletions
diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index db04eeeb88..60c573cbf3 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -384,6 +384,24 @@ m4_ifdef([v_mic],
384 384
385EFL_COMPILER_FLAG([-Wshadow]) 385EFL_COMPILER_FLAG([-Wshadow])
386 386
387### Checks for portability layer
388
389PKG_CHECK_MODULES([EXOTIC],
390 [exotic],
391 [enable_exotic="yes"],
392 [enable_exotic="no"])
393
394if test "x${enable_exotic}" = "xyes"; then
395 requirement_eina="exotic ${requirement_eina}"
396 EINA_CFLAGS="${EINA_CFLAGS} ${EXOTIC_CFLAGS}"
397 EINA_LIBS="${EXOTIC_LIBS}"
398
399 EINA_CONFIGURE_HAVE_EXOTIC="#define EINA_HAVE_EXOTIC"
400 AC_DEFINE([HAVE_EXOTIC_H], [1], [Define to 1 if you have Exotic.])
401fi
402AM_CONDITIONAL([EINA_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"])
403AC_SUBST([EINA_CONFIGURE_HAVE_EXOTIC])
404
387case "$host_vendor" in 405case "$host_vendor" in
388 ps3*) 406 ps3*)
389 PKG_CHECK_MODULES([ESCAPE], [escape]) 407 PKG_CHECK_MODULES([ESCAPE], [escape])
@@ -395,29 +413,28 @@ esac
395 413
396AC_SUBST([EINA_CFLAGS]) 414AC_SUBST([EINA_CFLAGS])
397 415
398
399### Checks for linker characteristics 416### Checks for linker characteristics
400EINA_LIBS= 417EINA_LIBS=
401lt_enable_auto_import="" 418lt_enable_auto_import=""
402case "${host_os}" in 419case "${host_os}" in
403 mingw*) 420 mingw*)
404 EINA_LIBS="-ldl ${EVIL_LIBS} -lm" 421 EINA_LIBS="${EINA_LIBS} -ldl ${EVIL_LIBS} -lm"
405 lt_enable_auto_import="-Wl,--enable-auto-import" 422 lt_enable_auto_import="-Wl,--enable-auto-import"
406 ;; 423 ;;
407 dragonfly*|openbsd*) 424 dragonfly*|openbsd*)
408 EINA_LIBS="-lm" 425 EINA_LIBS="${EINA_LIBS} -lm"
409 ;; 426 ;;
410 freebsd*|netbsd*) 427 freebsd*|netbsd*)
411 EINA_LIBS="-lrt -lm" 428 EINA_LIBS="${EINA_LIBS} -lrt -lm"
412 ;; 429 ;;
413 darwin*) 430 darwin*)
414 EINA_LIBS="-lm" 431 EINA_LIBS="${EINA_LIBS} -lm"
415 ;; 432 ;;
416 cygwin*) 433 cygwin*)
417 EINA_LIBS="-ldl -lm" 434 EINA_LIBS="${EINA_LIBS} -ldl -lm"
418 ;; 435 ;;
419 *) 436 *)
420 EINA_LIBS="-ldl -lrt -lm" 437 EINA_LIBS="${EINA_LIBS} -lm"
421 ;; 438 ;;
422esac 439esac
423case "$host_vendor" in 440case "$host_vendor" in
diff --git a/legacy/eina/src/include/eina_config.h.in b/legacy/eina/src/include/eina_config.h.in
index 2459acedb2..937d208208 100644
--- a/legacy/eina/src/include/eina_config.h.in
+++ b/legacy/eina/src/include/eina_config.h.in
@@ -19,6 +19,15 @@
19#ifndef EINA_CONFIG_H_ 19#ifndef EINA_CONFIG_H_
20#define EINA_CONFIG_H_ 20#define EINA_CONFIG_H_
21 21
22#ifdef EINA_HAVE_EXOTIC_H
23# undef EINA_HAVE_EXOTIC_H
24#endif
25@EINA_CONFIGURE_HAVE_EXOTIC@
26
27#ifdef EINA_HAVE_EXOTIC
28# include <Exotic.h>
29#endif
30
22#ifdef EINA_MAGIC_DEBUG 31#ifdef EINA_MAGIC_DEBUG
23# undef EINA_MAGIC_DEBUG 32# undef EINA_MAGIC_DEBUG
24#endif 33#endif
diff --git a/legacy/eina/src/lib/eina_module.c b/legacy/eina/src/lib/eina_module.c
index 26df980956..f4f324262c 100644
--- a/legacy/eina/src/lib/eina_module.c
+++ b/legacy/eina/src/lib/eina_module.c
@@ -58,6 +58,10 @@ void *alloca (size_t);
58# include <Escape.h> 58# include <Escape.h>
59#endif 59#endif
60 60
61#ifdef HAVE_EXOTIC_H
62# include <Exotic.h>
63#endif
64
61#include "eina_config.h" 65#include "eina_config.h"
62#include "eina_private.h" 66#include "eina_private.h"
63#include "eina_error.h" 67#include "eina_error.h"