diff --git configure.ac configure.acindex 85d8e72..75583d5 100644--- configure.ac+++ configure.ac@@ -230,9 +230,9 @@ dnl User documentation dnl ****************** AC_MSG_CHECKING([whether to build user documentation]) AC_ARG_WITH([help],- [AC_HELP_STRING([--with-help],+ [AS_HELP_STRING([--with-help], [Build user documentation [default=yes]])],- with_help="$withval", with_help="yes")+ [with_help="$withval"],[with_help="yes"]) AM_CONDITIONAL(WITH_HELP, test "x$with_help" != "xno") AC_MSG_RESULT($with_help)@@ -241,8 +241,8 @@ dnl iconv checking dnl ****************************** have_iconv=no AC_ARG_WITH([libiconv],- AC_HELP_STRING([--with-libiconv=PATH],- [Prefix where libiconv is installed]))+ AS_HELP_STRING([--with-libiconv=PATH],+ [Prefix where libiconv is installed])) if test -d "$withval"; then ICONV_CFLAGS="-I$withval/include" ICONV_LIBS="-L$withval/lib"@@ -391,9 +391,9 @@ dnl ************** dnl Test Component dnl ************** AC_ARG_ENABLE([test-component],- AC_HELP_STRING([--enable-test-component],- [Enable test component.]),- [enable_test_comp=$enableval],[enable_test_comp=no])+ AS_HELP_STRING([--enable-test-component],+ [Enable test component.]),+ [enable_test_comp=$enableval],[enable_test_comp=no]) AM_CONDITIONAL(ENABLE_TEST_COMPONENT, [test x$enable_test_comp = xyes])@@ -631,9 +631,9 @@ dnl ************************************************** dnl NNTP support. dnl ************************************************** AC_ARG_ENABLE([nntp],- AC_HELP_STRING([--enable-nntp],- [Build Usenet news (NNTP) backend]),- [enable_nntp=$enableval],[enable_nntp=yes])+ AS_HELP_STRING([--enable-nntp],+ [Build Usenet news (NNTP) backend]),+ [enable_nntp=$enableval],[enable_nntp=yes]) if test "x$enable_nntp" = "xyes"; then AC_DEFINE(ENABLE_NNTP,1,[Build NNTP backend]) msg_nntp=yes@@ -646,9 +646,9 @@ dnl ************************************************** dnl New IMAP code support. dnl ************************************************** AC_ARG_ENABLE([imapp],- AC_HELP_STRING([--enable-imapp],- [Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code]),,- [enable_imapp=no])+ AS_HELP_STRING([--enable-imapp],+ [Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code]),,+ [enable_imapp=no]) if test "x$enable_imapp" = "xyes"; then AC_DEFINE(ENABLE_IMAPP,1,[Really don't try this at home]) msg_imapp=yes@@ -661,9 +661,9 @@ dnl ************************************************** dnl New IMAP code support. dnl ************************************************** AC_ARG_ENABLE([imap4],- AC_HELP_STRING([--enable-imap4],- [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),,- [enable_imap4=yes])+ AS_HELP_STRING([--enable-imap4],+ [Attempt to compile yet another, incomplete, very unsupported IMAPv4r1 implementation]),,+ [enable_imap4=yes]) if test "x$enable_imap4" = "xyes"; then AC_DEFINE(ENABLE_IMAP4,1,[Really don't try this at home]) msg_imap4=yes@@ -726,9 +726,9 @@ dnl ****************************** dnl Pilot checking dnl ****************************** AC_ARG_ENABLE([pilot-conduits],- AC_HELP_STRING([--enable-pilot-conduits],- [Enable support for building pilot conduits.]),,- [enable_pilot_conduits=no])+ AS_HELP_STRING([--enable-pilot-conduits],+ [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_minimum_version)@@ -790,30 +790,29 @@ dnl ******** dnl Kerberos dnl ******** AC_ARG_WITH([krb5],- AC_HELP_STRING([--with-krb5=PATH],- [Location of Kerberos 5 install dir]),- [with_krb5=$withval],[with_krb5=no])+ AS_HELP_STRING([--with-krb5=PATH],+ [Location of Kerberos 5 install dir]),+ [with_krb5=$withval],[with_krb5=no]) AC_ARG_WITH([krb5-libs],- AC_HELP_STRING([--with-krb5-libs=PATH],- [Location of Kerberos 5 libraries]),- [with_krb5_libs=$withval],[with_krb5_libs=$with_krb5/lib])+ AS_HELP_STRING([--with-krb5-libs=PATH],+ [Location of Kerberos 5 libraries]),+ [with_krb5_libs=$withval],[with_krb5_libs=$with_krb5/lib]) AC_ARG_WITH([krb5-includes],- AC_HELP_STRING([--with-krb5-includes=PATH],- [Location of Kerberos 5 headers]),- [with_krb5_includes=$withval],[with_krb5_includes=""])+ AS_HELP_STRING([--with-krb5-includes=PATH],+ [Location of Kerberos 5 headers]),+ [with_krb5_includes=$withval],[with_krb5_includes=""]) AC_ARG_WITH([krb4],- AC_HELP_STRING([--with-krb4=PATH],- [Location of Kerberos 4 install dir]),- [with_krb4=$withval],[with_krb4=no])+ AS_HELP_STRING([--with-krb4=PATH],+ [Location of Kerberos 4 install dir]),+ [with_krb4=$withval],[with_krb4=no]) AC_ARG_WITH([krb4-libs],- AC_HELP_STRING([--with-krb4-libs=PATH],- [Location of Kerberos 4 libraries]),- [with_krb4_libs=$withval],[with_krb4_libs=$with_krb4/lib])+ AS_HELP_STRING([--with-krb4-libs=PATH],+ [Location of Kerberos 4 libraries]),+ [with_krb4_libs=$withval],[with_krb4_libs=$with_krb4/lib]) AC_ARG_WITH([krb4-includes],- AC_HELP_STRING([--with-krb4-includes=PATH],- [Location of Kerberos 4 headers]),- [with_krb4_includes=$withval],[with_krb4_includes=""])-+ AS_HELP_STRING([--with-krb4-includes=PATH],+ [Location of Kerberos 4 headers]),+ [with_krb4_includes=$withval],[with_krb4_includes=""]) msg_krb5="no" if test "x${with_krb5}" != "xno"; then@@ -943,9 +942,9 @@ dnl turn on the mono plugin or not. MONO_CFLAGS= MONO_LIBS= AC_ARG_ENABLE([mono],- AC_HELP_STRING([--enable-mono],- [Add Mono embedded hooks.]),- [enable_mono=$enableval],[enable_mono=no])+ AS_HELP_STRING([--enable-mono],+ [Add Mono embedded hooks.]),+ [enable_mono=$enableval],[enable_mono=no]) if test "x${enable_mono}" = "xyes"; then PKG_CHECK_MODULES(MONO, "mono") AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])@@ -960,9 +959,9 @@ dnl turn on the python plugin or not. dnl (Thanks to Pidgin) AC_ARG_ENABLE([python],- AC_HELP_STRING([--enable-python],- [Add python embedded hooks.]),- [enable_python=$enableval],[enable_python=no])+ AS_HELP_STRING([--enable-python],+ [Add python embedded hooks.]),+ [enable_python=$enableval],[enable_python=no]) if test "x${enable_python}" = "xyes"; then AC_PATH_PROG(pythonpath, python)@@ -1008,30 +1007,30 @@ msg_smime="no" dnl these 2 enable's are inverses of each other AC_ARG_ENABLE([nss],- AC_HELP_STRING([--enable-nss=@<:@yes/no/static@:>@],- [Attempt to use Mozilla libnss for SSL support.]),- [enable_nss=$enableval],[enable_nss=yes])+ AS_HELP_STRING([--enable-nss=@<:@yes/no/static@:>@],+ [Attempt to use Mozilla libnss for SSL support.]),+ [enable_nss=$enableval],[enable_nss=yes]) AC_ARG_ENABLE([smime],- AC_HELP_STRING([--enable-smime],- [Attempt to use Mozilla libnss for SMIME support (this requires --enable-nss)]),- [enable_smime=$enableval],[enable_smime=yes])+ AS_HELP_STRING([--enable-smime],+ [Attempt to use Mozilla libnss for SMIME support (this requires --enable-nss)]),+ [enable_smime=$enableval],[enable_smime=yes]) AC_ARG_WITH([nspr-includes],- AC_HELP_STRING([--with-nspr-includes=PATH],- [Location of Mozilla nspr4 includes.]))+ AS_HELP_STRING([--with-nspr-includes=PATH],+ [Location of Mozilla nspr4 includes.])) AC_ARG_WITH([nspr-libs],- AC_HELP_STRING([--with-nspr-libs=PATH],- [Location of Mozilla nspr4 libs.]))+ AS_HELP_STRING([--with-nspr-libs=PATH],+ [Location of Mozilla nspr4 libs.])) AC_ARG_WITH([nss-includes],- AC_HELP_STRING([--with-nss-includes=PATH],- [Location of Mozilla nss3 includes.]))+ AS_HELP_STRING([--with-nss-includes=PATH],+ [Location of Mozilla nss3 includes.])) AC_ARG_WITH([nss-libs],- AC_HELP_STRING([--with-nss-libs=PATH],- [Location of Mozilla nss3 libs.]))+ AS_HELP_STRING([--with-nss-libs=PATH],+ [Location of Mozilla nss3 libs.])) 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@@ -1254,9 +1253,9 @@ dnl Check if we should build the weather calendar plugin dnl ************************************************** AC_MSG_CHECKING(if we should build the weather calendar plugin) AC_ARG_WITH([weather],- [AS_HELP_STRING([--with-weather], [Build the weather calendar setup plugin (default=yes)])],- [use_gweather=$withval],- [use_gweather=yes])+ [AS_HELP_STRING([--with-weather],+ [Build the weather calendar setup plugin (default=yes)])],+ [use_gweather=$withval],[use_gweather=yes]) AC_MSG_RESULT($use_gweather) if test $use_gweather = yes; then@@ -1272,9 +1271,10 @@ dnl ************************************************** dnl Exchange support. dnl ************************************************** AC_ARG_ENABLE([exchange],- AC_HELP_STRING([--enable-exchange],- [Build Exchange plugins]),- [enable_exchange=$enableval],[enable_exchange=yes])+ AS_HELP_STRING([--enable-exchange],+ [Build Exchange plugins]),+ [enable_exchange=$enableval],[enable_exchange=yes])+ if test "x$enable_exchange" = "xyes"; then msg_exchange=yes EXCHANGE_PLUGIN="exchange-operations"@@ -1757,9 +1757,9 @@ EVO_PLUGIN_RULE=$srcdir/plugin.mk AC_SUBST_FILE(EVO_PLUGIN_RULE) AC_ARG_ENABLE([plugins],- AC_HELP_STRING([--enable-plugins=[no/base/all/experimental/list]],- [Enable plugins.]),- [enable_plugins="$enableval"],[enable_plugins=all])+ AS_HELP_STRING([--enable-plugins=[no/base/all/experimental/list]],+ [Enable plugins.]),+ [enable_plugins="$enableval"],[enable_plugins=all]) dnl Add any new plugins here plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"@@ -1800,9 +1800,10 @@ xexperimental) esac AC_ARG_ENABLE([profiling],- AC_HELP_STRING([--enable-profiling],- [Enable profiling plugin.]),- [enable_profiling=$enableval],[enable_profiling=no])+ AS_HELP_STRING([--enable-profiling],+ [Enable profiling plugin.]),+ [enable_profiling=$enableval],[enable_profiling=no])+ case x"$enable_profiling" in x | xyes) plugins_enabled="$plugins_enabled profiler"@@ -1909,15 +1910,15 @@ dnl ****************** dnl Sub-version number dnl ****************** AC_ARG_WITH([sub-version],- AC_HELP_STRING([--with-sub-version=VERSION],- [Specify a sub-version string]))+ AS_HELP_STRING([--with-sub-version=VERSION],+ [Specify a sub-version string])) AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version", [Version substring, for packagers]) AC_ARG_ENABLE([default-binary],- AC_HELP_STRING([--disable-default-binary],- [Do not install as the default "evolution" binary]),,- [enable_default_binary=no])+ AS_HELP_STRING([--disable-default-binary],+ [Do not install as the default "evolution" binary]),,+ [enable_default_binary=no]) AM_CONDITIONAL(DEFAULT_BINARY, test x$enable_default_binary = xyes)@@ -1925,9 +1926,9 @@ dnl ******************** dnl KDE applnk directory dnl ******************** AC_ARG_WITH([kde-applnk-path],- AC_HELP_STRING([--with-kde-applnk-path=PATH],- [Location of KDE applnk files]),- [with_kde_applnk_path=$withval], [with_kde_applnk_path="no"])+ AS_HELP_STRING([--with-kde-applnk-path=PATH],+ [Location of KDE applnk files]),+ [with_kde_applnk_path=$withval], [with_kde_applnk_path="no"]) if test x"$with_kde_applnk_path" != x"no"; then if test -z "$with_kde_applnk_path"; then