Skip to content

Instantly share code, notes, and snippets.

@jgehring

jgehring/fixed-check-for-libjs.patch

Created March 6, 2012 11:00
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save jgehring/1985687 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save jgehring/1985687 to your computer and use it in GitHub Desktop.
Download ZIP
Fixed check for libjs [for mediatomb-svn in Arch Linux]
Raw
fixed-check-for-libjs.patch
From d27abc679432e35b16c6635e2c1d308e9cebfb81 Mon Sep 17 00:00:00 2001
From: Jonas Gehring <[email protected]>
Date: Tue, 6 Mar 2012 11:57:00 +0100
Subject: [PATCH] Fixed check for libjs
Arch Linux provides a js and a spidermonkey package. The correct
library for mediatomb is lib libmozjs185 (from js) and not libjs (from
spidermonkey). If both packages are installed, mediatomb would pick the
wrong one.
Mediatomb checks libjs first and looks for JS_NewObject, but this symbol
is defined in both of the libraries mentioned above. The compilation
will fail because of missing symbols that are defined in libmozjs185
only. With this patch, configure checks for JS_RemoveObjectRoot instead,
which isn't defined in libjs but in libmozjs185.
---
configure.ac | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1ef1d0c..1a0f1bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1004,21 +1004,21 @@ if test "x$JS_OK" = xyes; then
if test -n "$JS_SEARCH_LIBS" ; then
AC_MSG_NOTICE([Will search for js (spidermonkey) libraries in $JS_SEARCH_LIBS])
LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -ljs $ADD_PTHREAD_CFLAGS"
- AC_CHECK_LIB(js, JS_NewObject,
+ AC_CHECK_LIB(js, JS_RemoveObjectRoot,
[
JS_LIBS="-L$JS_SEARCH_LIBS -ljs"
MOZLIB=js
],
[
LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
- AC_CHECK_LIB(smjs, JS_NewObject,
+ AC_CHECK_LIB(smjs, JS_RemoveObjectRoot,
[
JS_LIBS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
MOZLIB=smjs
],
[
LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
- AC_CHECK_LIB(mozjs185, JS_NewObject,
+ AC_CHECK_LIB(mozjs185, JS_RemoveObjectRoot,
[
JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
MOZLIB=mozjs185
@@ -1033,44 +1033,44 @@ if test "x$JS_OK" = xyes; then
)
else
LDFLAGS="$LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
- AC_CHECK_LIB(js, JS_NewObject,
+ AC_CHECK_LIB(js, JS_RemoveObjectRoot,
[
MOZLIB=js
JS_LIBS="-ljs"
],
[
- unset ac_cv_lib_js_JS_NewObject
- AC_CHECK_LIB(smjs, JS_NewObject,
+ unset ac_cv_lib_js_JS_RemoveObjectRoot
+ AC_CHECK_LIB(smjs, JS_RemoveObjectRoot,
[
JS_LIBS="-lsmjs"
MOZLIB=smjs
],
[
- unset ac_cv_lib_smjs_JS_NewObject
- AC_CHECK_LIB(mozjs185, JS_NewObject,
+ unset ac_cv_lib_smjs_JS_RemoveObjectRoot
+ AC_CHECK_LIB(mozjs185, JS_RemoveObjectRoot,
[
MOZLIB=mozjs185
JS_LIBS="-lmozjs185"
],
[
LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
- unset ac_cv_lib_js_JS_NewObject
- AC_CHECK_LIB(js, JS_NewObject,
+ unset ac_cv_lib_js_JS_RemoveObjectRoot
+ AC_CHECK_LIB(js, JS_RemoveObjectRoot,
[
JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
MOZLIB=js
],
[
- unset ac_cv_lib_smjs_JS_NewObject
- AC_CHECK_LIB(smjs, JS_NewObject,
+ unset ac_cv_lib_smjs_JS_RemoveObjectRoot
+ AC_CHECK_LIB(smjs, JS_RemoveObjectRoot,
[
JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
MOZLIB=smjs
],
[
LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
- unset ac_cv_lib_mozjs185_JS_NewObject
- AC_CHECK_LIB(mozjs185, JS_NewObject,
+ unset ac_cv_lib_mozjs185_JS_RemoveObjectRoot
+ AC_CHECK_LIB(mozjs185, JS_RemoveObjectRoot,
[
JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
MOZLIB=mozjs185
--
1.7.9.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment