Update of /cvsroot/xine/gnome-xine/m4
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9266/m4
Modified Files:
_js.m4
Log Message:
Resync for release.
Index: _js.m4
===================================================================
RCS file: /cvsroot/xine/gnome-xine/m4/_js.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- _js.m4 12 Nov 2006 14:02:39 -0000 1.13
+++ _js.m4 16 Dec 2006 23:42:19 -0000 1.14
@@ -168,26 +168,42 @@
])
m4_define([nspr_locate],
- [AC_MSG_RESULT([no])
- AC_CHECK_HEADER([$1prtypes.h],
- [NSPR_CFLAGS="-I`spidermonkey_locate_header([$1], [prtypes.h])`"],
- [AC_MSG_ERROR([libnspr not found])],[])
+ [AC_CHECK_HEADER([$1prtypes.h],
+ [NSPR_CFLAGS="-I`spidermonkey_locate_header([$1], [prtypes.h])`"
+ NSPR_FOUND=y
+ break],
+ [:], [])
])
AC_DEFUN([GXINE_PATH_NSPR],
- [case "$HAVE_JS" in
+ [NSPR_FOUND=n
+ AC_MSG_NOTICE([looking for libnspr in various places.])
+ dnl "name" via pkg-config
+ dnl "/name/" via AC_CHECK_HEADER(name/prtypes.h ...)
+ case "$HAVE_JS" in
xulrunner)
- PKG_CHECK_MODULES([NSPR],[xulrunner-nspr],[],[])
+ NSPR_CHECK='xulrunner-nspr nspr /nspr/'
;;
libffjs)
-
PKG_CHECK_MODULES([NSPR],[firefox-nspr],[],[nspr_locate([firefox/nspr/])])
+ NSPR_CHECK='firefox-nspr /firefox/nspr/ nspr /nspr/'
;;
libjs)
- PKG_CHECK_MODULES([NSPR],[nspr],[],[nspr_locate([])])
+ NSPR_CHECK='nspr /nspr/'
;;
*)
-
PKG_CHECK_MODULES([NSPR],mozilla-[nspr],[],[nspr_locate([mozilla/nspr/])])
+ NSPR_CHECK='mozilla-nspr /mozilla/nspr/ nspr /nspr/'
;;
esac
+ for nspr in $NSPR_CHECK; do
+ if test $(expr substr $nspr 1 1) = '/'; then
+ nspr_locate($(expr substr $nspr 2 99))
+ else
+ AC_MSG_NOTICE([trying pkgconfig $nspr])
+ PKG_CHECK_MODULES([NSPR],[$nspr],[NSPR_FOUND=y; break],[:])
+ fi
+ done
+ if test "$NSPR_FOUND" = n; then
+ AC_MSG_ERROR([nspr not found])
+ fi
AC_SUBST(NSPR_CFLAGS)
])
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
