diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 588 |
1 files changed, 188 insertions, 400 deletions
diff --git a/configure.in b/configure.in index 4f01f831ee..17fe4ab90c 100644 --- a/configure.in +++ b/configure.in @@ -3,10 +3,10 @@ AC_INIT(camel) AM_CONFIG_HEADER(config.h) EVOLUTION_MAJOR_VERSION=1 -EVOLUTION_MINOR_VERSION=1 -EVOLUTION_MICRO_VERSION=0 -EVOLUTION_NANO_VERSION=99 -VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION.$EVOLUTION_NANO_VERSION +EVOLUTION_MINOR_VERSION=0 +EVOLUTION_MICRO_VERSION=4 +EVOLUTION_NANO_VERSION=0 +VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION PACKAGE=evolution AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -14,8 +14,8 @@ AC_SUBST(VERSION) AC_CANONICAL_HOST -AC_DEFINE_UNQUOTED(VERSION_COMMENT, "(Preview Release)") - +AC_DEFINE_UNQUOTED(VERSION_COMMENT, "") + AC_DEFUN(EVO_CHECK_LIB, [ dispname="$1" pkgname="$2" @@ -115,22 +115,8 @@ GNOME_INIT() GNOME_COMPILE_WARNINGS GNOME_X_CHECKS EVO_CHECK_LIB(gnome-libs, gnome, 1.2.9) -AC_CHECK_HEADERS(alloca.h) - -dnl check for socklen_t (in Unix98) -AC_MSG_CHECKING(for socklen_t) -AC_TRY_COMPILE([#include <sys/socket.h> -socklen_t x; -],[],[AC_MSG_RESULT(yes)],[ -AC_TRY_COMPILE([#include <sys/socket.h> -int accept (int, struct sockaddr *, size_t *); -],[],[ -AC_MSG_RESULT(size_t) -AC_DEFINE(socklen_t,size_t)], [ -AC_MSG_RESULT(int) -AC_DEFINE(socklen_t,int)])]) - -ALL_LINGUAS="az bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW" + +ALL_LINGUAS="az bg ca da de el en_AU en_GB es fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW" AM_GNOME_GETTEXT localedir='$(prefix)/$(DATADIRNAME)/locale' AC_SUBST(localedir) @@ -265,7 +251,7 @@ AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_ int bufsize=BUFSIZE; int h_errno; - (void)gethostbyname_r ("www.ximian.com", &hent, buffer, bufsize, &h_errno); + (void)gethostbyname_r( "www.ximian.com", &hent, buffer, bufsize, &h_errno); ],[ ac_cv_gethostbyname_r_five_args=yes ],[ @@ -273,43 +259,10 @@ AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_ ]) ])]) -if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then +if test x"$ac_cv_gethostbyname_r_five_args" = xyes ; then AC_DEFINE(GETHOSTBYNAME_R_FIVE_ARGS) fi -dnl ************************************************** -dnl gethostbyaddr_r prototype -dnl ************************************************** - -AC_CHECK_FUNCS(gethostbyaddr_r,[ -AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], ac_cv_gethostbyaddr_r_seven_args, -[ - AC_TRY_COMPILE([ - #include "confdefs.h" - #include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <netdb.h> - - #define BUFSIZE (sizeof(struct hostent)+10) - ],[ - struct hostent hent; - char buffer[BUFSIZE]; - int bufsize=BUFSIZE; - int h_errno; - - (void)gethostbyaddr_r ("www.ximian.com", 14, AF_INET, &hent, buffer, bufsize, &h_errno); - ],[ - ac_cv_gethostbyaddr_r_seven_args=yes - ],[ - ac_cv_gethostbyaddr_r_seven_args=no - ]) -])]) - -if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then - AC_DEFINE(GETHOSTBYADDR_R_SEVEN_ARGS) -fi - dnl *********** dnl * db3 stuff dnl *********** @@ -625,30 +578,6 @@ fi AC_MSG_RESULT($with_broken_spool) -dnl *************************************************************** -dnl Whether to build shlib components (instead of out-of-proc ones) -dnl *************************************************************** - -AC_ARG_ENABLE(shlib-components, - [ --enable-shlib-components Enable building of some of the components as shared libs], - enable_shlib_components=yes,enable_shlib_components=no) - -AM_CONDITIONAL(ENABLE_SHLIB_COMPONENTS, test "x$enable_shlib_components" = "xyes") - -if test "x$enable_shlib_components" = "xyes" ; then - OAF_SHLIB_TYPE="shlib" - OAF_SHLIB_PREFIX="lib" - OAF_SHLIB_SUFFIX=".so" -else - OAF_SHLIB_TYPE="exe" - OAF_SHLIB_PREFIX="" - OAF_SHLIB_SUFFIX="" -fi - -AC_SUBST(OAF_SHLIB_TYPE) -AC_SUBST(OAF_SHLIB_PREFIX) -AC_SUBST(OAF_SHLIB_SUFFIX) - dnl *************** dnl GNOME Libraries dnl *************** @@ -660,14 +589,82 @@ EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0) EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0) EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11) -EVO_CHECK_LIB(GAL, gal, 0.19.99.13) -EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0) -EVO_CHECK_LIB(Libsoup, soup, 0.6) +EVO_CHECK_LIB(GAL, gal, 0.19.2) +EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.0.1) -AM_PATH_GCONF(1.0) -if test "x$GCONF_CFLAGS" = "x" ; then - AC_MSG_ERROR(Evolution requires GConf to be installed) -fi +dnl ************************* +dnl CFLAGS and LIBS and stuff +dnl ************************* +GLIB_CFLAGS="`$GLIB_CONFIG --cflags`" +GLIB_LIBS="`$GLIB_CONFIG --libs`" +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +GAL_CFLAGS="`gnome-config --cflags gal`" +GAL_LIBS="`gnome-config --libs gal`" +AC_SUBST(GAL_CFLAGS) +AC_SUBST(GAL_LIBS) + +BONOBO_CONF_CFLAGS="`gnome-config --cflags bonobo_conf`" +BONOBO_CONF_LIBS="`gnome-config --libs bonobo_conf`" +AC_SUBST(BONOBO_CONF_CFLAGS) +AC_SUBST(BONOBO_CONF_LIBS) + +EXTRA_GNOME_LIBS="`gnome-config --libs libglade gdk_pixbuf libart gnomecanvaspixbuf gnomeui gal` $THREADS_LIBS" +EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf libart gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS" + +AC_SUBST(EXTRA_GNOME_LIBS) +AC_SUBST(EXTRA_GNOME_CFLAGS) + +BONOBO_GNOME_LIBS="`gnome-config --libs oaf bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $OAF_LIBS" +BONOBO_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $OAF_CFLAGS" +AC_SUBST(BONOBO_GNOME_LIBS) +AC_SUBST(BONOBO_GNOME_CFLAGS) + +BONOBO_HTML_GNOME_LIBS="`gnome-config --libs oaf bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS" +BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS" +AC_SUBST(BONOBO_HTML_GNOME_LIBS) +AC_SUBST(BONOBO_HTML_GNOME_CFLAGS) + +GNOME_PRINT_LIBS=`gnome-config --libs print` +GNOME_PRINT_CFLAGS=`gnome-config --cflags print` +AC_SUBST(GNOME_PRINT_LIBS) +AC_SUBST(GNOME_PRINT_CFLAGS) + +BONOBO_CONF_CFLAGS="`gnome-config --cflags bonobo_conf`" +BONOBO_CONF_LIBS="`gnome-config --libs bonobo_conf`" +AC_SUBST(BONOBO_CONF_CFLAGS) +AC_SUBST(BONOBO_CONF_LIBS) + +GTKHTML_CFLAGS="`gnome-config --cflags gtkhtml`" +GTKHTML_LIBS="`gnome-config --libs gtkhtml`" +GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml` +AC_SUBST(GTKHTML_CFLAGS) +AC_SUBST(GTKHTML_LIBS) +AC_SUBST(GTKHTML_DATADIR) + +GNOME_VFS_LIBS="`gnome-config --libs vfs`" +GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`" +AC_SUBST(GNOME_VFS_LIBS) +AC_SUBST(GNOME_VFS_CFLAGS) + +BONOBO_VFS_GNOME_LIBS="`gnome-config --libs oaf bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" +BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags oaf bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" +AC_SUBST(BONOBO_VFS_GNOME_LIBS) +AC_SUBST(BONOBO_VFS_GNOME_CFLAGS) + +CAMEL_CFLAGS="`gnome-config --cflags gal xml` $THREADS_CFLAGS" +CAMEL_LIBS="`gnome-config --libs gal xml` $THREADS_LIBS" +AC_SUBST(CAMEL_CFLAGS) +AC_SUBST(CAMEL_LIBS) + +camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION +AC_SUBST(camel_providerdir) + +MAILER_CFLAGS="`gnome-config --cflags gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_CFLAGS" +MAILER_LIBS="`gnome-config --libs gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_LIBS" +AC_SUBST(MAILER_CFLAGS) +AC_SUBST(MAILER_LIBS) dnl ****************************** dnl Pilot checking @@ -783,8 +780,7 @@ if test x${with_krb4:=no} != xno; then msg_krb4=yes if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then KRB4_CFLAGS="-I$with_krb4/include" - fi - if test -d "$with_krb4/include/kerberosIV"; then + else KRB4_CFLAGS="-I$with_krb4/include/kerberosIV" fi KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4" @@ -826,320 +822,125 @@ dnl dnl The Evolution security extensions are only built if these libraries are found dnl ******************************************************************************** msg_ssl=no - -dnl these 2 enable's are inverses of each other -AC_ARG_ENABLE(nss, [ --enable-nss=[yes,no] Attempt to use Mozilla libnss for SSL support.], - enable_nss="$enableval", enable_nss="yes") - -AC_ARG_ENABLE(openssl, [ --enable-openssl=[yes,no] Attempt to use OpenSSL for SSL support.], - enable_openssl="$enableval", enable_openssl="auto") - -if test "x${enable_openssl}" = "xyes"; then -dnl User wants to override nss with OpenSSL - enable_nss="no" -fi - -if test "x${enable_nss}" = "xyes"; then - AC_ARG_WITH(nspr-includes, [ --with-nspr-includes=PREFIX Location of Mozilla nspr4 includes.], - with_nspr_includes="$withval", with_nspr_includes="/usr/include/nspr") - have_nspr_includes="no" - if test "x${with_nspr_includes}" != "xno"; then - CPPFLAGS_save="$CPPFLAGS" - - AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes) - AC_MSG_RESULT("") - - CPPFLAGS="$CPPFLAGS -I$with_nspr_includes" - AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ]) - CPPFLAGS="$CPPFLAGS_save" - - if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then - have_nspr_includes="yes" - NSPR_CFLAGS="-I$with_nspr_includes" - fi - else - AC_MSG_CHECKING(for Mozilla nspr4 includes) - AC_MSG_RESULT(no) - fi +AC_ARG_WITH(nspr-includes, [ --with-nspr-includes=PREFIX Location of Mozilla nspr4 includes.], + with_nspr_includes="$withval", with_nspr_includes="/usr/include/nspr") +have_nspr_includes="no" +if test "x${with_nspr_includes}" != "xno"; then + CPPFLAGS_save="$CPPFLAGS" - AC_ARG_WITH(nspr-libs, [ --with-nspr-libs=PREFIX Location of Mozilla nspr4 libs.], - with_nspr_libs="$withval") - have_nspr_libs="no" - if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then - CFLAGS_save="$CFLAGS" - LDFLAGS_save="$LDFLAGS" - - nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, - [ - CFLAGS="$CFLAGS $NSPR_CFLAGS" - - if test "x${with_nspr_libs}" != "x"; then - LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs" - else - LDFLAGS="$LDFLAGS $nsprlibs" - fi - - AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no") - CFLAGS="$CFLAGS_save" - LDFLAGS="$LDFLAGS_save" - ]) - if test "x$moz_nspr_libs" != "xno"; then - have_nspr_libs="yes" - NSPR_LDFLAGS="-L$with_nspr_libs $nsprlibs" - else - NSPR_CLFAGS="" - fi - else - AC_MSG_CHECKING(for Mozilla nspr4 libraries) - AC_MSG_RESULT(no) - fi - - AC_ARG_WITH(nss-includes, [ --with-nss-includes=PREFIX Location of Mozilla nss3 includes.], - with_nss_includes="$withval", with_nss_includes="/usr/include/moznss") - if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then - CPPFLAGS_save="$CPPFLAGS" - - AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes) - AC_MSG_RESULT("") - - if test "x${with_nspr_includes}" != "x"; then - CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes" - else - CPPFLAGS="$CPPFLAGS -I$with_nss_includes" - fi + AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes) + AC_MSG_RESULT("") - AC_CHECK_HEADERS(nss.h ssl.h smime.h, - [ have_nss_includes="yes" ], - [ have_nss_includes="no" ]) + CPPFLAGS="$CPPFLAGS -I$with_nspr_includes" + AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ]) + CPPFLAGS="$CPPFLAGS_save" - CPPFLAGS="$CPPFLAGS_save" - - if test "x${have_nss_includes}" = xyes ; then - have_nss_includes="yes" - NSS_CFLAGS="-I$with_nss_includes" - else - NSPR_CFLAGS="" - NSPR_LDFLAGS="" - fi - else - AC_MSG_CHECKING(for Mozilla nss3 includes) - AC_MSG_RESULT(no) + if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then + have_nspr_includes="yes" + NSPR_CFLAGS="-I$with_nspr_includes" fi +else + AC_MSG_CHECKING(for Mozilla nspr4 includes) + AC_MSG_RESULT(no) +fi + +AC_ARG_WITH(nspr-libs, [ --with-nspr-libs=PREFIX Location of Mozilla nspr4 libs.], + with_nspr_libs="$withval") +have_nspr_libs="no" +if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then + CFLAGS_save="$CFLAGS" + LDFLAGS_save="$LDFLAGS" - AC_ARG_WITH(nss-libs, [ --with-nss-libs=PREFIX Location of Mozilla nss3 libs.], - with_nss_libs="$withval") - if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then - LDFLAGS_save="$LDFLAGS" + nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, + [ + CFLAGS="$CFLAGS $NSPR_CFLAGS" - nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - nsslibs="-lssl3 -lsmime3 -lnss3" - AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, - [ - LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -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) - AC_DEFINE(HAVE_SSL) - msg_ssl="yes (Mozilla NSS)" - NSS_LDFLAGS="-L$with_nss_libs $nsslibs" + if test "x${with_nspr_libs}" != "x"; then + LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs" else - NSS_CFLAGS="" - NSPR_CFLAGS="" - NSPR_LDFLAGS="" + LDFLAGS="$LDFLAGS $nsprlibs" fi + + AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no") + CFLAGS="$CFLAGS_save" + LDFLAGS="$LDFLAGS_save" + ]) + if test "x$moz_nspr_libs" != "xno"; then + have_nspr_libs="yes" + NSPR_LDFLAGS="-L$with_nspr_libs $nsprlibs" else - AC_MSG_CHECKING(for Mozilla nss libraries) - AC_MSG_RESULT(no) + NSPR_CLFAGS="" fi +else + AC_MSG_CHECKING(for Mozilla nspr4 libraries) + AC_MSG_RESULT(no) fi -AC_SUBST(NSPR_CFLAGS) -AC_SUBST(NSPR_LDFLAGS) -AC_SUBST(NSS_CFLAGS) -AC_SUBST(NSS_LDFLAGS) +AC_ARG_WITH(nss-includes, [ --with-nss-includes=PREFIX Location of Mozilla nss3 includes.], + with_nss_includes="$withval", with_nss_includes="/usr/include/moznss") +if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then + CPPFLAGS_save="$CPPFLAGS" + + AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes) + AC_MSG_RESULT("") -dnl ****************************** -dnl OpenSSL -dnl ****************************** + if test "x${with_nspr_includes}" != "x"; then + CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes" + else + CPPFLAGS="$CPPFLAGS -I$with_nss_includes" + fi -dnl only continue detecting OpenSSL if we haven't already found all of the -dnl Mozilla libnss includes/libraries and if user actually wants ssl support -if test "$msg_ssl" = "no" -a "x${enable_openssl}" != "xno"; then - AC_ARG_WITH(openssl-includes, [ --with-openssl-includes=PREFIX Location of OpenSSL includes.], - with_openssl_includes="$withval", with_openssl_includes="/usr/include") - have_openssl_includes="no" - if test "x${with_openssl_includes}" != "xno"; then - CPPFLAGS_save="$CPPFLAGS" - - AC_MSG_CHECKING(for OpenSSL includes) - AC_MSG_RESULT("") - - CPPFLAGS="$CPPFLAGS -I$with_openssl_includes" - AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ]) - CPPFLAGS="$CPPFLAGS_save" - - if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then - have_openssl_includes="yes" - OPENSSL_CFLAGS="-I$with_openssl_includes" - else - OPENSSL_CFLAGS="" - fi + AC_CHECK_HEADERS(nss.h ssl.h smime.h, + [ have_nss_includes="yes" ], + [ have_nss_includes="no" ]) + + CPPFLAGS="$CPPFLAGS_save" + + if test "x${have_nss_includes}" = xyes ; then + have_nss_includes="yes" + NSS_CFLAGS="-I$with_nss_includes" else - AC_MSG_CHECKING(for OpenSSL includes) - AC_MSG_RESULT(no) + NSPR_CFLAGS="" + 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.], + with_nss_libs="$withval") +if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then + LDFLAGS_save="$LDFLAGS" - AC_ARG_WITH(openssl-libs, [ --with-openssl-libs=PREFIX Location of OpenSSL libs.], - with_openssl_libs="$withval") - if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then - LDFLAGS_save="$LDFLAGS" - - case $with_openssl_libs in - ""|-L*) ;; - *) with_openssl_libs="-L$with_openssl_libs" ;; - esac - - AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="") - AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs, - [ - LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS" - AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no") - LDFLAGS="$LDFLAGS_save" - ]) - if test "x${openssl_libs}" != "xno"; then - AC_DEFINE(HAVE_OPENSSL) - AC_DEFINE(HAVE_SSL) - msg_ssl="yes (OpenSSL)" - OPENSSL_LDFLAGS="$with_openssl_libs -lssl -lcrypto $DL_LDFLAGS" - else - OPENSSL_CFLAGS="" - OPENSSL_LDFLAGS="" - fi + nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + nsslibs="-lssl3 -lsmime3 -lnss3" + AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, + [ + LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -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) + AC_DEFINE(HAVE_SSL) + msg_ssl="yes (Mozilla NSS)" + NSS_LDFLAGS="-L$with_nss_libs $nsslibs" else - AC_MSG_CHECKING(for OpenSSL libraries) - AC_MSG_RESULT(no) + NSS_CFLAGS="" + NSPR_CFLAGS="" + NSPR_LDFLAGS="" fi else - OPENSSL_CFLAGS="" - OPENSSL_LDFLAGS="" + AC_MSG_CHECKING(for Mozilla nss libraries) + AC_MSG_RESULT(no) fi -AC_SUBST(OPENSSL_CFLAGS) -AC_SUBST(OPENSSL_LDFLAGS) - -dnl ************************* -dnl CFLAGS and LIBS and stuff -dnl ************************* - -AC_DEFUN(EVO_SET_COMPILE_FLAGS, [ - deps="$2" - extra_cflags="$3" - extra_libs="$4" - $1_CFLAGS="`gnome-config --cflags $deps` $extra_cflags" - $1_LIBS="`gnome-config --libs $deps` $extra_libs" -]) - -dnl --- Flags to get all the GNOME stuff - -FULL_GNOME_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs" - -EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) -AC_SUBST(GNOME_FULL_CFLAGS) -AC_SUBST(GNOME_FULL_LIBS) - -dnl -- Find the directory where the GtkHTML editing component has its -dnl IDL files - -GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml` -AC_SUBST(GTKHTML_DATADIR) - -dnl --- Flags for the various libraries we build - -EVO_SET_COMPILE_FLAGS(CAMEL, gal xml, - $THREADS_CFLAGS $KRB4_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $OPENSSL_CFLAGS, - $THREADS_LIBS $KRB4_LDFLAGS $NSPR_LDFLAGS $NSS_LDFLAGS $OPENSSL_LDFLAGS) -AC_SUBST(CAMEL_CFLAGS) -AC_SUBST(CAMEL_LIBS) - -EVO_SET_COMPILE_FLAGS(E_NAME, bonobox gal oaf) -AC_SUBST(E_NAME_CFLAGS) -AC_SUBST(E_NAME_LIBS) - -EVO_SET_COMPILE_FLAGS(E_UTIL, bonobox gal oaf libglade) -AC_SUBST(E_UTIL_CFLAGS) -AC_SUBST(E_UTIL_LIBS) - -EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs) -AC_SUBST(E_WIDGETS_CFLAGS) -AC_SUBST(E_WIDGETS_LIBS) - -EVO_SET_COMPILE_FLAGS(IMPORTERS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs) -AC_SUBST(IMPORTERS_CFLAGS) -AC_SUBST(IMPORTERS_LIBS) - -EVO_SET_COMPILE_FLAGS(LIBIBEX, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs, - $THREADS_CFLAGS, $THREADS_LIBS) -AC_SUBST(LIBIBEX_CFLAGS) -AC_SUBST(LIBIBEX_LIBS) - -EVO_SET_COMPILE_FLAGS(LIBFILTER, bonobo gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade) -AC_SUBST(LIBFILTER_CFLAGS) -AC_SUBST(LIBFILTER_LIBS) - -dnl --- evolution (shell) flags - -EVO_SET_COMPILE_FLAGS(SHELL, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs) -AC_SUBST(SHELL_CFLAGS) -AC_SUBST(SHELL_LIBS) - -dnl --- evolution-addressbook flags - -EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs" - -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS, $PISOCK_CFLAGS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) - -dnl -- evolution-executive-summary flags - -EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, - bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf soup vfs) -AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) -AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) - -dnl --- evolution-calendar flags - -EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs" - -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) -AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -AC_SUBST(EVOLUTION_CALENDAR_LIBS) - -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS, $PISOCK_CFLAGS) -AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) -AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS) - -dnl --- evolution-mail flags - -camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION -AC_SUBST(camel_providerdir) - -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $GCONF_CFLAGS $THREADS_CFLAGS, $GCONF_LIBS $THREADS_LIBS) -AC_SUBST(EVOLUTION_MAIL_CFLAGS) -AC_SUBST(EVOLUTION_MAIL_LIBS) - -dnl -- wombat flags - -EVO_SET_COMPILE_FLAGS(WOMBAT, $FULL_GNOME_DEPS, $LDAP_CFLAGS, $LDAP_LIBS) -AC_SUBST(WOMBAT_CFLAGS) -AC_SUBST(WOMBAT_LIBS) +AC_SUBST(NSPR_CFLAGS) +AC_SUBST(NSPR_LDFLAGS) +AC_SUBST(NSS_CFLAGS) +AC_SUBST(NSS_LDFLAGS) ################################################## # Check for gtk-doc. @@ -1303,7 +1104,6 @@ po/Makefile.in shell/Makefile shell/glade/Makefile shell/importer/Makefile -sounds/Makefile tools/Makefile ui/Makefile views/Makefile @@ -1316,8 +1116,6 @@ widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile wombat/Makefile - -my-evolution/GNOME_Evolution_Summary.oaf.in ]) if test "x$with_sub_version" != "x"; then @@ -1341,26 +1139,16 @@ echo "\ SSL support: $msg_ssl Dot Locking: $msg_dot File Locking: $msg_file - Gtk-doc: $enable_gtk_doc - Shlib components: $enable_shlib_components" + Gtk-doc: $enable_gtk_doc" if test x$enable_gtk_doc = xyes; then echo " - Programming documentation files will be built automatically." + Programming documentation files will be built automatically. +" else echo " Programming documentation files will not be built. You may want to install the gtk-doc package - so that you will get the Evolution Developer's Guide." -fi - -if test "x$enable_shlib_components" = "xyes" ; then - echo " - *** Warning, shlib components are currently broken. - *** Enabling this option will probably cause Evolution to not - *** work correctly. + so that you will get the Evolution Developer's Guide. " -else - echo " -" -fi
\ No newline at end of file +fi |