[xine-cvs] CVS: gnome-xine ChangeLog,1.74.2.5,1.74.2.6 configure.ac,1.45.2.1,1.45.2.2

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2534

Modified Files:
      Tag: gxine-0_4_2-branch
	ChangeLog configure.ac 
Log Message:
Updates from CVS HEAD:
  - plugin is optional (enabled by default)
  - add support for VDR's AUDIO key (vdr 1.3.x)
  - documentation fix affecting JS help()


Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/gnome-xine/ChangeLog,v
retrieving revision 1.74.2.5
retrieving revision 1.74.2.6
diff -u -r1.74.2.5 -r1.74.2.6
--- ChangeLog	23 Mar 2005 22:48:58 -0000	1.74.2.5
+++ ChangeLog	23 Apr 2005 16:49:53 -0000	1.74.2.6
@@ -1,3 +1,7 @@
+	[dsalt]
+	* Added support for VDR's AUDIO key.
+	* Made the browser plugin optional.
+
 0.4.3:	[dsalt]
 	* Fix a bug in JS vdr(). It should check the active MRL rather than
 	  the currently-selected playlist entry.

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/gnome-xine/configure.ac,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -r1.45.2.1 -r1.45.2.2
--- configure.ac	17 Mar 2005 01:15:13 -0000	1.45.2.1
+++ configure.ac	23 Apr 2005 16:49:53 -0000	1.45.2.2
@@ -2,7 +2,7 @@
 AC_CONFIG_SRCDIR([src/main.c])
 
 AM_CONFIG_HEADER(include/config.h)
-AM_INIT_AUTOMAKE(gxine, 0.4.3)
+AM_INIT_AUTOMAKE(gxine, 0.4.4)
 AM_MAINTAINER_MODE
 dnl AM_ACLOCAL_INCLUDE(m4)
 
@@ -42,15 +42,24 @@
 AC_PATH_XTRA
 
 dnl ---------------------------------------------
-dnl Check for Xaw headers
+dnl Check whether to build the Moz browser plugin
 dnl ---------------------------------------------
-saved_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADER(X11/Xaw/Form.h,,
+AC_MSG_CHECKING(whether to build the Mozilla plugin)
+AC_ARG_WITH(browser-plugin,
+	    AS_HELP_STRING(--without-browser-plugin,
+			   [do not build the Mozilla browser plugin]),
+	    if test "$withval" = no; then browser_plugin=no; else browser_plugin=yes; fi,
+	    browser_plugin=yes)
+AC_MSG_RESULT($browser_plugin)
+if test "$browser_plugin" = yes; then
+  saved_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+  AC_CHECK_HEADER(X11/Xaw/Form.h,,
        [AC_MSG_ERROR([you need to install libxaw header files (-dev package)])],
        [#include <X11/Intrinsic.h>])
-CPPFLAGS=$saved_CPPFLAGS
-
+  CPPFLAGS=$saved_CPPFLAGS
+fi
+AM_CONDITIONAL([BROWSER_PLUGIN], [test "$browser_plugin" = yes])
 
 dnl ---------------------------------------------
 dnl check for gtk 2