r2337 - in packages/libjavascript-perl/trunk: . debian

[Niko Tyni]

Author: ntyni-guest
Date: 2006-03-13 20:09:26 +0000 (Mon, 13 Mar 2006)
New Revision: 2337

Modified:
   packages/libjavascript-perl/trunk/JavaScript.xs
   packages/libjavascript-perl/trunk/Makefile.PL
   packages/libjavascript-perl/trunk/debian/changelog
Log:
Fixes for migration to libmozjs. (I'll send them upstream as well.)


Modified: packages/libjavascript-perl/trunk/JavaScript.xs
===================================================================
--- packages/libjavascript-perl/trunk/JavaScript.xs	2006-03-13 19:26:44 UTC (rev 2336)
+++ packages/libjavascript-perl/trunk/JavaScript.xs	2006-03-13 20:09:26 UTC (rev 2337)
@@ -4,8 +4,12 @@
 #ifdef INCLUDES_IN_SMJS
 #include <smjs/jsapi.h>
 #else
+#ifdef INCLUDES_IN_MOZJS
+#include <mozjs/jsapi.h>
+#else
 #include <jsapi.h>
 #endif
+#endif
 #include <malloc.h>
 
 #define _IS_UNDEF(a) (SvANY(a) == SvANY(&PL_sv_undef))

Modified: packages/libjavascript-perl/trunk/Makefile.PL
===================================================================
--- packages/libjavascript-perl/trunk/Makefile.PL	2006-03-13 19:26:44 UTC (rev 2336)
+++ packages/libjavascript-perl/trunk/Makefile.PL	2006-03-13 20:09:26 UTC (rev 2337)
@@ -22,6 +22,11 @@
     $define .= " -DINCLUDES_IN_SMJS"
 }
 
+#test for debian type include files in mozjs...
+if (-f "/usr/include/mozjs/jsapi.h" or -f "/usr/local/include/mozjs/jsapi.h") {
+    $define .= " -DINCLUDES_IN_MOZJS"
+}
+
 if($ENV{JS_THREADSAFE}) {
   $define .= " -DJS_THREADSAFE";
 }
@@ -33,6 +38,10 @@
 if (-f "/usr/lib/libsmjs.so" or -f "/usr/local/lib/libsmjs.so") {
     $lib = "-lsmjs";
 }
+# ditto for libmozjs
+if (-f "/usr/lib/libmozjs.so" or -f "/usr/local/lib/libmozjs.so") {
+    $lib = "-lmozjs";
+}
 
 
 WriteMakefile(

Modified: packages/libjavascript-perl/trunk/debian/changelog
===================================================================
--- packages/libjavascript-perl/trunk/debian/changelog	2006-03-13 19:26:44 UTC (rev 2336)
+++ packages/libjavascript-perl/trunk/debian/changelog	2006-03-13 20:09:26 UTC (rev 2337)
@@ -1,3 +1,12 @@
+libjavascript-perl (0.55-3) unstable; urgency=low
+
+  * Migrate from libsmjs to libmozjs. (Closes: #353891)
+    + build-depend on libmozjs-dev
+    + Makefile.PL, Javascript.xs: use jsapi.h in /usr/include/mozjs
+    + Makefile.PL: test for libmozjs.so 
+
+ -- Niko Tyni <ntyni at iki.fi>  Mon, 13 Mar 2006 22:02:43 +0200
+
 libjavascript-perl (0.55-2) unstable; urgency=low
 
   * Build with JS_THREADSAFE=1. (Closes: #301390)