gpac-js.patch

   1 --- gpac/configure.orig 2012-06-15 21:26:23.188290228 +0200
   2 +++ gpac/configure      2012-06-15 22:10:36.141512228 +0200
   3 @@ -691,7 +691,7 @@
   4          #dc added
   5      else
   6          #try pkg-config
   7 -        if $pkg_config --exists mozilla-js 2> /dev/null  ; then
   8 +        if $pkg_config --exists nomozilla-js 2> /dev/null  ; then
   9              js_flags=`$pkg_config --cflags mozilla-js`
  10              js_lib_pkg=`$pkg_config --libs mozilla-js`
  11              if $cc -o $TMPO $TMPC $js_flags $js_lib_pkg $LDFLAGS -lpthread 2> /dev/null  ; then
  12 @@ -699,29 +699,13 @@
  13                  js_lib=`$pkg_config --libs mozilla-js`
  14              fi
  15          #try firefox folders (starting at ubuntu 11.10, no pkg-config)
  16 -        elif ls -d /usr/lib/firefox* > /dev/null 2>&1 ; then
  17 -            firefox_version=`cd /usr/lib ; ls -d firefox* | grep -v addons | grep -v devel ; cd - > /dev/null`
  18 -            for i in $firefox_version ; do
  19 -                if test "$has_js" = "no" ; then
  20 -                    js_inc="/usr/include/$i"
  21 -                    js_flags="-DXP_UNIX -I$js_inc"
  22 -                    js_lib="-L/usr/lib/$i/ -lxul -lmozsqlite3 -lmozalloc -lnssutil3 -lnss3 -lnspr4 -lsmime3"
  23 -                    if $cc -o $TMPO $TMPC $js_flags $js_lib 2> /dev/null  ; then
  24 -                        has_js="$i"
  25 -                    elif $cc -o $TMPO $TMPC $js_flags -lnssutil3 $js_lib -lssl3 2> /dev/null  ; then
  26 -                        #firefox 11 compatibility
  27 -                        has_js="$i"
  28 -                        js_lib="-lnssutil3 $js_lib -lssl3"
  29 -                    fi
  30 -                fi
  31 -            done
  32          fi
  33
  34          if test "$has_js" = "no" ; then
  35              #try prefix (DC)
  36              js_inc="$prefix/include/js"
  37              js_flags="-DXP_UNIX -I$prefix/include/js"
  38 -            if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs -lpthread 2> /dev/null  ; then
  39 +            if $cc -o $TMPO $TMPC $js_flags -ljs -lpthread 2> /dev/null  ; then
  40                  has_js="prefix"
  41                  #dc added end
  42              else
  43 @@ -782,7 +766,7 @@
  44          #try prefix (DC)
  45          js_inc="$prefix/include/js"
  46          js_flags="-DXP_UNIX -I$prefix/include/js"
  47 -        if $cc -o $TMPO $TMPC $js_flags -L$prefix/lib -ljs 2> /dev/null  ; then
  48 +        if $cc -o $TMPO $TMPC $js_flags -ljs 2> /dev/null  ; then
  49              has_js="prefix"
  50              #dc added end
  51          else