Added directions on how to build with SSL support.

2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>

	* README: Added directions on how to build with SSL support.

	* configure.in: Updated the checks for NSS and NSPR

svn path=/trunk/; revision=8773

3 files changed, 54 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 1954cc8247..0fd7e0d2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* README: Added directions on how to build with SSL support.
+
+	* configure.in: Updated the checks for NSS and NSPR
+
 2001-03-16  Jakub Steiner <jimmac@ximian.com>
 
 	* art/48_import.png: for the import druid
diff --git a/README b/README
index 1ad194a189..810cc4a0cc 100644
--- a/README
+++ b/README
@@ -165,6 +165,15 @@ make
 make install
 
 
+If you want support SSL (and someday S/MIME), you will also need libnspr4 and
+libnss3 which can be found at http://www.mozilla.org.
+
+Once you have libnspr4 and libnss3 (and their respective includes) installed,
+in your evolution source dir do:
+./autogen.sh --prefix=<evo-prefix> --with-nspr-includes=<nspr-includes-prefix>
+--with-nspr-libs=<nspr-libs-prefix> --with-nss-includes=<nss-includes-prefix>
+--with-nss-libs=<nss-libs-prefix>
+
 
 The layout of the source tree is:
 
diff --git a/configure.in b/configure.in
index 56c148e7ae..ff416a9a2b 100644
--- a/configure.in
+++ b/configure.in
@@ -591,26 +591,24 @@ AC_SUBST(KRB4_CFLAGS)
 AC_SUBST(KRB4_LDFLAGS)
 
 
-dnl ====================================
+dnl ===============================================================================
 dnl = security extension support (SSL and S/MIME)
 dnl =
-dnl = The following voodoo does detection of mozilla libraries (nspr and nss) needed by
-dnl = Camel (SSL) and Evolution (S/MIME).
+dnl = The following voodoo does detection of mozilla libraries (nspr and nss) 
+dnl = needed by Camel (SSL) and Evolution (S/MIME).
 dnl =
 dnl = The Evolution security extensions are only built if these libraries are found
-dnl ====================================
-with_nspr_includes=/usr/include/mozilla
-AC_ARG_WITH(nspr-includes, [  --with-nspr-includes=PREFIX     Location of Mozilla nspr4 libs.])
+dnl ===============================================================================
+AC_ARG_WITH(nspr-includes, [  --with-nspr-includes=PREFIX     Location of Mozilla nspr4 includes.],
+	with_nspr_includes="$withval", with_nspr_includes="/usr/include/mozilla")
 have_nspr_includes="no"
 if test "x${with_nspr_includes}" != "xno"; then
-	CFLAGS_save="$CFLAGS"
-	
-	AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes/mozilla)
+	AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
 	AC_MSG_RESULT("")
-	CFLAGS="$CFLAGS -I$with_nspr_includes"
-	AC_CHECK_HEADERS(prinit.h prio.h, [ moz_nspr_includes="yes" ])
-	CFLAGS="$CFLAGS_save"
 	
+	HEADERS="$with_nspr_includes/nspr.h $with_nspr_includes/prio.h"
+	AC_CHECK_FILES($HEADERS, [ moz_nspr_includes="yes" ])
+		
 	if test "x{$moz_nspr_includes}" != "xno"; then
 		have_nspr_includes="yes"
 		NSPR_CFLAGS="-I$with_nspr_includes"
@@ -620,8 +618,8 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-with_nspr_libs=/usr/lib/mozilla
-AC_ARG_WITH(nspr-libs, [  --with-nspr-libs=PREFIX     Location of Mozilla nspr4 libs.])
+AC_ARG_WITH(nspr-libs, [  --with-nspr-libs=PREFIX     Location of Mozilla nspr4 libs.],
+	with_nspr_libs="$withval", with_nspr_libs="/usr/lib/mozilla")
 have_nspr_libs="no"
 if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
 	CFLAGS_save="$CFLAGS"
@@ -647,25 +645,47 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_ARG_WITH(nss, [  --with-nss=PREFIX     	Location of Mozilla nss3 libs/includes.])
+AC_ARG_WITH(nss-includes, [  --with-nss-includes=PREFIX     Location of Mozilla nss3 includes.])
+have_nss_includes="no"
+if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
+	AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
+	AC_MSG_RESULT("")
+	
+	include_path=$with_nss_includes
+	HEADERS="$with_nss_includes/nss.h $with_nss_includes/ssl.h $with_nss_includes/smime.h"
+	AC_CHECK_FILES($HEADERS, [ moz_nspr_includes="yes" ])
+	
+	if test "x{$moz_nss_includes}" != "xno"; then
+		have_nss_includes="yes"
+		NSS_CFLAGS="-I$with_nss_includes"
+	else
+		NSPR_CLFAGS=""
+		NSPR_LDFLAGS=""
+	fi
+else
+	AC_MSG_CHECKING(for Mozilla nss3 includes)
+	AC_MSG_RESULT(no)
+fi
+
+AC_ARG_WITH(nss-libs, [  --with-nss-libs=PREFIX     	Location of Mozilla nss3 libs/includes.])
 msg_nss="no"
-if test "x${with_nss}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
+if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
 	LDFLAGS_save="$LDFLAGS"
 	
 	nsprlibs="-lnspr4"
 	nsslibs="-lnss3 -lnssckbi -lssl3 -lsmime3"
 	AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
 	[
-		LDFLAGS="$LDFLAGS -L$with_nss/lib $nsslibs"
+		LDFLAGS="$LDFLAGS -L$with_nss_libs $nsslibs"
 		AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")
 		LDFLAGS="$LDFLAGS_save"
 	])
 	if test "$moz_nss_libs" != no; then
 		AC_DEFINE(HAVE_NSS)
 		msg_nss="yes"
-		NSS_CFLAGS="-I$with_nss/include"
-		NSS_LDFLAGS="-L$with_nss/lib $nsslibs"
+		NSS_LDFLAGS="-L$with_nss_libs $nsslibs"
 	else
+		NSS_CFAGS=""
 		NSPR_CFLAGS=""
 		NSPR_LDFLAGS=""
 	fi