Changeset 2079

Show
Ignore:
Timestamp:
06/06/07 10:31:37
Author:
pvanhoof
Message:

the --with-ssl option

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/docs/building.txt

    r2030 r2079  
    133133        ./autogen.sh --prefix=/opt/tinymail --enable-asyncworker --enable-tests --enable-unit-tests && make && sudo make install 
    134134 
     135SSL support 
     136----------- 
     137If you want to build with support for SSL, you can either choose for Mozilla's NSS or OpenSSL: 
     138 
     139  --with-ssl=nss        Detect NSS and if available, use it 
     140  --with-ssl=nss-must   Require NSS and it not available, fail the build 
     141  --with-ssl=openssl    Detect OpenSSL and if available, use it 
     142  --with-ssl=none       Do NOT detect any SSL, and DON'T use it 
     143 
  • trunk/libtinymail-camel/camel-lite/configure.ac

    r2077 r2079  
    7474  [case "$with_ssl" in 
    7575    nss) ;; 
     76    nss-must) ;; 
    7677    openssl) ;; 
    7778    none) ;; 
     
    8081 
    8182if test x"$with_ssl" != "xnone"; then 
    82   if test x"$with_ssl" == "xnss" -a x"$mozilla_nspr" != "xno" -a x"$mozilla_nss" != "xno"; then 
     83 
     84dnl Mozilla NSS and NSPR support check --with-ssl=nss,nss-must 
     85 
     86  if test x"$with_ssl" == "xnss" -o x"$with_ssl" == "xnss-must"; then 
     87    if test x"$mozilla_nspr" != "xno" -a x"$mozilla_nss" != "xno"; then 
    8388        msg_ssl="yes (Mozilla NSS)" 
    8489        msg_smime="yes (Mozilla NSS)" 
     
    8792        AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) 
    8893        AC_DEFINE(HAVE_OPENSSL,0,[Define if you want to use OpenSSL as SSL library]) 
    89   else 
    90    AC_MSG_CHECKING(for NSPR and NSS) 
    91    AC_MSG_RESULT(no) 
    92    if test x"$with_ssl" == "xopenssl"; then 
     94   else 
     95    if test x"$with_ssl" == "xnss-must"; then 
     96        AC_MSG_ERROR([Mozilla NSS not found and must be installed]) 
     97    fi 
     98   fi 
     99 fi 
     100 
     101dnl OpenSSL support check --with-ssl=openssl 
     102 
     103 if test x"$with_ssl" == "xopenssl"; then 
    93104        AC_CHECK_LIB(crypto, EVP_md5, [ 
    94105                SSL_LIBS="-lcrypto -lssl" 
     
    97108                AC_DEFINE(HAVE_OPENSSL,1,[Define if you want to use OpenSSL as SSL library]) 
    98109        ],,) 
    99    fi 
    100   fi 
     110 fi 
     111 
    101112fi 
    102113