[xine-cvs] CVS: gnome-xine/m4 _js.m4,1.12,1.13

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

Update of /cvsroot/xine/gnome-xine/m4
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv541/m4

Modified Files:
	_js.m4 
Log Message:
Sync with master hg repository, changeset 1736.

Index: _js.m4
===================================================================
RCS file: /cvsroot/xine/gnome-xine/m4/_js.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- _js.m4	27 Aug 2006 16:34:06 -0000	1.12
+++ _js.m4	12 Nov 2006 14:02:39 -0000	1.13
@@ -52,6 +52,8 @@
 	[AS_HELP_STRING([--disable-mozjs],[don't look for Mozilla libmozjs])])
     AC_ARG_ENABLE([ffjs],
 	[AS_HELP_STRING([--disable-ffjs], [don't look for Firefox libmozjs])])
+   AC_ARG_ENABLE([seajs],
+	[AS_HELP_STRING([--disable-seajs], [don't look for Seamonkey libmozjs])])
 
     test "$enable_libjs$enable_mozjs$enable_ffjs" = "nonono" &&
       AC_MSG_ERROR([cannot search for no JS library - try removing a --disable-*js option])
@@ -111,6 +113,13 @@
 	  AC_MSG_WARN([gxine may fail if libmozjs.so is not in the usual locations. You may need to set LD_LIBRARY_PATH.])
 	fi
       fi
+      if test x"$JS_CFLAGS" = x && test "$enable_seajs" != "no"; then
+	AC_MSG_NOTICE([trying mozjs via pkgconfig seamonkey-js])
+	PKG_CHECK_MODULES([JS],[seamonkey-js],[],[AC_MSG_RESULT([no])])
+	if test x"$JS_CFLAGS" != x; then
+	  AC_MSG_WARN([gxine may fail if libmozjs.so is not in the usual locations. You may need to set LD_LIBRARY_PATH.])
+	fi
+      fi
 
       if test x"$JS_CFLAGS" = x && test "$enable_mozjs" != "no"; then
         AC_MSG_NOTICE([trying mozjs, includes in /usr/include/mozilla/js])
@@ -124,6 +133,10 @@
         AC_MSG_NOTICE([trying mozjs, includes in /usr/include/firefox/js])
 	spidermonkey_locate([firefox-1.5/js/], [mozjs], [ffjs])
       fi
+      if test x"$JS_CFLAGS" = x && test "$enable_seajs" != "no"; then
+	AC_MSG_NOTICE([trying mozjs, includes in /usr/include/seamonkey/js])
+	spidermonkey_locate([seamonkey/js/], [mozjs])
+      fi
 
       # Failed...
 
@@ -139,7 +152,7 @@
 			*/smjs|*/smjs/)
 			  echo sm
 			  ;;
-			*/mozilla/js|*/mozilla/js*|*/firefox/js|*/firefox/js*)
+			*/mozilla/js|*/mozilla/js*|*/firefox/js|*/firefox/js*|*seamonkey/js|*seamonkey/js*)
 			  echo moz
 			  ;;
 		   esac`"