diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -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 |