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"
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
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`
19 @@ -7040,12 +7040,12 @@
20 pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
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
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`
36 _pkg_short_errors_supported=no
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"`
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"`
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"
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
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`
63 @@ -7115,12 +7115,12 @@
64 pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
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
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`
80 _pkg_short_errors_supported=no
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"`
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"`
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"
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
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`
107 @@ -7265,12 +7265,12 @@
108 pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
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
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`
123 @@ -7289,9 +7289,9 @@
124 _pkg_short_errors_supported=no
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"`
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"`
133 # Put the nasty error message in config.log where it belongs
134 echo "$MOZILLA_PKG_ERRORS" >&5