Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-pkgconfig.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1435 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1435 byte(s)
-import
1 | niro | 153 | Index: build/autoconf/pkg.m4 |
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/build/autoconf/pkg.m4,v | ||
4 | retrieving revision 1.2 | ||
5 | diff -p -u -1 -2 -r1.2 pkg.m4 | ||
6 | --- build/autoconf/pkg.m4 3 Oct 2002 00:37:11 -0000 1.2 | ||
7 | +++ build/autoconf/pkg.m4 22 Sep 2004 23:00:27 -0000 | ||
8 | @@ -19,25 +19,27 @@ AC_DEFUN(PKG_CHECK_MODULES, [ | ||
9 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
10 | AC_MSG_CHECKING(for $2) | ||
11 | |||
12 | if $PKG_CONFIG --exists "$2" ; then | ||
13 | AC_MSG_RESULT(yes) | ||
14 | succeeded=yes | ||
15 | |||
16 | AC_MSG_CHECKING($1_CFLAGS) | ||
17 | $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` | ||
18 | AC_MSG_RESULT($$1_CFLAGS) | ||
19 | |||
20 | AC_MSG_CHECKING($1_LIBS) | ||
21 | - $1_LIBS=`$PKG_CONFIG --libs "$2"` | ||
22 | + ## don't use --libs since that can do evil things like add | ||
23 | + ## -Wl,--export-dynamic | ||
24 | + $1_LIBS="`$PKG_CONFIG --libs-only-L \"$2\"` `$PKG_CONFIG --libs-only-l \"$2\"`" | ||
25 | AC_MSG_RESULT($$1_LIBS) | ||
26 | else | ||
27 | $1_CFLAGS="" | ||
28 | $1_LIBS="" | ||
29 | ## If we have a custom action on failure, don't print errors, but | ||
30 | ## do set a variable so people can do so. | ||
31 | $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` | ||
32 | ifelse([$4], ,echo $$1_PKG_ERRORS,) | ||
33 | fi | ||
34 | |||
35 | AC_SUBST($1_CFLAGS) | ||
36 | AC_SUBST($1_LIBS) |