mediatomb/tonewjs.patch

   1 diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in
   2 --- mediatomb-0.12.1-back/build/Makefile.in.tonewjs     2010-04-08 00:40:15.000000000 +0200
   3 +++ mediatomb-0.12.1-back/build/Makefile.in     2011-04-19 17:17:01.343509944 +0200
   4 @@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@
   5  CXX = @CXX@
   6  CXXCPP = @CXXCPP@
   7  CXXDEPMODE = @CXXDEPMODE@
   8 -CXXFLAGS = @CXXFLAGS@
   9 +CXXFLAGS = -fpermissive @CXXFLAGS@
  10  CYGPATH_W = @CYGPATH_W@
  11  DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
  12  DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
  13 diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc
  14 --- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs        2011-04-18 13:10:48.000000000 +0200
  15 +++ mediatomb-0.12.1-back/src/scripting/import_script.cc        2011-04-18 13:29:36.000000000 +0200
  16 @@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime>
  17      try
  18      {
  19          load(scriptPath);
  20 -        root = JS_NewScriptObject(cx, script);
  21 -        JS_AddNamedRoot(cx, &root, "ImportScript");
  22 +        root = JS_NewObject(cx, NULL, script, NULL);
  23 +        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
  24      }
  25      catch (Exception ex)
  26      {
  27 @@ -117,7 +117,7 @@ ImportScript::~ImportScript()
  28  #endif
  29
  30      if (root)
  31 -        JS_RemoveRoot(cx, &root);
  32 +        JS_RemoveObjectRoot(cx, &root);
  33
  34  #ifdef JS_THREADSAFE
  35      JS_EndRequest(cx);
  36 diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc
  37 --- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200
  38 +++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200
  39 @@ -49,7 +49,7 @@ using namespace zmm;
  40  extern "C" {
  41
  42  JSBool
  43 -js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
  44 +js_print(JSContext *cx, uintN argc, jsval *argv)
  45  {
  46      uintN i;
  47      JSString *str;
  48 @@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u
  49          if (!str)
  50              return JS_TRUE;
  51          argv[i] = STRING_TO_JSVAL(str);
  52 -        log_js("%s\n", JS_GetStringBytes(str));
  53 +        char * log_str = JS_EncodeString(cx, str);
  54 +        log_js("%s\n", log_str);
  55 +        JS_free(cx, log_str);
  56      }
  57      return JS_TRUE;
  58  }
  59
  60  JSBool
  61 -js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
  62 +js_copyObject(JSContext *cx, uintN argc, jsval *argv)
  63  {
  64      jsval arg;
  65      JSObject *js_cds_obj;
  66      JSObject *js_cds_clone_obj;
  67
  68 -    Script *self = (Script *)JS_GetPrivate(cx, obj);
  69 +    Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
  70
  71      try
  72      {
  73 @@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o
  74
  75          self->cdsObject2jsObject(cds_obj, js_cds_clone_obj);
  76
  77 -        *rval = OBJECT_TO_JSVAL(js_cds_clone_obj);
  78 +        JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj));
  79
  80          return JS_TRUE;
  81
  82 @@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o
  83  }
  84
  85  JSBool
  86 -js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
  87 +js_addCdsObject(JSContext *cx, uintN argc, jsval *argv)
  88  {
  89      try
  90      {
  91 @@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject
  92          Ref<StringConverter> p2i;
  93          Ref<StringConverter> i2i;
  94
  95 -        Script *self = (Script *)JS_GetPrivate(cx, obj);
  96 +        Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
  97
  98          if (self == NULL)
  99          {
 100 @@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject
 101          if (!str)
 102              path = _("/");
 103          else
 104 -            path = JS_GetStringBytes(str);
 105 +            path = JS_EncodeString(cx, str);
 106
 107          JSString *cont = JS_ValueToString(cx, argv[2]);
 108          if (cont)
 109          {
 110 -            containerclass = JS_GetStringBytes(cont);
 111 +            containerclass = JS_EncodeString(cx, cont);
 112              if (!string_ok(containerclass) || containerclass == "undefined")
 113                  containerclass = nil;
 114          }
 115
 116          if (self->whoami() == S_PLAYLIST)
 117 -            js_orig_obj = self->getObjectProperty(obj, _("playlist"));
 118 +            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist"));
 119          else if (self->whoami() == S_IMPORT)
 120 -            js_orig_obj = self->getObjectProperty(obj, _("orig"));
 121 +            js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig"));
 122
 123          if (js_orig_obj == NULL)
 124          {
 125 @@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject
 126          JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length());
 127          if (!str2)
 128              return JS_TRUE;
 129 -        *rval = STRING_TO_JSVAL(str2);
 130 -
 131 +        JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
 132          return JS_TRUE;
 133      }
 134      catch (ServerShutdownException se)
 135 @@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject
 136      return JS_TRUE;
 137  }
 138
 139 -static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr)
 140 +static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr)
 141  {
 142      try
 143      {
 144 @@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS
 145          {
 146              str = JS_ValueToString(cx, argv[0]);
 147              if (str)
 148 -                result = JS_GetStringBytes(str);
 149 +                result = JS_EncodeString(cx, str);
 150          }
 151
 152          if (result != nil)
 153 @@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS
 154              JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length());
 155              if (!str2)
 156                  return JS_TRUE;
 157 -            *rval = STRING_TO_JSVAL(str2);
 158 +            JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2));
 159          }
 160      }
 161      catch (ServerShutdownException se)
 162 @@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS
 163  }
 164
 165
 166 -JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 167 +JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv)
 168  {
 169 -     return convert_charset_generic(cx, obj, argc, argv, rval, F2I);
 170 +     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I);
 171  }
 172
 173 -JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 174 +JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv)
 175  {
 176 -     return convert_charset_generic(cx, obj, argc, argv, rval, M2I);
 177 -}
 178 +     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); }
 179
 180 -JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 181 +JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv)
 182  {
 183 -     return convert_charset_generic(cx, obj, argc, argv, rval, P2I);
 184 +     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I);
 185  }
 186
 187 -JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 188 +JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv)
 189  {
 190 -     return convert_charset_generic(cx, obj, argc, argv, rval, J2I);
 191 +     return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I);
 192  }
 193
 194  } // extern "C"
 195 diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h
 196 --- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs  2010-03-25 15:58:05.000000000 +0100
 197 +++ mediatomb-0.12.1-back/src/scripting/js_functions.h  2011-04-18 13:59:29.000000000 +0200
 198 @@ -40,18 +40,18 @@
 199  extern "C" {
 200
 201  /// \brief Log output.
 202 -JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 203 +JSBool js_print(JSContext *cx, uintN argc, jsval *argv);
 204
 205  /// \brief Adds an object to the database.
 206 -JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 207 +JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv);
 208
 209  /// \brief Makes a copy of an CDS object.
 210 -JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 211 +JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv);
 212
 213 -JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 214 -JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 215 -JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 216 -JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
 217 +JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv);
 218 +JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv);
 219 +JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv);
 220 +JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv);
 221
 222  } // extern "C"
 223
 224 diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc
 225 --- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs       2011-04-18 13:34:14.000000000 +0200
 226 +++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc       2011-04-18 13:51:59.000000000 +0200
 227 @@ -46,9 +46,9 @@ using namespace zmm;
 228  extern "C" {
 229
 230  static JSBool
 231 -js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 232 +js_readln(JSContext *cx, uintN argc, jsval *argv)
 233  {
 234 -    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj);
 235 +    PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv));
 236
 237      String line;
 238
 239 @@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj,
 240
 241      JSString *jsline = JS_NewStringCopyZ(cx, line.c_str());
 242
 243 -    *rval = STRING_TO_JSVAL(jsline);
 244 +    JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline));
 245
 246      return JS_TRUE;
 247  }
 248 @@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri
 249
 250          String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT);
 251          load(scriptPath);
 252 -        root = JS_NewScriptObject(cx, script);
 253 -        JS_AddNamedRoot(cx, &root, "PlaylistScript");
 254 +        root = JS_NewObject(cx, NULL, script, NULL);
 255 +        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
 256      }
 257      catch (Exception ex)
 258      {
 259 @@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr
 260  #endif
 261
 262      if (root)
 263 -        JS_RemoveRoot(cx, &root);
 264 +        JS_RemoveObjectRoot(cx, &root);
 265
 266  #ifdef JS_THREADSAFE
 267      JS_EndRequest(cx);
 268 diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc
 269 --- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs       2011-04-18 13:53:07.000000000 +0200
 270 +++ mediatomb-0.12.1-back/src/scripting/script.cc       2011-04-19 18:26:34.460338804 +0200
 271 @@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj
 272      str = JS_ValueToString(cx, val);
 273      if (! str)
 274          return nil;
 275 -    return JS_GetStringBytes(str);
 276 +    return JS_EncodeString(cx, str);
 277  }
 278
 279  int Script::getBoolProperty(JSObject *obj, String name)
 280 @@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function
 281          try
 282          {
 283              common_script = _load(common_scr_path);
 284 -            common_root = JS_NewScriptObject(cx, common_script);
 285 -            JS_AddNamedRoot(cx, &common_root, "common-script");
 286 +            common_root = JS_NewObject(cx, NULL, common_script, NULL);
 287 +            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
 288              _execute(common_script);
 289          }
 290          catch (Exception e)
 291          {
 292              if (common_root)
 293 -                JS_RemoveRoot(cx, &common_root);
 294 +                JS_RemoveObjectRoot(cx, &common_root);
 295
 296              log_js("Unable to load %s: %s\n", common_scr_path.c_str(),
 297                      e.getMessage().c_str());
 298 @@ -460,7 +460,7 @@ Script::~Script()
 299      JS_BeginRequest(cx);
 300  #endif
 301      if (common_root)
 302 -        JS_RemoveRoot(cx, &common_root);
 303 +        JS_RemoveObjectRoot(cx, &common_root);
 304
 305  /*
 306   * scripts are unrooted and will be cleaned up by GC
 307 @@ -504,11 +504,11 @@ void Script::initGlobalObject()
 308      static JSClass global_class =
 309      {
 310          "global",                                   /* name */
 311 -        JSCLASS_HAS_PRIVATE,                        /* flags */
 312 +        JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */
 313          JS_PropertyStub,                            /* add property */
 314          JS_PropertyStub,                            /* del property */
 315          JS_PropertyStub,                            /* get property */
 316 -        JS_PropertyStub,                            /* set property */
 317 +        JS_StrictPropertyStub,                      /* set property */
 318          JS_EnumerateStandardClasses,                /* enumerate */
 319          JS_ResolveStub,                             /* resolve */
 320          JS_ConvertStub,                             /* convert */
 321 @@ -517,7 +517,7 @@ void Script::initGlobalObject()
 322      };
 323
 324      /* create the global object here */
 325 -    glob = JS_NewObject(cx, &global_class, NULL, NULL);
 326 +    glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
 327      if (! glob)
 328          throw _Exception(_("Scripting: could not initialize glboal class"));
 329
 330 @@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS
 331          throw _Exception(_("Scripting: JS_DefineFunctions failed"));
 332  }
 333
 334 -JSScript *Script::_load(zmm::String scriptPath)
 335 +JSObject *Script::_load(zmm::String scriptPath)
 336  {
 337      if (glob == NULL)
 338          initGlobalObject();
 339
 340 -    JSScript *scr;
 341 +    JSObject *scr;
 342
 343      String scriptText = read_text_file(scriptPath);
 344
 345 @@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri
 346
 347  void Script::load(zmm::String scriptPath)
 348  {
 349 -    if (script)
 350 -        JS_DestroyScript(cx, script);
 351 -
 352      script = _load((scriptPath));
 353  }
 354
 355
 356 -void Script::_execute(JSScript *scr)
 357 +void Script::_execute(JSObject *scr)
 358  {
 359      jsval ret_val;
 360
 361 @@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
 362      JSObject *js_meta = getObjectProperty(js, _("meta"));
 363      if (js_meta)
 364      {
 365 -        JS_AddNamedRoot(cx, &js_meta, "meta");
 366 +        JS_AddNamedObjectRoot(cx, &js_meta, "meta");
 367          /// \todo: only metadata enumerated in MT_KEYS is taken
 368          for (int i = 0; i < M_MAX; i++)
 369          {
 370 @@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec
 371                  }
 372              }
 373          }
 374 -        JS_RemoveRoot(cx, &js_meta);
 375 +        JS_RemoveObjectRoot(cx, &js_meta);
 376      }
 377
 378      // stuff that has not been exported to js
 379 diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h
 380 --- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs        2011-04-18 12:56:14.000000000 +0200
 381 +++ mediatomb-0.12.1-back/src/scripting/script.h        2011-04-18 12:56:51.000000000 +0200
 382 @@ -66,8 +66,8 @@ public:
 383      JSRuntime *rt;
 384      JSContext *cx;
 385      JSObject  *glob;
 386 -    JSScript *script;
 387 -    JSScript *common_script;
 388 +    JSObject  *script;
 389 +    JSObject  *common_script;
 390
 391  public:
 392      Script(zmm::Ref<Runtime> runtime);
 393 @@ -115,8 +115,8 @@ private:
 394      JSObject *common_root;
 395
 396      void initGlobalObject();
 397 -    JSScript *_load(zmm::String scriptPath);
 398 -    void _execute(JSScript *scr);
 399 +    JSObject *_load(zmm::String scriptPath);
 400 +    void _execute(JSObject *scr);
 401      zmm::Ref<StringConverter> _p2i;
 402      zmm::Ref<StringConverter> _j2i;
 403      zmm::Ref<StringConverter> _f2i;
 404 --- mediatomb-0.12.1/configure.tonewjs  2011-07-04 20:20:00.290227110 +1200
 405 +++ mediatomb-0.12.1/configure  2011-07-04 20:20:28.186894644 +1200
 406 @@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
 407
 408  else
 409
 410 -                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
 411 -                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 412 -$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
 413 -if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 414 +                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS"
 415 +                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
 416 +$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
 417 +if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
 418    $as_echo_n "(cached) " >&6
 419  else
 420    ac_check_lib_save_LIBS=$LIBS
 421 -LIBS="-lmozjs  $LIBS"
 422 +LIBS="-lmozjs185  $LIBS"
 423  cat >conftest.$ac_ext <<_ACEOF
 424  /* confdefs.h.  */
 425  _ACEOF
 426 @@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5
 427          test "$cross_compiling" = yes ||
 428          $as_test_x conftest$ac_exeext
 429         }; then
 430 -  ac_cv_lib_mozjs_JS_NewObject=yes
 431 +  ac_cv_lib_mozjs185_JS_NewObject=yes
 432  else
 433    $as_echo "$as_me: failed program was:" >&5
 434  sed 's/^/| /' conftest.$ac_ext >&5
 435
 436 -       ac_cv_lib_mozjs_JS_NewObject=no
 437 +       ac_cv_lib_mozjs185_JS_NewObject=no
 438  fi
 439
 440  rm -rf conftest.dSYM
 441 @@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj
 442        conftest$ac_exeext conftest.$ac_ext
 443  LIBS=$ac_check_lib_save_LIBS
 444  fi
 445 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 446 -$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
 447 -if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 448 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
 449 +$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
 450 +if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
 451
 452 -                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
 453 -                                    MOZLIB=mozjs
 454 +                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185"
 455 +                                    MOZLIB=mozjs185
 456
 457  else
 458
 459 @@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
 460  else
 461
 462                      unset ac_cv_lib_smjs_JS_NewObject
 463 -                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 464 -$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
 465 -if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 466 +                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
 467 +$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
 468 +if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
 469    $as_echo_n "(cached) " >&6
 470  else
 471    ac_check_lib_save_LIBS=$LIBS
 472 -LIBS="-lmozjs  $LIBS"
 473 +LIBS="-lmozjs185  $LIBS"
 474  cat >conftest.$ac_ext <<_ACEOF
 475  /* confdefs.h.  */
 476  _ACEOF
 477 @@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5
 478          test "$cross_compiling" = yes ||
 479          $as_test_x conftest$ac_exeext
 480         }; then
 481 -  ac_cv_lib_mozjs_JS_NewObject=yes
 482 +  ac_cv_lib_mozjs185_JS_NewObject=yes
 483  else
 484    $as_echo "$as_me: failed program was:" >&5
 485  sed 's/^/| /' conftest.$ac_ext >&5
 486
 487 -       ac_cv_lib_mozjs_JS_NewObject=no
 488 +       ac_cv_lib_mozjs185_JS_NewObject=no
 489  fi
 490
 491  rm -rf conftest.dSYM
 492 @@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj
 493        conftest$ac_exeext conftest.$ac_ext
 494  LIBS=$ac_check_lib_save_LIBS
 495  fi
 496 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 497 -$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
 498 -if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 499 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
 500 +$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
 501 +if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
 502
 503 -                            MOZLIB=mozjs
 504 -                            JS_LIBS="-lmozjs"
 505 +                            MOZLIB=mozjs185
 506 +                            JS_LIBS="-lmozjs185"
 507
 508  else
 509
 510 @@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject"
 511
 512  else
 513
 514 -                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
 515 -                                            unset ac_cv_lib_mozjs_JS_NewObject
 516 -                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 517 -$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
 518 -if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 519 +                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185"
 520 +                                            unset ac_cv_lib_mozjs185_JS_NewObject
 521 +                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5
 522 +$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; }
 523 +if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then
 524    $as_echo_n "(cached) " >&6
 525  else
 526    ac_check_lib_save_LIBS=$LIBS
 527 -LIBS="-lmozjs  $LIBS"
 528 +LIBS="-lmozjs185  $LIBS"
 529  cat >conftest.$ac_ext <<_ACEOF
 530  /* confdefs.h.  */
 531  _ACEOF
 532 @@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5
 533          test "$cross_compiling" = yes ||
 534          $as_test_x conftest$ac_exeext
 535         }; then
 536 -  ac_cv_lib_mozjs_JS_NewObject=yes
 537 +  ac_cv_lib_mozjs185_JS_NewObject=yes
 538  else
 539    $as_echo "$as_me: failed program was:" >&5
 540  sed 's/^/| /' conftest.$ac_ext >&5
 541
 542 -       ac_cv_lib_mozjs_JS_NewObject=no
 543 +       ac_cv_lib_mozjs185_JS_NewObject=no
 544  fi
 545
 546  rm -rf conftest.dSYM
 547 @@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj
 548        conftest$ac_exeext conftest.$ac_ext
 549  LIBS=$ac_check_lib_save_LIBS
 550  fi
 551 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 552 -$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
 553 -if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 554 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5
 555 +$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; }
 556 +if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then
 557
 558 -                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
 559 -                                                    MOZLIB=mozjs
 560 +                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
 561 +                                                    MOZLIB=mozjs185
 562
 563  else
 564