← Back to branch summary

~ubuntu-branches/ubuntu/wily/mediatomb/wily

« back to all changes in this revision

Viewing changes to debian/patches/0007_libmozjs185_support.patch

  • Committer: Package Import Robot
  • Author(s): Logan Rosen
  • Date: 2013-12-28 23:22:35 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20131228232235-uhxpo82dnqa3cw95
Tags: 0.12.1-5ubuntu1
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0007_libmozjs185_support.patch
 
1
Description: Add detection for libmozjs185.so during the configure script.
 
2
 Use this library instead of the one provided by iceweasel. This enables js
 
3
 support in mediatomb.
 
4
Bug-Debian: http://bugs.debian.org/631046
 
5
Author: Miguel A. Colón Vélez <debian.micove@gmail.com>
 
6
Last-Update: 2012-03-03
 
7
 
 
8
--- mediatomb-0.12.1.orig/configure.ac
 
9
+++ mediatomb-0.12.1/configure.ac
 
10
@@ -1036,6 +1036,13 @@ if test "x$JS_OK" = xyes; then
 
11
                 ],
 
12
                 [
 
13
                     unset ac_cv_lib_smjs_JS_NewObject
 
14
+                    AC_CHECK_LIB(mozjs185, JS_NewObject,
 
15
+                        [
 
16
+                            MOZLIB=mozjs185
 
17
+                            JS_LIBS="-lmozjs185"
 
18
+                        ],
 
19
+                        [
 
20
+                    unset ac_cv_lib_mozjs185_JS_NewObject
 
21
                     AC_CHECK_LIB(mozjs, JS_NewObject,
 
22
                         [
 
23
                             MOZLIB=mozjs
 
24
@@ -1057,6 +1064,13 @@ if test "x$JS_OK" = xyes; then
 
25
                                             MOZLIB=smjs
 
26
                                         ],
 
27
                                         [
 
28
+                                    unset ac_cv_lib_mozjs185_JS_NewObject
 
29
+                                    AC_CHECK_LIB(mozjs185, JS_NewObject,
 
30
+                                        [
 
31
+                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
 
32
+                                            MOZLIB=mozjs185
 
33
+                                        ],
 
34
+                                        [
 
35
                                             LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
 
36
                                             unset ac_cv_lib_mozjs_JS_NewObject
 
37
                                             AC_CHECK_LIB(mozjs, JS_NewObject,
 
38
@@ -1071,10 +1085,14 @@ if test "x$JS_OK" = xyes; then
 
39
                                             )
 
40
                                         ]
 
41
                                     )
 
42
+                                        ]
 
43
+                                    )
 
44
                                 ]
 
45
                             )
 
46
                         ]
 
47
                     )
 
48
+                        ]
 
49
+                    )
 
50
                 ]
 
51
             )
 
52
        ]