diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | enlightenment.pc.in | 4 | ||||
| -rw-r--r-- | src/bin/e_msgbus.h | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 133117857..7e39469fd 100644 --- a/configure.in +++ b/configure.in @@ -221,14 +221,16 @@ PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) # this is used to conditionally build modules which depend on E_DBUS AM_CONDITIONAL(HAVE_EDBUS, test x$have_edbus = "xyes") +define_e_dbus="" if test x$have_edbus = "xyes"; then + define_e_dbus="-DHAVE_EDBUS" if test x$have_ehal = "xyes"; then AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support]) fi fi e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" " -e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$E_DBUS_CFLAGS" " +e_cflags="-DUSE_E_CONFIG_H "$define_e_dbus" "$E_CFLAGS" "$E_DBUS_CFLAGS" " AC_SUBST(e_libs) AC_SUBST(e_cflags) diff --git a/enlightenment.pc.in b/enlightenment.pc.in index c8d18e91c..bda8b1931 100644 --- a/enlightenment.pc.in +++ b/enlightenment.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@/@PACKAGE@ Name: enlightenment Description: Enlightenmnt Window Manager Version: @VERSION@ -Libs: @libdir@/@PACKAGE@/modules +Libs: -L${libdir} Libs.private: -Cflags: -I${includedir} +Cflags: -I${includedir} @e_cflags@ diff --git a/src/bin/e_msgbus.h b/src/bin/e_msgbus.h index 7f9e344c6..738748df0 100644 --- a/src/bin/e_msgbus.h +++ b/src/bin/e_msgbus.h @@ -3,10 +3,6 @@ */ #ifdef E_TYPEDEFS -#ifndef HAVE_EDBUS -#define E_DBus_Interface void -#endif - typedef struct _E_Msgbus_Data E_Msgbus_Data; #else @@ -15,18 +11,20 @@ typedef struct _E_Msgbus_Data E_Msgbus_Data; /* This is the dbus subsystem, but e_dbus namespace is taken by e_dbus */ +#ifdef HAVE_EDBUS struct _E_Msgbus_Data { -#ifdef HAVE_EDBUS E_DBus_Connection *conn; E_DBus_Object *obj; -#endif }; +#endif EAPI int e_msgbus_init(void); EAPI int e_msgbus_shutdown(void); +#ifdef HAVE_EDBUS EAPI void e_msgbus_interface_attach(E_DBus_Interface *iface); EAPI void e_msgbus_interface_detach(E_DBus_Interface *iface); +#endif #endif #endif |