[Pmplib-commits] SF.net SVN: pmplib: [380] trunk/pmplib

[<suc...@us...>]

Revision: 380
          http://svn.sourceforge.net/pmplib/?rev=380&view=rev
Author:   sucknblow
Date:     2007-02-19 14:03:59 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Attempt to work around totally braindead mozilla packaging.

Modified Paths:
--------------
    trunk/pmplib/configure.in
    trunk/pmplib/frontend/easypmp/cui/Makefile.am
    trunk/pmplib/m4/smjs.m4

Modified: trunk/pmplib/configure.in
===================================================================
--- trunk/pmplib/configure.in	2007-02-18 19:07:28 UTC (rev 379)
+++ trunk/pmplib/configure.in	2007-02-19 22:03:59 UTC (rev 380)
@@ -221,6 +221,7 @@
 AC_SUBST(VORBISFILE_LIBS)
 AC_SUBST(JS_CFLAGS)
 AC_SUBST(JS_LIBS)
+AC_SUBST(JS_RPATH)
 
 AM_CONDITIONAL(have_jsapi, test -n "$JS_CFLAGS")
 AM_CONDITIONAL(have_getopt, test "$ac_cv_header_getopt_h" = "yes")

Modified: trunk/pmplib/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-18 19:07:28 UTC (rev 379)
+++ trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-19 22:03:59 UTC (rev 380)
@@ -28,7 +28,7 @@
 
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@
-AM_LDFLAGS = @LDFLAGS@
+AM_LDFLAGS = @LDFLAGS@ ${JS_RPATH}
 
 easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/$(JSPL_DIR)/jspl\""
 

Modified: trunk/pmplib/m4/smjs.m4
===================================================================
--- trunk/pmplib/m4/smjs.m4	2007-02-18 19:07:28 UTC (rev 379)
+++ trunk/pmplib/m4/smjs.m4	2007-02-19 22:03:59 UTC (rev 380)
@@ -35,6 +35,39 @@
 	[#define XP_UNIX])
     ])
 
+# Attempt to workaround totally brain-dead Mozilla packaging...
+m4_define([spidermonkey_rpath],[
+  saved_OPTERR="$OPTERR"
+  OPTERR=0
+  saved_OPTIND="$OPTIND"
+  OPTIND=1
+  saved_HAVE_GETOPTS="$HAVE_GETOPTS"
+  HAVE_GETOPTS=
+  JS_RPATH=
+  if test -n "$BASH_VERSION" -o "$ZSH_VERSION" ; then
+    HAVE_GETOPTS=yes
+  fi
+  if test "$HAVE_GETOPTS" = "yes" ; then
+    while getopts L:l: f `echo $JS_LIBS` ; do
+      case $f in
+        L)
+          if test "$OPTARG" != "/lib" -a "$OPTARG" != "/usr/lib" ; then
+            JS_RPATH="$JS_RPATH -Wl,--rpath \"$OPTARG\""
+          fi
+          ;;
+      esac
+    done
+  else
+    JS_LIBDIR=`echo "$JS_LIBS "| sed 's/.*\(-L\([^" ]\|"[^"]*"\)*\) .*/\1/'`
+    if test "${JS_LIBDIR#-L}" != "${JS_LIBDIR}" ; then
+            JS_RPATH="$JS_RPATH -Wl,--rpath \"${JS_LIBDIR#-L}\""
+    fi
+  fi
+  OPTERR="$saved_OPTERR"
+  OPTIND="$saved_OPTIND"
+  HAVE_GETOPTS="$saved_HAVE_GETOPTS"
+])
+
 m4_define([spidermonkey_checkall],
   [if test x"$JS_CFLAGS" = x; then
       AC_MSG_NOTICE([looking for the Spidermonkey Javascript library in various places.])
@@ -124,6 +157,8 @@
     fi
     AC_SUBST(JS_CFLAGS)
     AC_SUBST(JS_LIBS)
+    spidermonkey_rpath
+    AC_SUBST(JS_RPATH)
 ])
 
 AC_DEFUN([AC_PATH_SPIDERMONKEY],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.