Attachment 151180 Details for Bug 234435 – Patch to fix the missing gcj xpcom-include

[patch] Patch to fix the missing gcj xpcom-include

firefox-xpcom.patch (text/plain), 9.16 KB, created by Paul-Erik Törrönen on 2007-03-29 07:14:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul-Erik Törrönen

Created: 2007-03-29 07:14:50 UTC

Size: 9.16 KB

patch

obsolete

>diff -urN gcc-4.1.1-20070105-orig/libjava/classpath/configure gcc-4.1.1-20070105/libjava/classpath/configure
>--- gcc-4.1.1-20070105-orig/libjava/classpath/configure	2006-08-25 14:58:31.000000000 +0300
>+++ gcc-4.1.1-20070105/libjava/classpath/configure	2007-03-27 11:28:58.000000000 +0300
>@@ -10111,7 +10111,7 @@
>   # See if we find them without any special options.
>   # Don't add to $LIBS permanently.
>   ac_save_LIBS=$LIBS
>-  LIBS="-lXt $LIBS"
>+  LIBS="-lX11 $LIBS"
>   cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
> _ACEOF
>@@ -12447,23 +12447,23 @@
>   else
>      PKG_CONFIG_MIN_VERSION=0.9.0
>      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
>-        echo "$as_me:$LINENO: checking for mozilla-plugin" >&5
>-echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6
>+        echo "$as_me:$LINENO: checking for mozilla-plugin mozilla-xpcom" >&5
>+echo $ECHO_N "checking for mozilla-plugin mozilla-xpcom... $ECHO_C" >&6
> 
>-        if $PKG_CONFIG --exists "mozilla-plugin" ; then
>+        if $PKG_CONFIG --exists "mozilla-plugin mozilla-xpcom" ; then
>             echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6
>             succeeded=yes
> 
>             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
> echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
>-            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin"`
>+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin mozilla-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
> echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
> 
>             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
> echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
>-            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin"`
>+            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin mozilla-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
> echo "${ECHO_T}$MOZILLA_LIBS" >&6
>         else
>@@ -12471,7 +12471,7 @@
>             MOZILLA_LIBS=""
>             ## If we have a custom action on failure, don't print errors, but
>             ## do set a variable so people can do so.
>-            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin"`
>+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin mozilla-xpcom"`
> 
>         fi
> 
>@@ -12544,23 +12544,23 @@
>   else
>      PKG_CONFIG_MIN_VERSION=0.9.0
>      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
>-        echo "$as_me:$LINENO: checking for firefox-plugin" >&5
>-echo $ECHO_N "checking for firefox-plugin... $ECHO_C" >&6
>+        echo "$as_me:$LINENO: checking for firefox-plugin firefox-xpcom" >&5
>+echo $ECHO_N "checking for firefox-plugin firefox-xpcom... $ECHO_C" >&6
> 
>-        if $PKG_CONFIG --exists "firefox-plugin" ; then
>+        if $PKG_CONFIG --exists "firefox-plugin firefox-xpcom" ; then
>             echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6
>             succeeded=yes
> 
>             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
> echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
>-            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin"`
>+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
> echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
> 
>             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
> echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
>-            MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin"`
>+            MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
> echo "${ECHO_T}$MOZILLA_LIBS" >&6
>         else
>@@ -12568,7 +12568,7 @@
>             MOZILLA_LIBS=""
>             ## If we have a custom action on failure, don't print errors, but
>             ## do set a variable so people can do so.
>-            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
>+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
> 
>         fi
> 
>@@ -12642,23 +12642,23 @@
>   else
>      PKG_CONFIG_MIN_VERSION=0.9.0
>      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
>-        echo "$as_me:$LINENO: checking for xulrunner-plugin" >&5
>-echo $ECHO_N "checking for xulrunner-plugin... $ECHO_C" >&6
>+        echo "$as_me:$LINENO: checking for xulrunner-plugin xulrunner-xpcom" >&5
>+echo $ECHO_N "checking for xulrunner-plugin xulrunner-xpcom... $ECHO_C" >&6
> 
>-        if $PKG_CONFIG --exists "xulrunner-plugin" ; then
>+        if $PKG_CONFIG --exists "xulrunner-plugin xulrunner-xpcom" ; then
>             echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6
>             succeeded=yes
> 
>             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
> echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
>-            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin"`
>+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin xulrunner-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
> echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
> 
>             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
> echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
>-            MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin"`
>+            MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin xulrunner-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
> echo "${ECHO_T}$MOZILLA_LIBS" >&6
>         else
>@@ -12666,7 +12666,7 @@
>             MOZILLA_LIBS=""
>             ## If we have a custom action on failure, don't print errors, but
>             ## do set a variable so people can do so.
>-            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"`
>+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin xulrunner-xpcom"`
> 
>         fi
> 
>@@ -12740,23 +12740,23 @@
>   else
>      PKG_CONFIG_MIN_VERSION=0.9.0
>      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
>-        echo "$as_me:$LINENO: checking for mozilla-firefox-plugin" >&5
>-echo $ECHO_N "checking for mozilla-firefox-plugin... $ECHO_C" >&6
>+        echo "$as_me:$LINENO: checking for mozilla-firefox-plugin mozilla-firefox-xpcom" >&5
>+echo $ECHO_N "checking for mozilla-firefox-plugin mozilla-firefox-xpcom... $ECHO_C" >&6
> 
>-        if $PKG_CONFIG --exists "mozilla-firefox-plugin" ; then
>+        if $PKG_CONFIG --exists "mozilla-firefox-plugin mozilla-firefox-xpcom" ; then
>             echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6
>             succeeded=yes
> 
>             echo "$as_me:$LINENO: checking MOZILLA_CFLAGS" >&5
> echo $ECHO_N "checking MOZILLA_CFLAGS... $ECHO_C" >&6
>-            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin"`
>+            MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin mozilla-firefox-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_CFLAGS" >&5
> echo "${ECHO_T}$MOZILLA_CFLAGS" >&6
> 
>             echo "$as_me:$LINENO: checking MOZILLA_LIBS" >&5
> echo $ECHO_N "checking MOZILLA_LIBS... $ECHO_C" >&6
>-            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin"`
>+            MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin mozilla-firefox-xpcom"`
>             echo "$as_me:$LINENO: result: $MOZILLA_LIBS" >&5
> echo "${ECHO_T}$MOZILLA_LIBS" >&6
>         else
>@@ -12764,7 +12764,7 @@
>             MOZILLA_LIBS=""
>             ## If we have a custom action on failure, don't print errors, but
>             ## do set a variable so people can do so.
>-            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-firefox-plugin"`
>+            MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
> 
>         fi
> 
>diff -urN gcc-4.1.1-20070105-orig/libjava/classpath/configure.ac gcc-4.1.1-20070105/libjava/classpath/configure.ac
>--- gcc-4.1.1-20070105-orig/libjava/classpath/configure.ac	2006-08-25 15:03:47.000000000 +0300
>+++ gcc-4.1.1-20070105/libjava/classpath/configure.ac	2007-03-27 11:28:44.000000000 +0300
>@@ -541,15 +541,15 @@
> 
>   dnl Check for plugin support headers and libraries.
>   if test "x${COMPILE_PLUGIN}" = xyes; then
>-    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>+    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin mozilla-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>     if test "x${MOZILLA_FOUND}" = xno; then
>-      PKG_CHECK_MODULES(MOZILLA, firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>+      PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>     fi
>     if test "x${MOZILLA_FOUND}" = xno; then
>-      PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>+      PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin xulrunner-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>     fi
>     if test "x${MOZILLA_FOUND}" = xno; then
>-      PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>+      PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin mozilla-firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
>     fi
>     PKG_CHECK_MODULES(GLIB, glib-2.0)
>

Actions: View | Diff

Attachments on bug 234435: 151180