]>
Commit | Line | Data |
---|---|---|
4b2af69a MT |
1 | --- a/bmozilla/nsprpub/config/nspr-config-pc.in.x123 2005-05-11 02:53:41.000000000 +0200 |
2 | +++ b/mozilla/nsprpub/config/nspr-config-pc.in 2006-05-24 20:52:12.000000000 +0200 | |
3 | @@ -98,7 +98,7 @@ | |
4 | includedir=@includedir@ | |
5 | fi | |
6 | if test -z "$libdir"; then | |
7 | - libdir=@libdir@ | |
8 | + libdir=`pkg-config --variable=libdir nspr` | |
9 | fi | |
10 | ||
11 | if test "$echo_prefix" = "yes"; then | |
12 | @@ -132,12 +132,12 @@ | |
13 | if test -n "$lib_nspr"; then | |
14 | libdirs="$libdirs -lnspr${major_version}" | |
15 | fi | |
16 | - os_ldflags="@LDFLAGS@" | |
17 | + os_ldflags=`pkg-config --variable=ldflags nspr` | |
18 | for i in $os_ldflags ; do | |
19 | if echo $i | grep \^-L >/dev/null; then | |
20 | libdirs="$libdirs $i" | |
21 | fi | |
22 | done | |
23 | - echo $libdirs @OS_LIBS@ | |
24 | + echo $libdirs `pkg-config --variable=os_libs nspr` | |
25 | fi | |
26 | ||
27 | --- a/mozilla/nsprpub/configure.in.x123 2006-05-24 20:52:12.000000000 +0200 | |
28 | +++ b/mozilla/nsprpub/configure.in 2006-05-24 20:53:53.000000000 +0200 | |
29 | @@ -2667,6 +2667,8 @@ | |
30 | config/nsprincl.mk | |
31 | config/nsprincl.sh | |
32 | config/nspr-config | |
33 | +config/nspr-config-pc | |
34 | +config/nspr-config-vars | |
35 | lib/Makefile | |
36 | lib/ds/Makefile | |
37 | lib/libc/Makefile | |
38 | --- a/mozilla/nsprpub/configure.x123 2006-05-24 20:52:12.000000000 +0200 | |
39 | +++ b/mozilla/nsprpub/configure 2006-05-24 20:54:05.000000000 +0200 | |
40 | @@ -5899,6 +5899,8 @@ | |
41 | config/nsprincl.mk | |
42 | config/nsprincl.sh | |
43 | config/nspr-config | |
44 | +config/nspr-config-pc | |
45 | +config/nspr-config-vars | |
46 | lib/Makefile | |
47 | lib/ds/Makefile | |
48 | lib/libc/Makefile |