diff options
| -rw-r--r-- | RepositoryExternal.mk | 28 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rwxr-xr-x | set_soenv.in | 2 |
3 files changed, 34 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index db8138cf9ebb..8891d6bfc48f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -646,6 +646,34 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) endef + +ifeq ($(ENABLE_DBUS),YES) + +define gb_LinkTarget__use_dbus +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(DBUS_CFLAGS) \ +) + +$(call gb_Library_add_defs,$(1),\ + -DENABLE_DBUS \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(DBUS_LIBS) \ +) + +endef + +else # ENABLE_DBUS + +define gb_LinkTarget__use_dbus + +endef + +endif # ENABLE_DBUS + + define gb_LinkTarget__use_dbusmenugtk $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ diff --git a/configure.in b/configure.in index 6052587e70d8..a260a0a775fd 100644 --- a/configure.in +++ b/configure.in @@ -6985,6 +6985,8 @@ GTK_CFLAGS="" GTK_LIBS="" ENABLE_SYSTRAY_GTK="" ENABLE_DBUS="" +DBUS_CFLAGS="" +DBUS_LIBS="" if test "$test_gtk" = "yes"; then if test "$ENABLE_GTK" = "TRUE" ; then @@ -7027,6 +7029,8 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) AC_SUBST(GTHREAD_CFLAGS) AC_SUBST(GTHREAD_LIBS) +AC_SUBST(DBUS_CFLAGS) +AC_SUBST(DBUS_LIBS) PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" ) AC_SUBST(LIBPNG_LIBS) diff --git a/set_soenv.in b/set_soenv.in index dc2d996c2b5a..2505e193e8f0 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1530,6 +1530,8 @@ ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" ); ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" ); ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" ); ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" ); +ToFile( "DBUS_CFLAGS", "@DBUS_CFLAGS@", "e" ); +ToFile( "DBUS_LIBS", "@DBUS_LIBS@", "e" ); ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" ); ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" ); ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" ); |