rendered paste bodydiff --git acinclude.m4 acinclude.m4index fa7fc5c..2cd23b2 100644--- acinclude.m4+++ 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