cleaned up autotools setup some more

SVN revision: 12080

diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index a1913be..356766e 100644 (file)
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -100,21 +100,6 @@ dnl Set PACKAGE_SOURCE_DIR in config.h.
 packagesrcdir=`cd $srcdir && pwd`
 AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
 
-AC_MSG_CHECKING(whether to build only fb support)
-have_fb_only="no"
-AC_ARG_ENABLE(fb-only, [  --enable-fb-only        enable building of fb support only ], [
-     if [ test "$enableval" = "yes" ]; then
-       AC_MSG_RESULT(yes)
-       have_fb_only="yes"
-     else
-       AC_MSG_RESULT(no)
-       have_fb_only="no"
-     fi
-   ], [
-      AC_MSG_RESULT($have_fb_only)
-   ]
-)
-
 AC_MSG_CHECKING(whether to build edje_cc)
 have_edje_cc="yes"
 AC_ARG_ENABLE(edje-cc, [  --disable-edje-cc       disable building of edje_cc ], [
@@ -130,12 +115,6 @@ AC_ARG_ENABLE(edje-cc, [  --disable-edje-cc       disable building of edje_cc ],
    ]
 )
 
-edje_def=""
-if test "x$have_fb_only" = "xyes"; then
-  edje_def="-DEDJE_FB_ONLY"
-fi
-AC_SUBST(edje_def)
-
 AC_ARG_WITH(eet,
         [  --with-eet=DIR               use eet in <DIR>],
         [CFLAGS="$CFLAGS -I$withval/include"
@@ -186,6 +165,9 @@ AC_ARG_WITH(ecore,
 AC_PATH_GENERIC(ecore, , ,
     AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
 
+AC_CHECK_HEADERS(Ecore_X.h)
+AC_CHECK_HEADERS(Ecore_Fb.h)
+
 AC_MSG_CHECKING([for location of Vim data files])
 install_vim="yes";
 AC_ARG_WITH(vim,

diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index 120b11f..10a840d 100644 (file)
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -29,8 +29,6 @@ edje_main.h
 edje_LDADD = \
 $(top_builddir)/src/lib/libedje.la
 
-edje_CPPFLAGS = @edje_def@
-
 edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
 
@@ -47,8 +45,6 @@ edje_cc_LDADD = \
 $(top_builddir)/src/lib/libedje.la \
 @IMLIB2_LIBS@
 
-edje_cc_CPPFLAGS = @edje_def@
-
 edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
 
@@ -62,8 +58,6 @@ edje_decc_LDADD = \
 $(top_builddir)/src/lib/libedje.la \
 @IMLIB2_LIBS@
 
-edje_decc_CPPFLAGS = @edje_def@
-
 edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
 
@@ -74,8 +68,6 @@ edje_ls.c
 edje_ls_LDADD = \
 $(top_builddir)/src/lib/libedje.la
 
-edje_ls_CPPFLAGS = @edje_def@
-
 edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
 
 EXTRA_SCRIPTS = edje_recc

diff --git a/legacy/edje/src/bin/edje_main.c b/legacy/edje/src/bin/edje_main.c
index 4e0fa5c..c48ace1 100644 (file)
--- a/legacy/edje/src/bin/edje_main.c
+++ b/legacy/edje/src/bin/edje_main.c
@@ -74,7 +74,7 @@ main_start(int argc, char **argv)
    ecore_app_args_set(argc, (const char **)argv);
    ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
    if (!ecore_evas_init()) return -1;
-#ifndef EDJE_FB_ONLY  
+#ifdef HAVE_ECORE_X_H
      {
         int i;
 

diff --git a/legacy/edje/src/bin/edje_main.h b/legacy/edje/src/bin/edje_main.h
index 3f4eda3..9247192 100644 (file)
--- a/legacy/edje/src/bin/edje_main.h
+++ b/legacy/edje/src/bin/edje_main.h
@@ -1,18 +1,22 @@
 #ifndef EDJE_H
 #define EDJE_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <Evas.h>
 #include <Ecore.h>
-#ifndef EDJE_FB_ONLY
+#ifdef HAVE_ECORE_X_H
 #include <Ecore_X.h>
-#else
+#endif
+#ifdef HAVE_ECORE_FB_H
 #include <Ecore_Fb.h>
 #endif
 #include <Ecore_Evas.h>
 #include <Eet.h>
 #include "Edje.h"
 #include "edje_private.h"
-#include "config.h"
 
 #define DAT PACKAGE_DATA_DIR"/"
 

diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am
index cc533a6..a4b5194 100644 (file)
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@@ -12,8 +12,7 @@ INCLUDES           = \
 @EET_CFLAGS@ \
 @EMBRYO_CFLAGS@ \
 @EVAS_CFLAGS@ \
-@ECORE_CFLAGS@ \
-@edje_def@
+@ECORE_CFLAGS@
 
 lib_LTLIBRARIES      = \
 libedje.la 

diff --git a/legacy/edje/src/lib/edje_callbacks.c b/legacy/edje/src/lib/edje_callbacks.c
index 73e9aa7..195cc01 100644 (file)
--- a/legacy/edje/src/lib/edje_callbacks.c
+++ b/legacy/edje/src/lib/edje_callbacks.c
@@ -45,7 +45,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
    ed = data;
    rp = evas_object_data_get(obj, "real_part");
    if (!rp) return;
-#ifndef EDJE_FB_ONLY
+#ifdef HAVE_ECORE_X_H
    if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
      {
        Ecore_X_Event_Mouse_Button_Down *evx;

diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index d401a85..bcf4d08 100644 (file)
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -1,14 +1,14 @@
 #ifndef _EDJE_PRIVATE_H
 #define _EDJE_PRIVATE_H
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <Evas.h>
 #include <Ecore.h>
-#ifndef EDJE_FB_ONLY
+#ifdef HAVE_ECORE_X_H
 #include <Ecore_X.h>
-#else
-#include <Ecore_Fb.h>
 #endif
 #include <Eet.h>
 #include <Embryo.h>