[evolution] Bug 586991 – Require autoconf 2.58 / various configure cleanups
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution] Bug 586991 – Require autoconf 2.58 / various configure cleanups
- Date: Mon, 6 Jul 2009 22:46:19 +0000 (UTC)
commit 2a4a8f4422a9357ad632b02799f83cec376be4f4
Author: H.Habighorst <tearofadragon googlemail com>
Date: Mon Jul 6 17:54:05 2009 -0400
Bug 586991 â?? Require autoconf 2.58 / various configure cleanups
acinclude.m4 | 110 +++++++++---------
configure.ac | 346 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 228 insertions(+), 228 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index fa7fc5c..2cd23b2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,12 +8,13 @@
# the automake conditional ENABLE_PURIFY
AC_DEFUN([EVO_PURIFY_SUPPORT], [
AC_ARG_ENABLE([purify],
- AC_HELP_STRING([--enable-purify],
- [Enable support for building executables with Purify.]),,[enable_purify=no])
+ [AS_HELP_STRING([--enable-purify],
+ [Enable support for building executables with Purify.])],
+ [enable_purify=yes],[enable_purify=no])
AC_PATH_PROG(PURIFY, purify, impure)
AC_ARG_WITH([purify-options],
- AC_HELP_STRING([--with-purify-options=OPTIONS],
- [Options passed to the purify command line (defaults to PURIFYOPTIONS variable).]))
+ [AS_HELP_STRING([--with-purify-options@<:@=OPTIONS@:>@],
+ [Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])])
if test "x$with_purify_options" = "xno"; then
with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
fi
@@ -36,12 +37,12 @@ AC_DEFUN([EVO_LDAP_CHECK], [
default="$1"
AC_ARG_WITH([openldap],
- AC_HELP_STRING([--with-openldap],
- [Enable LDAP support in evolution]))
+ [AS_HELP_STRING([--with-openldap],
+ [Enable LDAP support in evolution])])
AC_ARG_WITH([static-ldap],
- AC_HELP_STRING([--with-static-ldap],
- [Link LDAP support statically into evolution]))
- AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+ [AS_HELP_STRING([--with-static-ldap],
+ [Link LDAP support statically into evolution])])
+ AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
case $ac_cv_with_openldap in
no|"")
with_openldap=no
@@ -68,7 +69,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
;;
esac
- AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [
+ AC_CACHE_CHECK([if OpenLDAP is version 2.x], [ac_cv_openldap_version2], [
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
AC_EGREP_CPP(yes, [
@@ -76,16 +77,16 @@ AC_DEFUN([EVO_LDAP_CHECK], [
#if LDAP_VENDOR_VERSION > 20000
yes
#endif
- ], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)
+ ], [ac_cv_openldap_version2=yes], [ac_cv_openldap_version2=no])
CPPFLAGS="$CPPFLAGS_save"
])
if test "$ac_cv_openldap_version2" = no; then
- AC_MSG_ERROR(evolution requires OpenLDAP version >= 2)
+ AC_MSG_ERROR([evolution requires OpenLDAP version >= 2])
fi
- AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
- AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
- AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
+ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+ AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
+ AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
AC_CHECK_LIB(lber, ber_get_tag, [
if test "$with_static_ldap" = "yes"; then
LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
@@ -105,18 +106,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
else
LDAP_LIBS="-lldap $LDAP_LIBS"
fi],
- LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
+ [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
- ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
+ ], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
if test -z "$LDAP_LIBS"; then
- AC_MSG_ERROR(could not find OpenLDAP libraries)
+ AC_MSG_ERROR([could not find OpenLDAP libraries])
fi
AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
fi
- AM_CONDITIONAL(ENABLE_LDAP, test $with_openldap != no)
+ AM_CONDITIONAL(ENABLE_LDAP, test "$with_openldap" != "no")
])
# EVO_SUNLDAP_CHECK
@@ -128,12 +129,12 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
default="$1"
AC_ARG_WITH([sunldap],
- AC_HELP_STRING([--with-sunldap],
- [Enable SunLDAP support in evolution]))
+ [AS_HELP_STRING([--with-sunldap],
+ [Enable SunLDAP support in evolution])])
AC_ARG_WITH([static-sunldap],
- AC_HELP_STRING([--with-static-sunldap],
- [Link SunLDAP support statically into evolution ]))
- AC_CACHE_CHECK([for SunLDAP], ac_cv_with_sunldap, ac_cv_with_sunldap="${with_sunldap:=$default}")
+ [AS_HELP_STRING([--with-static-sunldap],
+ [Link SunLDAP support statically into evolution])])
+ AC_CACHE_CHECK([for SunLDAP],[ac_cv_with_sunldap],[ac_cv_with_sunldap="${with_sunldap:=$default}"])
case $ac_cv_with_sunldap in
no|"")
with_sunldap=no
@@ -161,7 +162,7 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
;;
esac
- AC_CACHE_CHECK(if SunLDAP is version 2.x, ac_cv_sunldap_version2, [
+ AC_CACHE_CHECK([if SunLDAP is version 2.x], [ac_cv_sunldap_version2], [
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
AC_EGREP_CPP(yes, [
@@ -169,16 +170,16 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
#if LDAP_VENDOR_VERSION >= 500
yes
#endif
- ], ac_cv_sunldap_version2=yes, ac_cv_sunldap_version2=no)
+ ],[ac_cv_sunldap_version2=yes],[ac_cv_sunldap_version2=no])
CPPFLAGS="$CPPFLAGS_save"
])
if test "$ac_cv_sunldap_version2" = no; then
- AC_MSG_ERROR(evolution requires SunLDAP version >= 2)
+ AC_MSG_ERROR([evolution requires SunLDAP version >= 2])
fi
- AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
- AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
- AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
+ AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"])
+ AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"])
+ AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
AC_CHECK_LIB(ldap, ldap_open, [
if test $with_static_sunldap = "yes"; then
LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS"
@@ -197,28 +198,28 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [
fi
else
LDAP_LIBS="-llber $LDAP_LIBS"
- fi], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
+ fi], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
fi
LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
- ], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
+ ], [LDAP_LIBS=""], [$LDAP_LDFLAGS $LDAP_LIBS])
if test -z "$LDAP_LIBS"; then
- AC_MSG_ERROR(could not find SunLDAP libraries)
+ AC_MSG_ERROR([could not find SunLDAP libraries])
fi
AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
fi
- AM_CONDITIONAL(ENABLE_LDAP, test $with_sunldap != no)
+ AM_CONDITIONAL(ENABLE_LDAP, test "$with_sunldap" != "no")
])
# EVO_PTHREAD_CHECK
AC_DEFUN([EVO_PTHREAD_CHECK],[
PTHREAD_LIB=""
- AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
- [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
- [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
- [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread",
+ AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIB="-lpthread"],
+ [AC_CHECK_LIB(pthreads, pthread_create, [PTHREAD_LIB="-lpthreads"],
+ [AC_CHECK_LIB(c_r, pthread_create, [PTHREAD_LIB="-lc_r"],
+ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, [PTHREAD_LIB="-lpthread"],
[AC_CHECK_FUNC(pthread_create)]
)]
)]
@@ -237,17 +238,17 @@ AC_DEFUN([GTK_DOC_CHECK],
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
dnl for overriding the documentation installation directory
AC_ARG_WITH([html-dir],
- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
- [with_html_dir='${datadir}/gtk-doc/html'])
+ [AS_HELP_STRING([--with-html-dir=PATH],
+ [path to installed docs])],,
+ [with_html_dir='${datadir}/gtk-doc/html'])
HTML_DIR="$with_html_dir"
AC_SUBST(HTML_DIR)
dnl enable/disable documentation building
AC_ARG_ENABLE([gtk-doc],
- AC_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [default=no]]),,
- enable_gtk_doc=no)
-
+ [AS_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [default=no]])],
+ ,[enable_gtk_doc=no])
have_gtk_doc=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -262,15 +263,15 @@ ifelse([$1],[],,
if test "$have_gtk_doc" = yes; then
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
have_gtk_doc=no
fi
fi
])
if test x$enable_gtk_doc = xyes; then
- if test "$have_gtk_doc" != yes; then
+ if test $have_gtk_doc != yes; then
enable_gtk_doc=no
fi
fi
@@ -288,8 +289,8 @@ AC_SUBST(PISOCK_LIBS)
AC_DEFUN([PILOT_LINK_HOOK],[
AC_ARG_WITH([pisock],
- AC_HELP_STRING([--with-pisock],
- [Specify prefix for pisock files]),
+ AS_HELP_STRING([--with-pisock=PREFIX],
+ [Specify prefix for pisock files]),
[
if test x$withval = xyes; then
dnl Note that an empty true branch is not valid sh syntax.
@@ -298,9 +299,9 @@ AC_DEFUN([PILOT_LINK_HOOK],[
PISOCK_CFLAGS="-I$withval/include"
incdir="$withval/include"
PISOCK_LIBS="-L$withval/lib -lpisock -lpisync"
- AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
+ AC_MSG_CHECKING([for existance of "$withval"/lib/libpisock.so])
if test -r $withval/lib/libpisock.so; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Unable to find libpisock. Try http://www.pilot-link.org.])
fi
@@ -330,10 +331,9 @@ AC_DEFUN([PILOT_LINK_HOOK],[
fi
AC_ARG_ENABLE([pilotlinktest],
- AC_HELP_STRING([--enable-pilotlinktest],
- [Test for correct version of pilot-link]),
- [testplversion=$enableval],
- [testplversion=yes]
+ AS_HELP_STRING([--enable-pilotlinktest],
+ [Test for correct version of pilot-link]),
+ [testplversion="$enableval"],[testplversion=yes]
)
if test x$piversion_include = x; then
diff --git a/configure.ac b/configure.ac
index 85d8e72..84c916f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,18 +19,18 @@ m4_define([base_version], [2.28])
m4_define([upgrade_revision], [0])
# Autoconf / Automake Initialization
-AC_PREREQ(2.54)
+AC_PREREQ(2.58)
AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
AM_INIT_AUTOMAKE([gnu 1.9])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR(README)
-# Gnome Doc Initialization
-GNOME_DOC_INIT
-
# Automake 1.11 - Silent Build Rules
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# Gnome Doc Initialization
+GNOME_DOC_INIT
+
# Some requirements have versioned package names
# XXX In the spirit of getting rid of versioned
# files, can we please drop these suffixes?
@@ -122,7 +122,7 @@ AC_SUBST(PERL)
case $YACC in
*yacc*)
- AC_MSG_ERROR(You need bison to build Evolution)
+ AC_MSG_ERROR([You need bison to build Evolution])
;;
esac
AC_HEADER_STDC
@@ -200,7 +200,7 @@ AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
AC_SUBST(WINDRES)
# Check for base dependencies early.
-PKG_CHECK_MODULES(GNOME_PLATFORM,
+PKG_CHECK_MODULES([GNOME_PLATFORM],
[glib-2.0 >= glib_minimum_version
gtk+-2.0 >= gtk_minimum_version
gconf-2.0 >= gconf_minimum_version
@@ -214,7 +214,7 @@ PKG_CHECK_MODULES(GNOME_PLATFORM,
AC_SUBST(GNOME_PLATFORM_CFLAGS)
AC_SUBST(GNOME_PLATFORM_LIBS)
-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,
+PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
[libebook-$EDS_PACKAGE >= eds_minimum_version
libecal-$EDS_PACKAGE >= eds_minimum_version
libedataserver-$EDS_PACKAGE >= eds_minimum_version
@@ -230,19 +230,19 @@ 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)
+AC_MSG_RESULT([$with_help])
dnl ******************************
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"
@@ -323,14 +323,14 @@ AC_SUBST(ICONV_LIBS)
CFLAGS="$CFLAGS -I$srcdir"
-AC_MSG_CHECKING(preferred charset name formats for system iconv)
+AC_MSG_CHECKING([preferred charset name formats for system iconv])
AC_TRY_RUN([
#define CONFIGURE_IN
#include "iconv-detect.c"
],[
- AC_MSG_RESULT(found)
+ AC_MSG_RESULT([found])
],[
- AC_MSG_RESULT(not found)
+ AC_MSG_RESULT([not found])
AC_WARN([
*** The iconv-detect program was unable to determine the
*** preferred charset name formats recognized by your
@@ -346,7 +346,7 @@ AC_TRY_RUN([
echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
echo '#define ICONV_10646 "UCS-4BE"' >>iconv-detect.h
else
- AC_MSG_RESULT(unknown)
+ AC_MSG_RESULT([unknown])
AC_WARN([
*** We can't determine the preferred charset name formats
*** recognized by your iconv library. You are
@@ -367,18 +367,18 @@ AC_CHECK_HEADERS(sys/wait.h)
if test x$os_win32 != xyes; then
dnl check for socklen_t (in Unix98)
- AC_MSG_CHECKING(for socklen_t)
+ AC_MSG_CHECKING([for socklen_t])
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>
socklen_t x;
- ],[],[AC_MSG_RESULT(yes)],[
+ ],[],[AC_MSG_RESULT([yes])],[
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>
int accept (int, struct sockaddr *, size_t *);
],[],[
- AC_MSG_RESULT(size_t)
+ AC_MSG_RESULT([size_t])
AC_DEFINE(socklen_t,size_t,[Define to appropriate type if socklen_t is not defined])], [
- AC_MSG_RESULT(int)
+ AC_MSG_RESULT([int])
AC_DEFINE(socklen_t,int)])])
fi
@@ -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])
@@ -537,12 +537,12 @@ AC_CHECK_FUNCS(statfs)
dnl **************************************************
dnl * Gnome Icon Theme
dnl **************************************************
-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)
+PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
dnl **************************************************
dnl * Accessibility support
dnl **************************************************
-PKG_CHECK_MODULES(A11Y, atk)
+PKG_CHECK_MODULES([A11Y], [atk])
AC_SUBST(A11Y_CFLAGS)
AC_SUBST(A11Y_LIBS)
@@ -558,7 +558,7 @@ AC_COMPILE_IFELSE([
],
have_xfree=yes
)
-AC_MSG_CHECKING(for X11 XFree86 headers)
+AC_MSG_CHECKING([for X11 XFree86 headers])
AC_MSG_RESULT([$have_xfree])
if test x"$have_xfree" = "xyes" ; then
AC_DEFINE(HAVE_XFREE, 1, [defined if you have X11/XF86keysym.h])
@@ -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
@@ -711,7 +711,7 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
AC_SUBST(REGEX_LIBS)
# XXX Drop the version from the package name?
-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= libgtkhtml_minimum_version)
+PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version])
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.14`
@@ -719,48 +719,45 @@ AC_SUBST(GTKHTML_DATADIR)
GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.14`
AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "$GTKHTML_API_VERSION", [The gtkhtml api version])
-
-
-
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)
+ PKG_CHECK_MODULES([GNOME_PILOT], [gnome-pilot-2.0 >= gnome_pilot_minimum_version])
CFLAGS_save="$CFLAGS"
CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
LDFLAGS_save="$LDFLAGS"
LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS"
- AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([
-
-#include <stdlib.h>
-#include <string.h>
-#include <pi-util.h>
-
-int main (int argc, char **argv)
-{
- const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
- size_t utf8_real_len = strlen (utf8);
- char *pstring;
-
- if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
- exit (1);
-
- exit (0);
-}
-], ac_cv_pilot_link_utf8=yes, ac_cv_pilot_link_utf8=no, ac_cv_pilot_link_utf8=no))
+ AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],
+ [ac_cv_pilot_link_utf8], AC_TRY_RUN([
+ #include <stdlib.h>
+ #include <string.h>
+ #include <pi-util.h>
+
+ int main (int argc, char **argv)
+ {
+ const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
+ size_t utf8_real_len = strlen (utf8);
+ char *pstring;
+
+ if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &pstring) == -1)
+ exit (1);
+ exit (0);
+ }
+ ],
+ [ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no]))
CFLAGS="$CFLAGS_save"
LDFLAGS="$LDFLAGS_save"
if test "$ac_cv_pilot_link_utf8" = no; then
- AC_MSG_ERROR(evolution requires pilot-link to have working UTF-8 conversion routines)
+ AC_MSG_ERROR([evolution requires pilot-link to have working UTF-8 conversion routines])
fi
fi
AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, [test x$enable_pilot_conduits = xyes])
@@ -790,30 +787,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
@@ -822,7 +818,7 @@ if test "x${with_krb5}" != "xno"; then
mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
sunlibs="-lkrb5 -lgss"
- AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
+ AC_CACHE_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5],
[
LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
@@ -868,8 +864,8 @@ if test "x${with_krb5}" != "xno"; then
KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
fi
else
- AC_MSG_CHECKING(for Kerberos 5)
- AC_MSG_RESULT($with_krb5)
+ AC_MSG_CHECKING([for Kerberos 5])
+ AC_MSG_RESULT([$with_krb5])
fi
AC_CHECK_HEADER([et/com_err.h],[AC_DEFINE([HAVE_ET_COM_ERR_H], 1, [Have et/comm_err.h])])
@@ -878,7 +874,7 @@ AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H], 1, [Have comm_err.h])])
msg_krb4="no"
if test "x${with_krb4}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
- AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,
+ AC_CACHE_CHECK([for Kerberos 4], [ac_cv_lib_kerberos4],
[
ac_cv_lib_kerberos4="no"
@@ -927,8 +923,8 @@ if test "x${with_krb4}" != "xno"; then
CFLAGS="$CFLAGS_save"
fi
else
- AC_MSG_CHECKING(for Kerberos 4)
- AC_MSG_RESULT(${with_krb4})
+ AC_MSG_CHECKING([for Kerberos 4])
+ AC_MSG_RESULT([${with_krb4}])
fi
AC_SUBST(KRB5_CFLAGS)
@@ -943,11 +939,11 @@ 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")
+ PKG_CHECK_MODULES([MONO], ["mono"])
AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
MONO_PLUGIN="mono"
fi
@@ -960,14 +956,14 @@ 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)
if test "_$pythonpath" != _ ; then
- AC_MSG_CHECKING(for python compile flags)
+ AC_MSG_CHECKING([for python compile flags])
PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
changequote(<<, >>)dnl
@@ -978,7 +974,7 @@ if test "x${enable_python}" = "xyes"; then
if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
PY_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION"
- AC_MSG_RESULT(ok)
+ AC_MSG_RESULT([ok])
python_package="python-devel"
PYTHON_PLUGIN="python"
else
@@ -1008,30 +1004,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
@@ -1041,21 +1037,21 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
fi
if test "x${check_manually}" = "xno"; then
- AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
+ AC_MSG_CHECKING([Mozilla NSPR pkg-config module name])
mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
for pc in $mozilla_nspr_pcs; do
if $PKG_CONFIG --exists $pc; then
- AC_MSG_RESULT($pc)
+ AC_MSG_RESULT([$pc])
mozilla_nspr=$pc
break;
fi
done
- AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
+ AC_MSG_CHECKING([Mozilla NSS pkg-config module name])
mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
for pc in $mozilla_nss_pcs; do
if $PKG_CONFIG --exists $pc; then
- AC_MSG_RESULT($pc)
+ AC_MSG_RESULT([$pc])
mozilla_nss=$pc
break;
fi
@@ -1087,8 +1083,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
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("")
+ 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" ])
@@ -1099,8 +1095,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
fi
else
- AC_MSG_CHECKING(for Mozilla nspr4 includes)
- AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Mozilla nspr4 includes])
+ AC_MSG_RESULT([no])
fi
have_nspr_libs="no"
@@ -1111,16 +1107,16 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
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="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+ [Please specify the path to libnspr4.a]
+ [Example: --with-nspr-libs=/usr/lib])
+ else
+ nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
fi
else
nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
fi
- AC_CACHE_CHECK([for Mozilla nspr libraries], ac_cv_moz_nspr_libs,
+ AC_CACHE_CHECK([for Mozilla nspr libraries], [ac_cv_moz_nspr_libs],
[
LIBS_save="$LIBS"
CFLAGS="$CFLAGS $MANUAL_NSPR_CFLAGS"
@@ -1145,15 +1141,15 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
MANUAL_NSPR_CLFAGS=""
fi
else
- AC_MSG_CHECKING(for Mozilla nspr4 libraries)
- AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Mozilla nspr4 libraries])
+ AC_MSG_RESULT([no])
fi
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("")
+ 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"
@@ -1175,8 +1171,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
MANUAL_NSPR_LIBS=""
fi
else
- AC_MSG_CHECKING(for Mozilla nss3 includes)
- AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Mozilla nss3 includes])
+ AC_MSG_RESULT([no])
fi
if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
@@ -1185,8 +1181,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
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])
+ [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
@@ -1199,7 +1195,7 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
nsslibs="-lssl3 -lsmime3 -lnss3"
fi
- AC_CACHE_CHECK([for Mozilla nss libraries], ac_cv_moz_nss_libs,
+ AC_CACHE_CHECK([for Mozilla nss libraries], [ac_cv_moz_nss_libs],
[
LIBS_save="$LIBS"
LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
@@ -1233,8 +1229,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
MANUAL_NSPR_LIBS=""
fi
else
- AC_MSG_CHECKING(for Mozilla nss libraries)
- AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([for Mozilla nss libraries])
+ AC_MSG_RESULT([no])
fi
MANUAL_NSS_CFLAGS="$MANUAL_NSPR_CFLAGS $MANUAL_NSS_CFLAGS"
@@ -1252,12 +1248,12 @@ AC_SUBST(MANUAL_NSS_LIBS)
dnl **************************************************
dnl Check if we should build the weather calendar plugin
dnl **************************************************
-AC_MSG_CHECKING(if we should build the weather calendar plugin)
+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])
-AC_MSG_RESULT($use_gweather)
+ [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
PKG_CHECK_MODULES([LIBGWEATHER],
@@ -1272,9 +1268,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"
@@ -1344,7 +1341,7 @@ dnl *) with_openssl_libs="-L$with_openssl_libs" ;;
dnl esac
dnl
dnl AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")
-dnl AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
+dnl AC_CACHE_CHECK([for OpenSSL libraries], [ac_cv_openssl_libs],
dnl [
dnl LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"
dnl AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
@@ -1384,7 +1381,7 @@ dnl **************************
dnl Check for X libs and -lX11
dnl **************************
-PKG_CHECK_MODULES(X, x11, :, [
+PKG_CHECK_MODULES([X], [x11], [:], [
# pkg-config modules not found (only present since X11R7 aka Xorg); use
# old-style detection
AC_PATH_XTRA
@@ -1427,9 +1424,9 @@ CFLAGS="$evolution_save_cflags"
AM_PATH_ORBIT2(2.9.8)
-AC_MSG_CHECKING(for CORBA include paths)
+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`" -I "`pkg-config --variable=idldir evolution-data-server-1.2`
-AC_MSG_RESULT($IDL_INCLUDES)
+AC_MSG_RESULT([$IDL_INCLUDES])
AC_SUBST(IDL_INCLUDES)
dnl Utility macro to set compiler flags for a specific lib.
@@ -1455,7 +1452,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h)
AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h)
CPPFLAGS="$CPPFLAGS_save"
-PKG_CHECK_MODULES(HAL, hal >= hal_minimum_version, HAVE_HAL="yes", HAVE_HAL="no")
+PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"])
if test "x$HAVE_HAL" = "xyes"; then
AC_DEFINE(HAVE_HAL, 1, [hal available])
HAL_REQUIREMENT="hal"
@@ -1482,7 +1479,7 @@ else
TNEF_ATTACHMENTS="tnef-attachments"
TNEF_CFLAGS="-DHAVE_LIBYTNEF_YTNEF_H"
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
TNEF_ATTACHMENTS=""
TNEF_CFLAGS=""
fi
@@ -1553,7 +1550,7 @@ dnl --- evolution (shell) flags
NM_SUPPORT_PACKAGES=""
-PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no")
+PKG_CHECK_MODULES([NM], [dbus-glib-1], [NM_SUPPORT="yes"], [NM_SUPPORT="no"])
AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] )
if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then
AC_DEFINE(NM_SUPPORT, 1, [network manager available])
@@ -1586,7 +1583,7 @@ fi
LIBNOTIFY_CFLAGS=
LIBNOTIFY_LIBS=
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= libnotify_minimum_version, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")
+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"])
if test "x$HAVE_LIBNOTIFY" = "xyes"; then
AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available])
libnotify="libnotify"
@@ -1625,13 +1622,13 @@ AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`pkg-config --modversion evolution-data-
DATASERVER_EXEC_VERSION=`pkg-config --variable=execversion evolution-data-server-1.2`
AC_SUBST(DATASERVER_EXEC_VERSION)
-AC_MSG_CHECKING(for evolution-data-server IDL)
+AC_MSG_CHECKING([for evolution-data-server IDL])
DATASERVER_IDL=`pkg-config --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl
if test -f "$DATASERVER_IDL"; then
- AC_MSG_RESULT($DATASERVER_IDL)
- AC_SUBST(DATASERVER_IDL)
+ AC_MSG_RESULT([$DATASERVER_IDL])
+ AC_SUBST(DATASERVER_IDL)
else
- AC_MSG_ERROR(no)
+ AC_MSG_ERROR([no])
fi
dnl --- evolution-test flags
@@ -1757,9 +1754,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 +1797,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"
@@ -1834,7 +1832,7 @@ then
dnl *********************
dnl gstreamer
dnl *********************
- PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)
+ PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10])
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
else
@@ -1848,7 +1846,7 @@ if ${PKG_CONFIG} --exists dbus-glib-1 ; then
dnl **************************************************
dnl * Mail Notification plugin's DBus messages
dnl **************************************************
- PKG_CHECK_MODULES(NMN, dbus-glib-1)
+ PKG_CHECK_MODULES([NMN], [dbus-glib-1])
AC_SUBST(NMN_CFLAGS)
AC_SUBST(NMN_LIBS)
@@ -1868,7 +1866,7 @@ else
fi
if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
- PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version, have_libexchange="yes", have_libexchange="no")
+ PKG_CHECK_MODULES([LIBEXCHANGESTORAGE], [libexchange-storage-$EDS_PACKAGE >= eds_minimum_version], [have_libexchange="yes"], [have_libexchange="no"])
if test "x$have_libexchange" = "xyes"; then
dnl **************************************************
dnl * Exchange Operations plugin
@@ -1889,7 +1887,7 @@ then
dnl *********************
dnl libpst
dnl *********************
- PKG_CHECK_MODULES(LIBPST, libpst)
+ PKG_CHECK_MODULES([LIBPST], [libpst])
AC_SUBST(LIBPST_CFLAGS)
AC_SUBST(LIBPST_LIBS)
else
@@ -1909,15 +1907,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 +1923,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
@@ -1952,7 +1950,7 @@ export plugindir
EVOLUTION_DIR=`(cd $srcdir; pwd)`
AC_SUBST(EVOLUTION_DIR)
-AC_OUTPUT([ po/Makefile.in
+AC_CONFIG_FILES([ po/Makefile.in
Makefile
win32/Makefile
a11y/Makefile
@@ -2103,6 +2101,8 @@ evolution-shell.pc
evolution-plugin.pc
])
+AC_OUTPUT
+
if test "x$with_sub_version" != "x"; then
echo "
Evolution ($with_sub_version) has been configured as follows: "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
