[xine-cvs] CVS: gnome-xine/m4 _gxine.m4,1.7,1.8 _js.m4,1.14,1.15

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

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

Modified Files:
	_gxine.m4 _js.m4 
Log Message:
Resync with hg (cset 1907).

Index: _gxine.m4
===================================================================
RCS file: /cvsroot/xine/gnome-xine/m4/_gxine.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- _gxine.m4	3 Feb 2007 15:26:20 -0000	1.7
+++ _gxine.m4	27 Feb 2007 18:03:50 -0000	1.8
@@ -40,3 +40,33 @@
     AC_MSG_RESULT([$ac_cv_ld_asneeded])
     test x"$ac_cv_ld_asneeded" = xyes || LDFLAGS="$SAVE_LDFLAGS"
     ])
+
+dnl OS-specific HAL device info lookup
+dnl HAL_DEVICE_FILE_PROPERTY = HAL property giving the device pathname
+dnl HAL_DEVICE_FILE_PREFIX   = Prefix for the device file property,
+dnl                            e.g. "/dev/", were "/dev" omitted on Linux
+dnl                            (note the trailing "/"!)
+AC_DEFUN([GXINE_HAL_DEVICE_INFO],
+    [AC_MSG_CHECKING([how to acquire device info via HAL])
+    HAL_DEVICE_FILE_PROPERTY=''
+    HAL_DEVICE_FILE_PREFIX=''
+    case "$build_os" in
+      linux-*)
+	HAL_DEVICE_FILE_PROPERTY=linux.device_file
+	;;
+      solaris2.*)
+	HAL_DEVICE_FILE_PROPERTY=solaris.devfs_path
+	HAL_DEVICE_FILE_PREFIX=/devices/
+	;;
+    esac
+    AC_MSG_RESULT(["$HAL_DEVICE_FILE_PROPERTY", prefix "$HAL_DEVICE_FILE_PREFIX"])
+    if test "$HAL_DEVICE_FILE_PROPERTY" = ''; then
+      AC_MSG_WARN([I don't know how to get HAL path info for $build_os.])
+      AC_MSG_WARN([You won't see some info when viewing/selecting default devices.])
+    else
+      AC_DEFINE_UNQUOTED(HAL_DEVICE_FILE_PROPERTY, ["$HAL_DEVICE_FILE_PROPERTY"], [HAL device pathname property])
+      if test "$HAL_DEVICE_FILE_PREFIX" != ''; then
+        AC_DEFINE_UNQUOTED(HAL_DEVICE_FILE_PREFIX, ["$HAL_DEVICE_FILE_PREFIX"], [Common prefix for the HAL device pathname property])
+      fi
+    fi
+    ])

Index: _js.m4
===================================================================
RCS file: /cvsroot/xine/gnome-xine/m4/_js.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- _js.m4	16 Dec 2006 23:42:19 -0000	1.14
+++ _js.m4	27 Feb 2007 18:03:50 -0000	1.15
@@ -18,9 +18,12 @@
 
 m4_define([spidermonkey_locate_lib],
    [case "$JS_CFLAGS" in
-	/usr/local/include/*)
+	-I/usr/local/include/*)
 	  echo -L/usr/local/lib -l"$1"
 	  ;;
+	-I/usr/include/firefox/*)
+	  echo -L/usr/lib/firefox -R/usr/lib/firefox -l"$1"
+	  ;;
 	*)
 	  echo -l"$1"
 	  ;;
@@ -185,7 +188,7 @@
 	NSPR_CHECK='xulrunner-nspr nspr /nspr/'
 	;;
       libffjs)
-	NSPR_CHECK='firefox-nspr /firefox/nspr/ nspr /nspr/'
+	NSPR_CHECK='firefox-nspr /firefox/nspr/ nspr /nspr/ mps /mps/'
 	;;
       libjs)
 	NSPR_CHECK='nspr /nspr/'
@@ -195,8 +198,9 @@
 	;;
     esac
     for nspr in $NSPR_CHECK; do
-      if test $(expr substr $nspr 1 1) = '/'; then
-	nspr_locate($(expr substr $nspr 2 99))
+      if test "`echo $nspr | sed 's/^\(.\).*$/\1/'`" = '/'; then
+	nspr_dir="`echo $nspr | sed 's/^.\(.*\)$/\1/g'`"
+	nspr_locate(${nspr_dir})
       else
 	AC_MSG_NOTICE([trying pkgconfig $nspr])
 	PKG_CHECK_MODULES([NSPR],[$nspr],[NSPR_FOUND=y; break],[:])