aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Williams <peterw@ximian.com>2001-07-11 21:53:57 +0800
committerPeter Williams <peterw@src.gnome.org>2001-07-11 21:53:57 +0800
commite09bb584caaef621979759ab92d2cefe41e84d72 (patch)
treec13d3b5a39a7eb6ce97b367556471f6127e80f10
parent0dd6f197758061a2ed2ba8c8dfeaaa7ede818a82 (diff)
downloadgsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar.gz
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar.bz2
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar.lz
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar.xz
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.tar.zst
gsoc2013-evolution-e09bb584caaef621979759ab92d2cefe41e84d72.zip
Fix nss include check to work.
2001-07-10 Peter Williams <peterw@ximian.com> * configure.in (have_nss_includes): Fix nss include check to work. svn path=/trunk/; revision=10997
-rw-r--r--ChangeLog4
-rw-r--r--configure.in10
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 385bfb8399..7c7e89573e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10 Peter Williams <peterw@ximian.com>
+
+ * configure.in (have_nss_includes): Fix nss include check to work.
+
2001-07-11 Not Zed <NotZed@Ximian.com>
* configure.in: Added option --with-broken-spool for solaris mbox
diff --git a/configure.in b/configure.in
index f41a9c332f..22af090e32 100644
--- a/configure.in
+++ b/configure.in
@@ -763,7 +763,6 @@ fi
AC_ARG_WITH(nss-includes, [ --with-nss-includes=PREFIX Location of Mozilla nss3 includes.],
with_nss_includes="$withval", with_nss_includes="/usr/include/mozilla")
-have_nss_includes="no"
if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
CPPFLAGS_save="$CPPFLAGS"
@@ -776,10 +775,13 @@ if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
fi
- AC_CHECK_HEADERS(nss.h ssl.h smime.h, [ moz_nspr_includes="yes" ])
+ AC_CHECK_HEADERS(nss.h ssl.h smime.h,
+ [ have_nss_includes="yes" ],
+ [ have_nss_includes="no" ])
+
CPPFLAGS="$CPPFLAGS_save"
-
- if test "x{$moz_nss_includes}" != "xno" -a "x{$moz_nss_includes}" != "x"; then
+
+ if test "x${have_nss_includes}" = xyes ; then
have_nss_includes="yes"
NSS_CFLAGS="-I$with_nss_includes"
else