| blob | 339f499d665d7e3eb983a9b0e137bfd123e8a372 |
1 diff -ru instantbird-0.3a2-src.orig/configure.in instantbird-0.3a2-src/configure.in
2 --- instantbird-0.3a2-src.orig/configure.in 2011-05-24 22:16:18.000000000 -0400
3 +++ instantbird-0.3a2-src/configure.in 2011-05-24 22:21:49.000000000 -0400
4 @@ -4277,7 +4277,7 @@
5 if test -n "$MOZ_NATIVE_NSS"; then
6 NSS_LIBS="$NSS_LIBS -lcrmf"
7 else
8 - NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
9 + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
10 NSS_DEP_LIBS="\
11 \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
12 \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \
13 diff -ru instantbird-0.3a2-src.orig/mozilla/configure.in instantbird-0.3a2-src/mozilla/configure.in
14 --- instantbird-0.3a2-src.orig/mozilla/configure.in 2011-05-24 22:17:28.000000000 -0400
15 +++ instantbird-0.3a2-src/mozilla/configure.in 2011-05-24 22:22:26.000000000 -0400
16 @@ -4784,7 +4784,7 @@
17 if test -n "$MOZ_NATIVE_NSS"; then
18 NSS_LIBS="$NSS_LIBS -lcrmf"
19 else
20 - NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
21 + NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
22 NSS_DEP_LIBS="\
23 \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \
24 \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \
25 diff -ru instantbird-0.3a2-src.orig/purple/libpurple/Makefile.in instantbird-0.3a2-src/purple/libpurple/Makefile.in
26 --- instantbird-0.3a2-src.orig/purple/libpurple/Makefile.in 2011-05-24 22:19:16.000000000 -0400
27 +++ instantbird-0.3a2-src/purple/libpurple/Makefile.in 2011-05-24 22:22:47.000000000 -0400
28 @@ -51,7 +51,7 @@
29 VISIBILITY_FLAGS=
31 ifneq (,$(filter-out WINNT WINCE Darwin,$(OS_ARCH)))
32 -LOCAL_INCLUDES = $(GLIB_CFLAGS) -I/usr/include/libxml2/ -I/usr/local/include/libxml2/
33 +LOCAL_INCLUDES = $(NSS_CFLAGS) $(GLIB_CFLAGS) -I/usr/include/libxml2/ -I/usr/local/include/libxml2/
34 else
35 LOCAL_INCLUDES = -I$(DIST)/include/glib