← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/firefox-3.5/jaunty-updates

« back to all changes in this revision

Viewing changes to debian/patches/nspr_flags_by_pkg_config_hack.patch

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-08-03 16:58:27 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20090803165827-0wfpdyemelbcm1k4
Tags: 3.5.2+nobinonly-0ubuntu0.9.04.1
* security/stability update v3.5.2 (FIREFOX_3_5_2_RELEASE)
* Refresh diverged patch
  - update debian/patches/nspr_flags_by_pkg_config_hack.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/nspr_flags_by_pkg_config_hack.patch
2
2
 configure.in                   |   21 +++-----------
3
3
 
4
4
---
5
 
 configure.in |   19 +++++--------------
6
 
 1 file changed, 5 insertions(+), 14 deletions(-)
 
5
 configure.in |   18 ++++--------------
 
6
 1 file changed, 4 insertions(+), 14 deletions(-)
7
7
 
8
8
Index: mozilla/configure.in
9
9
===================================================================
10
10
--- mozilla.orig/configure.in
11
11
+++ mozilla/configure.in
12
 
@@ -4018,29 +4018,30 @@
13
 
     AC_TRY_COMPILE([#include "prlog.h"],
14
 
                 [#ifndef PR_STATIC_ASSERT
15
 
                  #error PR_STATIC_ASSERT not defined
16
 
                  #endif],
17
 
                 [MOZ_NATIVE_NSPR=1],
18
 
                 AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
19
 
     CFLAGS=$_SAVE_CFLAGS
20
 
 else
21
 
-    NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
22
 
+    NSPR_CFLAGS=`pkg-config mozilla-nspr --cflags`
23
 
+    NSPR_LIBS=`pkg-config mozilla-nspr --libs`
24
 
     if test "$OS_ARCH" = "WINCE"; then
25
 
         NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
26
 
         NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
 
12
@@ -4112,18 +4112,18 @@
27
13
     elif test "$OS_ARCH" = "WINNT"; then
28
14
         NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
29
15
         if test -n "$GNU_CC"; then
32
18
             NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
33
19
         fi
34
20
     else
35
 
-        NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
 
21
-        NSPR_CFLAGS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
 
22
-        NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
 
23
+        NSPR_CFLAGS=`pkg-config mozilla-nspr --cflags`
36
24
+        NSPR_LIBS=`pkg-config mozilla-nspr --libs`
37
25
     fi
38
26
 fi
42
30
 dnl = use the one in the source tree (mozilla/security/nss)
43
31
 dnl ========================================================
44
32
 
45
 
@@ -7916,17 +7917,19 @@
 
33
@@ -8105,17 +8105,19 @@
46
34
 AC_SUBST(MOZ_ZLIB_CFLAGS)
47
35
 AC_SUBST(MOZ_ZLIB_LIBS)
48
36
 AC_SUBST(MOZ_BZ2_CFLAGS)
60
48
 AC_SUBST(NSS_LIBS)
61
49
 AC_SUBST(NSS_DEP_LIBS)
62
50
 AC_SUBST(MOZ_NATIVE_NSS)
 
51
 AC_SUBST(NSS_DISABLE_DBM)
63
52
 
64
 
 AC_SUBST(CFLAGS)
65
 
@@ -8265,28 +8268,16 @@
 
53
@@ -8458,28 +8460,16 @@
66
54
     fi
67
55
     if test -n "$USE_ARM_KUSER"; then
68
56
         ac_configure_args="$ac_configure_args --with-arm-kuser"