diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 772 |
1 files changed, 397 insertions, 375 deletions
diff --git a/configure.in b/configure.in index f7397a39c5..6ed91eaddf 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,56 @@ # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) +AC_INIT(camel) +AM_CONFIG_HEADER(config.h) + +if test -f libversit/CVS/Repository; then + case `cat libversit/CVS/Repository` in + gnome-pim*) + echo "" + echo "ERROR: CVS working directory is out of date" + echo "Please do:" + echo " rm -rf libversit" + echo " cvs update -d libversit" + echo " automake libversit/Makefile" + echo "and try again. We apologize for the inconvenience" + exit 1 + ;; + esac +fi -AC_INIT(evolution, 1.3.0.99, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) -AC_CONFIG_SRCDIR(README) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +EVOLUTION_MAJOR_VERSION=1 +EVOLUTION_MINOR_VERSION=2 +EVOLUTION_MICRO_VERSION=2 +EVOLUTION_NANO_VERSION=0 +VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION +PACKAGE=evolution -AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE($PACKAGE, $VERSION) +AC_SUBST(VERSION) AC_CANONICAL_HOST -AC_DEFINE_UNQUOTED(VERSION_COMMENT, "(Preview Release)") + +AC_DEFINE_UNQUOTED(VERSION_COMMENT, "") + +SCROLLKEEPER_REQUIRED=0.1.4 +AC_SUBST(SCROLLKEEPER_REQUIRED) + +dnl Check for scrollkeeper +AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +if test x$SCROLLKEEPER_CONFIG = xno; then + AC_MSG_ERROR(Couldn't find scrollkeeper-config -- please install the scrollkeeper package) +fi +SCROLLKEEPER_LOCALSTATE_DIR=`scrollkeeper-config --pkglocalstatedir` +AC_SUBST(SCROLLKEEPER_LOCALSTATE_DIR) + +dnl Test whether jw is installed +AC_PATH_PROG(JW,jw,no) +if test x$JW = xno; then + HAVE_JW="no" +else + HAVE_JW="yes" +fi +AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") +AC_SUBST(HAVE_JW) dnl Initialize maintainer mode AM_MAINTAINER_MODE @@ -29,33 +71,17 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -dnl Test whether jw is installed -AC_PATH_PROG(JW,jw,no) -if test x$JW = xno; then - HAVE_JW="no" -else - HAVE_JW="yes" -fi -AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes") -AC_SUBST(HAVE_JW) - -dnl I18N stuff -AC_PROG_INTLTOOL - -ALL_LINGUAS="am az bg ca cs da de el en_AU en_GB es et eu fi ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk vi zh_CN zh_TW" -AM_GLIB_GNU_GETTEXT - -GETTEXT_PACKAGE=evolution-1.4 -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") - -localedir='$(prefix)/$(DATADIRNAME)/locale' -AC_SUBST(localedir) +dnl Initialize xml-i18n-tools +AM_PROG_XML_I18N_TOOLS dnl Initialize libtool AM_PROG_LIBTOOL -dnl alloca() +AM_ACLOCAL_INCLUDE(macros) +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) @@ -71,6 +97,11 @@ 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 vi zh_CN zh_TW" +AM_GNOME_GETTEXT +localedir='$(prefix)/$(DATADIRNAME)/locale' +AC_SUBST(localedir) + dnl dnl Purify support dnl @@ -440,33 +471,33 @@ else fi AM_CONDITIONAL(ENABLE_NNTP, test x$enable_nntp = xyes) - dnl ************************************************** dnl * Posix thread support dnl ************************************************** -dnl GLIB_CONFIG=${GLIB_CONFIG-glib-config} -dnl GNOME_PTHREAD_CHECK +dnl Hah! Threads are no longer an option +dnl AC_ARG_WITH(threads, [ --with-threads Include thread support],[ +dnl FIXME: support more thread types, pth at least -dnl if test "x$PTHREAD_LIB" = "x" ; then -dnl AC_MSG_ERROR([POSIX threads are currently required for Evolution]) -dnl fi +GLIB_CONFIG=${GLIB_CONFIG-glib-config} +GNOME_PTHREAD_CHECK + +if test "x$PTHREAD_LIB" = "x" ; then + AC_MSG_ERROR([POSIX threads are currently required for Evolution]) +fi dnl dnl Notice that this is a hack, and we wont be able to use this forever, but dnl at least for some time dnl -EVO_PTHREAD_CHECK - -THREADS_LIBS="$PTHREAD_LIB" -THREADS_CFLAGS="$PTHREAD_CFLAGS" +THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`" +THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`" AC_SUBST(THREADS_LIBS) AC_SUBST(THREADS_CFLAGS) AC_DEFINE(ENABLE_THREADS) - dnl ************************************************** dnl * File locking dnl ************************************************** @@ -494,7 +525,6 @@ else fi fi - dnl ************************************************** dnl * sendmail operation dnl ************************************************** @@ -513,25 +543,53 @@ 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) -dnl ********* -dnl Libraries -dnl ********* +AM_CONDITIONAL(ENABLE_SHLIB_COMPONENTS, test "x$enable_shlib_components" = "xyes") -dnl EVO_CHECK_LIB(GAL, gal, 0.21) -PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.0) +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 *************** +EVO_CHECK_LIB(Bonobo, bonobox, 1.0.3) +EVO_CHECK_LIB(OAF, oaf, 0.6.10) +EVO_CHECK_LIB(libglade, libglade, 0.14) +EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, gnomecanvaspixbuf, 0.18.0) +EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0.5) +EVO_CHECK_LIB(libxml, xml, 1.8.17, 2.0) +EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11) + +EVO_CHECK_LIB(GAL, gal, 0.22) +PKG_CHECK_MODULES(GTKHTML, gtkhtml-1.1 >= 1.1.7) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) -GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.0` +GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir gtkhtml-1.1` AC_SUBST(GTKHTML_DATADIR) +EVO_CHECK_LIB(Libsoup, soup, 0.7) -dnl PKG_CHECK_MODULES(SOUP, soup-2.0) -dnl (from the libsoup module in GNOME CVS) - -dnl AM_PATH_GCONF(1.0,,,gconf gconf-gtk) -dnl if test "x$GCONF_CFLAGS" = "x" ; then -dnl AC_MSG_ERROR(Evolution requires GConf to be installed) -dnl fi +AM_PATH_GCONF(1.0,,,gconf gconf-gtk) +if test "x$GCONF_CFLAGS" = "x" ; then + AC_MSG_ERROR(Evolution requires GConf to be installed) +fi dnl ****************************** dnl Pilot checking @@ -539,12 +597,12 @@ dnl ****************************** AC_ARG_ENABLE(pilot-conduits, [ --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no) if test "x$enable_pilot_conduits" = "xyes"; then - PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0) + GNOME_PILOT_CHECK CFLAGS_save="$CFLAGS" - CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" + CFLAGS="$CFLAGS $PISOCK_CFLAGS" LDFLAGS_save="$LDFLAGS" - LDFLAGS="$LDFLAGS $GNOME_PILOT_LIBS" + LDFLAGS="$LDFLAGS $PISOCK_LIBS" AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([ @@ -559,7 +617,7 @@ int main (int argc, char **argv) char *pstring; if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1) - exit (1); + exit (1); exit (0); } @@ -582,34 +640,27 @@ fi dnl ******** dnl Kerberos dnl ******** -AC_ARG_WITH(krb5, [ --with-krb5=PREFIX Location of Kerberos 5 libs/includes], with_krb5="$withval", with_krb5="no") -AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Location of Kerberos 4 libs/includes], with_krb4="$withval", with_krb4="no") - -msg_krb5="no" -if test "$x{with_krb5}" != "xno"; then +AC_ARG_WITH(krb5, [ --with-krb5=PREFIX Location of Kerberos 5 libs/includes]) +AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Location of Kerberos 4 libs/includes]) +msg_krb5=no +if test ${with_krb5:=no} != no; then LDFLAGS_save="$LDFLAGS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" - heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" + + mitlibs="-lkrb5 -lk5crypto -lcom_err" + heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken" AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5, [ LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs" AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs", [ LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $heimlibs" - AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5="no") + AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5=no) ]) LDFLAGS="$LDFLAGS_save" ]) - if test "$ac_cv_lib_kerberos5" != "no"; then + if test "$ac_cv_lib_kerberos5" != no; then AC_DEFINE(HAVE_KRB5) - if test "$ac_cv_lib_kerberos5" == "$mitlibs"; then - AC_DEFINE(HAVE_MIT_KRB5) - msg_krb5="yes (MIT)" - else - AC_DEFINE(HAVE_HEIMDAL_KRB5) - msg_krb5="yes (Heimdal)" - fi + msg_krb5=yes KRB5_CFLAGS="-I$with_krb5/include/krb5" KRB5_LDFLAGS="-L$with_krb5/lib $ac_cv_lib_kerberos5" fi @@ -618,13 +669,13 @@ else AC_MSG_RESULT($with_krb5) fi -msg_krb4="no" -if test "x${with_krb4}" != "xno"; then +msg_krb4=no +if test x${with_krb4:=no} != xno; then LDFLAGS_save="$LDFLAGS" AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4, [ - ac_cv_lib_kerberos4="no" - + ac_cv_lib_kerberos4=no + case $ac_cv_lib_kerberos5 in *k5crypto*) # Look for MIT krb5 compat krb4 @@ -632,16 +683,16 @@ if test "x${with_krb4}" != "xno"; then AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb4 -ldes425 $KRB5_LDFLAGS") ;; esac - - if test "$ac_cv_lib_kerberos4" = "no"; then + + if test "$ac_cv_lib_kerberos4" = no; then # Look for KTH krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb -lcrypto -lcom_err -lroken" AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken") fi - if test "$ac_cv_lib_kerberos4" = "no"; then + if test "$ac_cv_lib_kerberos4" = no; then # Look for old MIT krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb" - AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb", + AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4=-lkrb, [ LDFLAGS="$LDFLAGS -ldes" AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes") @@ -649,17 +700,17 @@ if test "x${with_krb4}" != "xno"; then fi ]) LDFLAGS="$LDFLAGS_save" - if test "$ac_cv_lib_kerberos4" != "no"; then + if test "$ac_cv_lib_kerberos4" != no; then AC_DEFINE(HAVE_KRB4) - msg_krb4="yes" + 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 - KRB4_CFLAGS="-I$with_krb4/include/kerberosIV" + KRB4_CFLAGS="$KRB4_CFLAGS -I$with_krb4/include/kerberosIV" fi KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4" - + CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $KRB4_CFLAGS" AC_TRY_COMPILE([#include "krb.h" @@ -696,7 +747,7 @@ dnl needed by Camel (SSL and S/MIME). dnl dnl The Evolution security extensions are only built if these libraries are found dnl ******************************************************************************** -msg_ssl="no" +msg_ssl=no dnl these 2 enable's are inverses of each other AC_ARG_ENABLE(nss, [ --enable-nss=[yes,no,static] Attempt to use Mozilla libnss for SSL support.], @@ -711,203 +762,169 @@ dnl User wants to override nss with OpenSSL AC_MSG_WARN([OpenSSL enabled, disabling NSS.]) fi -AC_ARG_WITH(nspr-includes, [ --with-nspr-includes=PREFIX Location of Mozilla nspr4 includes.], - with_nspr_includes="$withval") - -AC_ARG_WITH(nspr-libs, [ --with-nspr-libs=PREFIX Location of Mozilla nspr4 libs.], - with_nspr_libs="$withval") - -AC_ARG_WITH(nss-includes, [ --with-nss-includes=PREFIX Location of Mozilla nss3 includes.], - with_nss_includes="$withval") - -AC_ARG_WITH(nss-libs, [ --with-nss-libs=PREFIX Location of Mozilla nss3 libs.], - with_nss_libs="$withval") - if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then - if test -n "${with_nspr_includes}" || test -n "${with_nspr_libs}" || test -n "${with_nss_includes}" || test -n "${with_nss_libs}" || test "x${enable_nss}" = "xstatic"; then -dnl If the user specifies --with-foo or --enable-nss=static, then we have to do this manually - check_manually="yes" + AC_ARG_WITH(nspr-includes, [ --with-nspr-includes=PREFIX Location of NSPR header files.], + 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 - check_manually="no" + AC_MSG_CHECKING(for Mozilla nspr4 includes) + AC_MSG_RESULT(no) fi - if test "x${check_manually}" = "xno"; then - PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") - if test "x${have_nss}" = "xyes"; then - msg_ssl="yes (Mozilla NSS)" - mozilla_nspr="mozilla-nspr" - mozilla_nss="mozilla-nss" - AC_DEFINE(HAVE_NSS) - AC_DEFINE(HAVE_SSL) - MANUAL_NSPR_CFLAGS="" - MANUAL_NSPR_LIBS="" - MANUAL_NSS_CFLAGS="" - MANUAL_NSS_LIBS="" + 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" + + if test "$enable_nss" = "static"; then + if test -z "${with_nspr_libs}"; then + AC_MSG_ERROR([Static linkage requested, but path to nspr libraries not set] + [Please specify the path to libnspr4.a] + [Example: --with-nspr-libs=/usr/lib]) + else + nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" + fi else - check_manually="yes" + nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" fi - fi - - if test "x${check_manually}" = "xyes"; then - mozilla_nss="" - 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" - MANUAL_NSPR_CFLAGS="-I$with_nspr_includes" + + AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, + [ + LIBS_save="$LIBS" + CFLAGS="$CFLAGS $NSPR_CFLAGS" + + if test "x${with_nspr_libs}" != "x"; then + LIBS="$nsprlibs" + LDFLAGS="$LDFLAGS -L$with_nspr_libs" + else + LIBS="$nsprlibs" + LDFLAGS="$LDFLAGS" fi + + AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no") + CFLAGS="$CFLAGS_save" + LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_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 nspr4 includes) - AC_MSG_RESULT(no) + 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 NSS3 headers.], + 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" - have_nspr_libs="no" - if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then - CFLAGS_save="$CFLAGS" - LDFLAGS_save="$LDFLAGS" - - if test "$enable_nss" = "static"; then - if test -z "${with_nspr_libs}"; then - AC_MSG_ERROR([Static linkage requested, but path to nspr libraries not set.] -[Please specify the path to libnspr4.a] -[Example: --with-nspr-libs=/usr/lib]) - else - nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" - fi - else - nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" - fi - - AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs, - [ - LIBS_save="$LIBS" - CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS" - - if test "x${with_nspr_libs}" != "x"; then - LIBS="$nsprlibs" - LDFLAGS="$LDFLAGS -L$with_nspr_libs" - else - LIBS="$nsprlibs" - LDFLAGS="$LDFLAGS" - fi - - AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no") - CFLAGS="$CFLAGS_save" - LDFLAGS="$LDFLAGS_save" - LIBS="$LIBS_save" - ]) - if test "x$moz_nspr_libs" != "xno"; then - have_nspr_libs="yes" - MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs" - else - MANUAL_NSPR_CLFAGS="" - fi - else - AC_MSG_CHECKING(for Mozilla nspr4 libraries) - AC_MSG_RESULT(no) + 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_CHECK_HEADERS(nss.h ssl.h smime.h, + [ have_nss_includes="yes" ], + [ have_nss_includes="no" ]) + + CPPFLAGS="$CPPFLAGS_save" - 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_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" - MANUAL_NSS_CFLAGS="-I$with_nss_includes" - else - MANUAL_NSPR_CFLAGS="" - MANUAL_NSPR_LIBS="" - fi + if test "x${have_nss_includes}" = xyes ; then + have_nss_includes="yes" + NSS_CFLAGS="-I$with_nss_includes" else - AC_MSG_CHECKING(for Mozilla nss3 includes) - AC_MSG_RESULT(no) + NSPR_CFLAGS="" + NSPR_LDFLAGS="" fi - - if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then - LDFLAGS_save="$LDFLAGS" - - if test "$enable_nss" = "static"; then - if test -z "${with_nss_libs}"; then - AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set.] -[Please specify the path to libnss3.a] -[Example: --with-nspr-libs=/usr/lib/mozilla]) - else - nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a" - case "$host" in - *solaris*) - nsslibs="$nsslibs $with_nss_libs/libfreebl.a" - ;; - esac - fi - else - nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" - fi - - AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, - [ - LIBS_save="$LIBS" + 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" + + if test "$enable_nss" = "static"; then + if test -z "${with_nss_libs}"; then + AC_MSG_ERROR([Static linkage requested, but path to nss libraries not set] + [Please specify the path to libnss3.a] + [Example: --with-nspr-libs=/usr/lib/mozilla]) + else + nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a" + case "$host" in + *solaris*) + nsslibs="$nsslibs $with_nss_libs/libfreebl.a" + ;; + esac + fi + else + nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" + fi + + AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs, + [ + LIBS_save="$LIBS" + LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" + LIBS="$nsslibs $nsprlibs" + AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no") + if test "$moz_nss_libs" = no; then + nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" - LIBS="$nsslibs $nsprlibs" - AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no") - if test "$moz_nss_libs" = no; then - nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3" - 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") - fi - LDFLAGS="$LDFLAGS_save" - LIBS="$LIBS_save" - ]) - if test "$moz_nss_libs" != no; then - AC_DEFINE(HAVE_NSS) - AC_DEFINE(HAVE_SSL) - if test "$enable_nss" = "static"; then - msg_ssl="yes (Mozilla NSS:static)" - else - msg_ssl="yes (Mozilla NSS)" - fi # static_nss - MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs" - else - MANUAL_NSS_CFLAGS="" - MANUAL_NSPR_CFLAGS="" - MANUAL_NSPR_LIBS="" + AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no") fi + LDFLAGS="$LDFLAGS_save" + LIBS="$LIBS_save" + ]) + if test "$moz_nss_libs" != no; then + AC_DEFINE(HAVE_NSS) + AC_DEFINE(HAVE_SSL) + if test "$enable_nss" = "static"; then + msg_ssl="yes (Mozilla NSS:static)" + else + msg_ssl="yes (Mozilla NSS)" + fi # static_nss + NSS_LDFLAGS="-L$with_nss_libs $nsslibs" else - AC_MSG_CHECKING(for Mozilla nss libraries) - AC_MSG_RESULT(no) + NSS_CFLAGS="" + NSPR_CFLAGS="" + NSPR_LDFLAGS="" fi - - MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS" - MANUAL_NSS_LIBS="$MANUAL_NSPR_LIBS $MANUAL_NSS_LIBS" + else + AC_MSG_CHECKING(for Mozilla nss libraries) + AC_MSG_RESULT(no) fi fi -AC_SUBST(MANUAL_NSPR_CFLAGS) -AC_SUBST(MANUAL_NSPR_LIBS) -AC_SUBST(MANUAL_NSS_CFLAGS) -AC_SUBST(MANUAL_NSS_LIBS) +AC_SUBST(NSPR_CFLAGS) +AC_SUBST(NSPR_LDFLAGS) +AC_SUBST(NSS_CFLAGS) +AC_SUBST(NSS_LDFLAGS) dnl ****************** dnl CDE dtappintegrate @@ -930,11 +947,29 @@ AC_MSG_RESULT([$DTAPPINTEGRATE]) AC_SUBST(DTAPPINTEGRATE) AM_CONDITIONAL(HAVE_DTAPPINTEGRATE, test "x$DTAPPINTEGRATE" != "xno") +dnl ***************** +dnl killall or pkill? +dnl ***************** + +AC_MSG_CHECKING(for command to kill processes) + +if test `uname -s` = "SunOS" ; then + KILL_PROCESS_CMD="pkill"; +else + KILL_PROCESS_CMD="killall"; +fi + +KILL_PROCESS_CMD=`which $KILL_PROCESS_CMD` +if test -z "$KILL_PROCESS_CMD" ; then + AC_MSG_RESULT(none) +else + AC_MSG_RESULT($KILL_PROCESS_CMD) + AC_DEFINE_UNQUOTED(KILL_PROCESS_CMD, "$KILL_PROCESS_CMD") +fi + dnl **************************************************** dnl GNOME_PREFIX is is needed by shell/evolution-nognome dnl **************************************************** -dnl -dnl FIXME this doesn't work with GNOME 2. GNOME_PREFIX="`gnome-config --prefix`" AC_SUBST(GNOME_PREFIX) @@ -1012,147 +1047,117 @@ dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* -AM_PATH_ORBIT2 - -AC_MSG_CHECKING(for CORBA include paths) -IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0` -AC_MSG_RESULT($IDL_INCLUDES) -AC_SUBST(IDL_INCLUDES) - -AM_PATH_GLIB_2_0 - dnl Utility macro to set compiler flags for a specific lib. AC_DEFUN(EVO_SET_COMPILE_FLAGS, [ deps="$2" extra_cflags="$3" extra_libs="$4" - PKG_CHECK_MODULES(EVOLUTION, $deps) - $1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags" - $1_LIBS="$EVOLUTION_LIBS $extra_libs" + $1_CFLAGS="\$(WERROR) `gnome-config --cflags $deps` $extra_cflags" + $1_LIBS="`gnome-config --libs $deps` $extra_libs" ]) dnl --- Flags to get all the GNOME stuff -dnl --- We require at least this version of GAL. -GAL_VERSION=0.0.9.99 -AC_SUBST(GAL_VERSION) - -FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 gal-2.0 >= $GAL_VERSION" +FULL_GNOME_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs" -EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) +EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) AC_SUBST(GNOME_FULL_CFLAGS) AC_SUBST(GNOME_FULL_LIBS) dnl --- Flags for the various libraries we build -EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gal-2.0 >= $GAL_VERSION $mozilla_nss, - $THREADS_CFLAGS $KRB4_CFLAGS $MANUAL_NSS_CFLAGS $OPENSSL_CFLAGS, - $THREADS_LIBS $KRB4_LDFLAGS $MANUAL_NSS_LIBS $OPENSSL_LDFLAGS) +EVO_SET_COMPILE_FLAGS(CAMEL, gal xml, + $THREADS_CFLAGS $KRB4_CFLAGS $NSS_CFLAGS $NSPR_CFLAGS $OPENSSL_CFLAGS, + $THREADS_LIBS $KRB4_LDFLAGS $NSS_LDFLAGS $NSPR_LDFLAGS $OPENSSL_LDFLAGS) AC_SUBST(CAMEL_CFLAGS) AC_SUBST(CAMEL_LIBS) -EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION) +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, gconf-2.0 libxml-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 soup-2.0 $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, bonobox gal oaf libglade bonobo_conf soup, + $GCONF_CFLAGS $THREADS_CFLAGS $NSPR_CFLAGS, + $GCONF_LIBS $THREADS_LIBS $NSPR_LDFLAGS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) -dnl -dnl EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs) -dnl AC_SUBST(E_WIDGETS_CFLAGS) -dnl AC_SUBST(E_WIDGETS_LIBS) -dnl -EVO_SET_COMPILE_FLAGS(IMPORTERS, gconf-2.0 libglade-2.0 libbonoboui-2.0 libgnomeui-2.0) +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) -dnl + dnl libibex is now deprecated dnl EVO_SET_COMPILE_FLAGS(LIBIBEX, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs, dnl $THREADS_CFLAGS, $THREADS_LIBS) dnl AC_SUBST(LIBIBEX_CFLAGS) dnl AC_SUBST(LIBIBEX_LIBS) -EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 gal-2.0 >= $GAL_VERSION) +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, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 gnome-vfs-2.0 libgtkhtml-3.0) +EVO_SET_COMPILE_FLAGS(SHELL, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) dnl --- evolution-addressbook flags -EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 libglade-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgnomeprintui-2.2" +EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs" -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) +EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) -if test x$enable_pilot_conduits = xyes; then -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS) +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) -fi dnl -- evolution-executive-summary flags -EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, libbonoboui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libgnomeui-2.0 libglade-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 soup-2.0 libgtkhtml-3.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY, + bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf soup vfs, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) dnl --- evolution-calendar flags -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 gnome-vfs-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) +EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs" + +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) -if test x$enable_pilot_conduits = xyes; then -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gnome-pilot-2.0 $EVOLUTION_CALENDAR_DEPS) +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) -fi dnl --- evolution-mail flags -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 >= $GAL_VERSION libglade-2.0 gnome-vfs-module-2.0 soup-2.0 libgnomeprint-2.2 libgnomeprintui-2.2 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss) -AC_SUBST(EVOLUTION_MAIL_CFLAGS) -AC_SUBST(EVOLUTION_MAIL_LIBS) - -dnl -- wombat flags - -EVO_SET_COMPILE_FLAGS(WOMBAT, libgnome-2.0, $LDAP_CFLAGS, $LDAP_LIBS) -AC_SUBST(WOMBAT_CFLAGS) -AC_SUBST(WOMBAT_LIBS) - -dnl ******************* -dnl Special directories -dnl ******************* - -BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'` -AC_SUBST(BASE_VERSION) -AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION") +dnl ****************************** +dnl Versioned library files +dnl ****************************** -privlibdir='${libdir}'/evolution/'${BASE_VERSION}' +privlibdir='$(pkglibdir)/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION AC_SUBST(privlibdir) camel_providerdir="$privlibdir/camel-providers" AC_SUBST(camel_providerdir) -idldir="$datadir/idl/evolution-$BASE_VERSION" -AC_SUBST(idldir) - -componentdir="$privlibdir/components" -AC_SUBST(componentdir) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS soup, $GCONF_CFLAGS $THREADS_CFLAGS ${GTKHTML_CFLAGS}, $GCONF_LIBS $THREADS_LIBS ${GTKHTML_LIBS}) +AC_SUBST(EVOLUTION_MAIL_CFLAGS) +AC_SUBST(EVOLUTION_MAIL_LIBS) -evolutionuidir="$datadir/evolution-$BASE_VERSION/ui" -AC_SUBST(evolutionuidir) +dnl -- wombat flags -iconsdir="$datadir/evolution-$BASE_VERSION/images" -AC_SUBST(iconsdir) +EVO_SET_COMPILE_FLAGS(WOMBAT, $FULL_GNOME_DEPS, $LDAP_CFLAGS, $LDAP_LIBS) +AC_SUBST(WOMBAT_CFLAGS) +AC_SUBST(WOMBAT_LIBS) ################################################## # Check for gtk-doc. @@ -1198,12 +1203,6 @@ fi AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) -dnl *********** -dnl GConf stuff -dnl *********** -AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -AM_GCONF_SOURCE_2 - dnl ****************** dnl Sub-version number dnl ****************** @@ -1237,9 +1236,9 @@ fi AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x) AC_SUBST(KDE_APPLNK_DIR) -dnl *********************** -dnl foo for pkgconfig files -dnl *********************** +dnl ****************************** +dnl foo for *Conf.sh.in +dnl ****************************** EVOLUTION_LIBDIR="-L${libdir}" EVOLUTION_DATADIR="${datadir}" @@ -1260,9 +1259,14 @@ AC_CONFIG_SUBDIRS(libical) EVOLUTION_DIR=`(cd $srcdir; pwd)` AC_SUBST(EVOLUTION_DIR) -AC_OUTPUT([ po/Makefile.in +AC_OUTPUT([ Makefile addressbook/Makefile +addressbook/backend/Makefile +addressbook/backend/ebook/Makefile +addressbook/backend/idl/Makefile +addressbook/backend/pas/Makefile +addressbook/conduit/Makefile addressbook/gui/Makefile addressbook/gui/component/Makefile addressbook/gui/component/select-names/Makefile @@ -1271,13 +1275,20 @@ addressbook/gui/contact-list-editor/Makefile addressbook/gui/merging/Makefile addressbook/gui/search/Makefile addressbook/gui/widgets/Makefile -addressbook/backend/Makefile -addressbook/backend/ebook/Makefile -addressbook/backend/pas/Makefile -addressbook/backend/idl/Makefile -addressbook/conduit/Makefile addressbook/printing/Makefile art/Makefile +calendar/Makefile +calendar/cal-client/Makefile +calendar/cal-util/Makefile +calendar/conduits/Makefile +calendar/conduits/calendar/Makefile +calendar/conduits/todo/Makefile +calendar/gui/Makefile +calendar/gui/alarm-notify/Makefile +calendar/gui/dialogs/Makefile +calendar/idl/Makefile +calendar/importers/Makefile +calendar/pcs/Makefile camel/Makefile camel/providers/Makefile camel/providers/imap/Makefile @@ -1294,6 +1305,7 @@ camel/tests/mime-filter/Makefile camel/tests/misc/Makefile camel/tests/smime/Makefile camel/tests/stream/Makefile +composer/Makefile data/Makefile data/cde_app_root/Makefile data/cde_app_root/dt/Makefile @@ -1316,15 +1328,33 @@ default_user/local/Outbox/Makefile default_user/local/Sent/Makefile default_user/local/Tasks/Makefile default_user/local/Trash/Makefile +doc/Makefile +doc/devel/Makefile +doc/devel/calendar/Makefile +doc/devel/calendar/cal-client/Makefile +doc/devel/calendar/cal-util/Makefile e-util/Makefile e-util/ename/Makefile filter/Makefile +help/Makefile +help/C/Makefile +help/no/Makefile +importers/Makefile +intl/Makefile libversit/Makefile +libwombat/Makefile +macros/Makefile +mail/Makefile +mail/importers/Makefile +my-evolution/Makefile +omf-install/Makefile +po/Makefile.in shell/Makefile shell/evolution-nognome shell/glade/Makefile shell/importer/Makefile -my-evolution/Makefile +sounds/Makefile +tools/Makefile ui/Makefile views/Makefile views/addressbook/Makefile @@ -1336,26 +1366,8 @@ widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile wombat/Makefile -libwombat/Makefile -calendar/Makefile -calendar/idl/Makefile -calendar/cal-util/Makefile -calendar/cal-client/Makefile -calendar/conduits/Makefile -calendar/conduits/todo/Makefile -calendar/conduits/calendar/Makefile -calendar/pcs/Makefile -calendar/gui/Makefile -calendar/gui/alarm-notify/Makefile -calendar/gui/dialogs/Makefile -composer/Makefile -mail/Makefile -mail/importers/Makefile -tools/Makefile -evolution-shell.pc -evolution-addressbook.pc -evolution-calendar.pc -camel.pc + +my-evolution/GNOME_Evolution_Summary.oaf.in ]) if test "x$with_sub_version" != "x"; then @@ -1380,16 +1392,26 @@ echo "\ IPv6 support: $msg_ipv6 Dot Locking: $msg_dot File Locking: $msg_file - Gtk-doc: $enable_gtk_doc" + Gtk-doc: $enable_gtk_doc + Shlib components: $enable_shlib_components" 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. + 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. +" +else + echo " " fi |