totem r5008 - in branches/gnome-2-20: . browser-plugin

[hadess svn gnome org]

Author: hadess
Date: Tue Jan  8 09:16:07 2008
New Revision: 5008
URL: http://svn.gnome.org/viewvc/totem?rev=5008&view=rev

Log:
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



Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/browser-plugin/Makefile.am
   branches/gnome-2-20/configure.in

Modified: branches/gnome-2-20/browser-plugin/Makefile.am
==============================================================================
--- branches/gnome-2-20/browser-plugin/Makefile.am	(original)
+++ branches/gnome-2-20/browser-plugin/Makefile.am	Tue Jan  8 09:16:07 2008
@@ -106,6 +106,7 @@
 
 totem_plugin_viewer_CFLAGS = \
 	$(EXTRA_GNOME_CFLAGS)	\
+	$(SN_CFLAGS)		\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(NVTV_CFLAGS)		\
@@ -118,6 +119,7 @@
 	$(top_builddir)/lib/libtotemscrsaver.la				\
 	libtotempluginviewer_helper.la					\
 	$(EXTRA_GNOME_LIBS)	\
+	$(SN_LIBS)		\
 	$(XVIDMODE_LIBS) 	\
 	$(DBUS_LIBS)		\
 	$(NVTV_LIBS) 		\

Modified: branches/gnome-2-20/configure.in
==============================================================================
--- branches/gnome-2-20/configure.in	(original)
+++ branches/gnome-2-20/configure.in	Tue Jan  8 09:16:07 2008
@@ -249,7 +249,7 @@
 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 @@
 	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`"