diff options
| author | Bastien Nocera <hadess@hadess.net> | 2008-01-08 09:16:07 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2008-01-08 09:16:07 +0000 |
| commit | 4ac30049a6e1b695993834bae1b82b8de5bdbd2e (patch) | |
| tree | 41d45357c32d1d2b955e6f79c59809ace7b16c89 | |
| parent | c2ee3d73a85c0a393484a0ddc5635369a32ff574 (diff) | |
| download | totem-4ac30049a6e1b695993834bae1b82b8de5bdbd2e.tar.gz | |
Remove gnome-desktop requirement, and allow compilation of the GTK+-only
2008-01-08 Bastien Nocera <hadess@hadess.net>
* browser-plugin/Makefile.am:
* configure.in: Remove gnome-desktop requirement, and
allow compilation of the GTK+-only version of the
browser plugin
svn path=/branches/gnome-2-20/; revision=5008
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | browser-plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 9 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2008-01-08 Bastien Nocera <hadess@hadess.net> + + * browser-plugin/Makefile.am: + * configure.in: Remove gnome-desktop requirement, and + allow compilation of the GTK+-only version of the + browser plugin + ============ Version 2.20.3 2008-01-07 Bastien Nocera <hadess@hadess.net> diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am index da67acc0f..c4d67158b 100644 --- a/browser-plugin/Makefile.am +++ b/browser-plugin/Makefile.am @@ -106,6 +106,7 @@ totem_plugin_viewer_CPPFLAGS = \ totem_plugin_viewer_CFLAGS = \ $(EXTRA_GNOME_CFLAGS) \ + $(SN_CFLAGS) \ $(WARN_CFLAGS) \ $(DBUS_CFLAGS) \ $(NVTV_CFLAGS) \ @@ -118,6 +119,7 @@ totem_plugin_viewer_LDADD = \ $(top_builddir)/lib/libtotemscrsaver.la \ libtotempluginviewer_helper.la \ $(EXTRA_GNOME_LIBS) \ + $(SN_LIBS) \ $(XVIDMODE_LIBS) \ $(DBUS_LIBS) \ $(NVTV_LIBS) \ diff --git a/configure.in b/configure.in index 2926e9945..a21960b08 100644 --- a/configure.in +++ b/configure.in @@ -249,7 +249,7 @@ dnl Seems that the order matters because libtool blows dnl Also check if we're going to be using GTK+ only if test x$ENABLE_GTK = "xno" ; then # FIXME: use gmodule-no-export instead! - PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-desktop-2.0 >= 2.1.5 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM) + PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 $ISO_CODES $MM) HAVE_GNOME=yes else # FIXME: use gmodule-no-export instead! @@ -493,6 +493,13 @@ if test "$enable_browser_plugins" = "yes" ; then fi fi +if test "$enable_browser_plugins" = "yes" ; then + PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ], [enable_browser_plugins = yes], [enable_browser_plugins=no]) + if test "x$enable_browser_plugins" != "xyes" ; then + AC_MSG_WARN([libstartup-notification not found, necessary to build the plugin viewer]) + fi +fi + # Sets some variables, and check for xpidl if test "$enable_browser_plugins" = "yes" ; then MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`" |