diff options
| -rw-r--r-- | configure.in | 23 | ||||
| -rw-r--r-- | elementary.pc.in | 4 | ||||
| -rw-r--r-- | src/bin/Makefile.am | 3 | ||||
| -rw-r--r-- | src/lib/Elementary.h.in | 12 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 5 |
5 files changed, 41 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 967552a40..4bb00dacb 100644 --- a/configure.in +++ b/configure.in @@ -107,6 +107,26 @@ PKG_CHECK_MODULES([ELEMENTARY_WINCE], [have_elementary_wince="no"] ) +ELM_EDBUS_DEF="#undef" +have_elementary_edbus="no" +PKG_CHECK_MODULES([ELEMENTARY_EDBUS], + [ + edbus + ehal + ], + [ + AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary]) + have_elementary_edbus="yes" + ELM_EDBUS_DEF="#define" + ], + [have_elementary_edbus="no"] +) +AC_SUBST(ELM_EDBUS_DEF) + +ELM_ALLOCA_H_DEF="#undef" +AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"]) +AC_SUBST(ELM_ALLOCA_H_DEF) + my_libs="-lm" AC_SUBST(my_libs) @@ -141,6 +161,9 @@ echo " X11...........: ${have_elementary_x}" echo " Framebuffer...: ${have_elementary_fb}" echo " Windows CE....: ${have_elementary_wince}" echo +echo "Features:" +echo " EDBus.........: ${have_elementary_edbus}" +echo echo "------------------------------------------------------------------------" echo echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE," diff --git a/elementary.pc.in b/elementary.pc.in index bc7878322..2ea55aa25 100644 --- a/elementary.pc.in +++ b/elementary.pc.in @@ -8,5 +8,5 @@ Description: Mobile device touchscreen widget library Requires: evas ecore ecore-x ecore-evas ecore-job ecore-txt ecore-file eet edje Version: @VERSION@ Libs: -L${libdir} -lelementary -Libs.private: @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ -Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@ +Libs.private: @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ +Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@ @ELEMENTARY_EDBUS_CFLAGS@ diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 0ba67d24c..421e5495a 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @ELEMENTARY_FB_CFLAGS@ \ -@ELEMENTARY_WINCE_CFLAGS@ +@ELEMENTARY_WINCE_CFLAGS@ \ +@ELEMENTARY_EDBUS_CFLAGS@ bin_PROGRAMS = elementary_test diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 16fc2cfd7..022adabac 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -19,7 +19,9 @@ @ELM_UNIX_DEF@ ELM_UNIX @ELM_WIN32_DEF@ ELM_WIN32 @ELM_WINCE_DEF@ ELM_WINCE - +@ELM_EDBUS_DEF@ ELM_EDBUS +@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H + /* Standard headers for standard system calls etc. */ #include <stdio.h> #include <stdlib.h> @@ -44,6 +46,10 @@ #include <errno.h> #include <signal.h> +#ifdef ELM_ALLOCA_H +# include <alloca.h> +#endif + /* EFL headers */ #include <Eina.h> #include <Eet.h> @@ -55,6 +61,10 @@ #include <Ecore_File.h> #include <Edje.h> +#ifdef ELM_EDBUS +# include <E_DBus.h> +# include <E_Hal.h> +#endif #ifdef EAPI # undef EAPI diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index d9d2e0890..d15d8b110 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @ELEMENTARY_FB_CFLAGS@ \ -@ELEMENTARY_WINCE_CFLAGS@ +@ELEMENTARY_WINCE_CFLAGS@ \ +@ELEMENTARY_EDBUS_CFLAGS@ lib_LTLIBRARIES = libelementary.la @@ -58,5 +59,5 @@ els_icon.h libelementary_la_CFLAGS = -libelementary_la_LIBADD = @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @my_libs@ +libelementary_la_LIBADD = @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @my_libs@ libelementary_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ |