dev-java/icedtea/files/icedtea-1.4-xulrunner.patch

   1 --- ./configure.orig    2007-12-20 19:27:31.000000000 +0000
   2 +++ ./configure 2007-12-20 19:29:27.000000000 +0000
   3 @@ -7022,12 +7022,12 @@
   4          pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
   5      else
   6          if test -n "$PKG_CONFIG" && \
   7 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
   8 -  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
   9 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
  10 +  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
  11    ac_status=$?
  12    echo "$as_me:$LINENO: \$? = $ac_status" >&5
  13    (exit $ac_status); }; then
  14 -  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
  15 +  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin" 2>/dev/null`
  16  else
  17    pkg_failed=yes
  18  fi
  19 @@ -7040,12 +7040,12 @@
  20          pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
  21      else
  22          if test -n "$PKG_CONFIG" && \
  23 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
  24 -  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
  25 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
  26 +  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
  27    ac_status=$?
  28    echo "$as_me:$LINENO: \$? = $ac_status" >&5
  29    (exit $ac_status); }; then
  30 -  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
  31 +  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin" 2>/dev/null`
  32  else
  33    pkg_failed=yes
  34  fi
  35 @@ -7064,9 +7064,9 @@
  36          _pkg_short_errors_supported=no
  37  fi
  38          if test $_pkg_short_errors_supported = yes; then
  39 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin"`
  40 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin"`
  41          else
  42 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin"`
  43 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"`
  44          fi
  45         # Put the nasty error message in config.log where it belongs
  46         echo "$MOZILLA_PKG_ERRORS" >&5
  47 @@ -7097,12 +7097,12 @@
  48          pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
  49      else
  50          if test -n "$PKG_CONFIG" && \
  51 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
  52 -  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
  53 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
  54 +  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
  55    ac_status=$?
  56    echo "$as_me:$LINENO: \$? = $ac_status" >&5
  57    (exit $ac_status); }; then
  58 -  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
  59 +  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin firefox-xpcom" 2>/dev/null`
  60  else
  61    pkg_failed=yes
  62  fi
  63 @@ -7115,12 +7115,12 @@
  64          pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
  65      else
  66          if test -n "$PKG_CONFIG" && \
  67 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
  68 -  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
  69 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
  70 +  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
  71    ac_status=$?
  72    echo "$as_me:$LINENO: \$? = $ac_status" >&5
  73    (exit $ac_status); }; then
  74 -  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
  75 +  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin firefox-xpcom" 2>/dev/null`
  76  else
  77    pkg_failed=yes
  78  fi
  79 @@ -7139,9 +7139,9 @@
  80          _pkg_short_errors_supported=no
  81  fi
  82          if test $_pkg_short_errors_supported = yes; then
  83 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
  84 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
  85          else
  86 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
  87 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
  88          fi
  89         # Put the nasty error message in config.log where it belongs
  90         echo "$MOZILLA_PKG_ERRORS" >&5
  91 @@ -7247,12 +7247,12 @@
  92          pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
  93      else
  94          if test -n "$PKG_CONFIG" && \
  95 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
  96 -  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
  97 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
  98 +  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
  99    ac_status=$?
 100    echo "$as_me:$LINENO: \$? = $ac_status" >&5
 101    (exit $ac_status); }; then
 102 -  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
 103 +  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
 104  else
 105    pkg_failed=yes
 106  fi
 107 @@ -7265,12 +7265,12 @@
 108          pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
 109      else
 110          if test -n "$PKG_CONFIG" && \
 111 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
 112 -  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
 113 +    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
 114 +  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
 115    ac_status=$?
 116    echo "$as_me:$LINENO: \$? = $ac_status" >&5
 117    (exit $ac_status); }; then
 118 -  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
 119 +  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
 120  else
 121    pkg_failed=yes
 122  fi
 123 @@ -7289,9 +7289,9 @@
 124          _pkg_short_errors_supported=no
 125  fi
 126          if test $_pkg_short_errors_supported = yes; then
 127 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
 128 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
 129          else
 130 -               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
 131 +               MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
 132          fi
 133         # Put the nasty error message in config.log where it belongs
 134         echo "$MOZILLA_PKG_ERRORS" >&5
 135