rendered paste bodydiff --git configure.ac configure.acindex 84c916f..ff3aa1e 100644--- configure.ac+++ configure.ac@@ -20,10 +20,13 @@ m4_define([upgrade_revision], [0]) # Autoconf / Automake Initialization AC_PREREQ(2.58)-AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)+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)+AC_CONFIG_HEADERS([config.h])+AC_CONFIG_SRCDIR([README])++dnl This is for the autoconf tests only - it set's the language we use+AC_LANG([C]) # Automake 1.11 - Silent Build Rules m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])@@ -110,7 +113,8 @@ AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)] AC_SUBST([UPGRADE_REVISION],[upgrade_revision]) AC_DEFINE_UNQUOTED(UPGRADE_REVISION, ["$UPGRADE_REVISION"], [The number of times we've upgraded since the BASE_VERSION release]) -AC_ISC_POSIX+AC_SEARCH_LIBS([strerror],[cposix])+AC_CHECK_HEADERS([unistd.h]) AC_PROG_CC AC_PROG_CPP AC_C_INLINE@@ -119,13 +123,11 @@ AC_PROG_YACC AC_PROG_AWK AC_PATH_PROG([PERL], [perl]) AC_SUBST(PERL)- case $YACC in *yacc*) AC_MSG_ERROR([You need bison to build Evolution]) ;; esac-AC_HEADER_STDC AC_ARG_PROGRAM AC_PROG_INSTALL AC_PROG_LN_S@@ -142,7 +144,7 @@ AM_CONDITIONAL(HAVE_JW, [test x$HAVE_JW = xyes]) AC_SUBST(HAVE_JW) dnl I18N stuff-AC_PROG_INTLTOOL([0.35.5])+IT_PROG_INTLTOOL([0.35.5]) AM_GLIB_GNU_GETTEXT @@ -154,6 +156,9 @@ localedir='$(prefix)/$(DATADIRNAME)/locale' AC_SUBST(localedir) dnl Initialize libtool+dnl if switch to libtool >= 2.2, replace existing with following:+dnl LT_PREREQ(2.2)+dnl LT_INIT(disable-static win32-dll) AM_DISABLE_STATIC AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL@@ -252,14 +257,15 @@ save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$CFLAGS $ICONV_CFLAGS" LIBS="$LIBS $ICONV_LIBS -liconv"-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv,- AC_TRY_LINK([-#include <iconv.h>-#include <stdlib.h>],[+AC_CACHE_CHECK([for iconv in -liconv], [ac_cv_libiconv],+ AC_LINK_IFELSE([AC_LANG_PROGRAM(+ [[ #include <iconv.h>+ #include <stdlib.h> ]],+ [[ iconv_t cd; cd = iconv_open ("UTF-8", "ISO-8859-1");- exit (0);-], [ac_cv_libiconv=yes], [ac_cv_libiconv=no]))+ ]]+ )],[ac_cv_libiconv=yes],[ac_cv_libiconv=no])) if test $ac_cv_libiconv = yes; then ICONV_LIBS="$ICONV_LIBS -liconv"@@ -279,40 +285,38 @@ if test $have_iconv = yes; then if test $ac_cv_libiconv = no; then AC_CHECK_FUNCS(gnu_get_libc_version) fi- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([-#include <iconv.h>-#include <stdlib.h>-#include <string.h>-#ifdef HAVE_GNU_GET_LIBC_VERSION-#include <gnu/libc-version.h>-#endif--int main (int argc, char **argv)-{- char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";- char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";- char *transbuf = malloc (10), *trans = transbuf;- iconv_t cd;- size_t jp_len = strlen (jp), utf8_len = 10;- size_t utf8_real_len = strlen (utf8);--#ifdef HAVE_GNU_GET_LIBC_VERSION- /* glibc 2.1.2's iconv is broken in hard to test ways. */- if (!strcmp (gnu_get_libc_version (), "2.1.2"))- exit (1);-#endif+AC_CACHE_CHECK([if iconv() handles UTF-8], [ac_cv_libiconv_utf8],+ AC_RUN_IFELSE([AC_LANG_SOURCE([[+ #include <iconv.h>+ #include <stdlib.h>+ #include <string.h>+ #if HAVE_GNU_GET_LIBC_VERSION+ #include <gnu/libc-version.h>+ #endif+ int main() {+ char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";+ char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";+ char *transbuf = malloc (10), *trans = transbuf;+ iconv_t cd;+ size_t jp_len = strlen (jp), utf8_len = 10;+ size_t utf8_real_len = strlen (utf8); - cd = iconv_open ("UTF-8", "ISO-2022-JP");- if (cd == (iconv_t) -1)- exit (1);- if (iconv (cd, &jp, &jp_len, &trans, &utf8_len) == -1 || jp_len != 0-)- exit (1);- if (memcmp (utf8, transbuf, utf8_real_len) != 0)- exit (1);+ #if HAVE_GNU_GET_LIBC_VERSION+ /* glibc 2.1.2's iconv is broken in hard to test ways. */+ if (!strcmp (gnu_get_libc_version (), "2.1.2"))+ exit (1);+ #endif - exit (0);-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=hopefully]))+ cd = iconv_open ("UTF-8", "ISO-2022-JP");+ if (cd == (iconv_t) -1)+ exit (1);+ if (iconv (cd, &jp, &jp_len, &trans, &utf8_len) == -1 || jp_len != 0)+ exit (1);+ if (memcmp (utf8, transbuf, utf8_real_len) != 0)+ exit (1);+ return (0);}+ ]])+ ],[ac_cv_libiconv_utf8=yes],[ac_cv_libiconv_utf8=no; have_iconv=no],[ac_cv_libiconv_utf8=hopefully])) fi if test "$have_iconv" = no; then@@ -324,21 +328,20 @@ AC_SUBST(ICONV_LIBS) CFLAGS="$CFLAGS -I$srcdir" 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([not found])- AC_WARN([- *** The iconv-detect program was unable to determine the- *** preferred charset name formats recognized by your- *** iconv library. It is suggested that you install a- *** working iconv library such as the one found at- *** ftp://ftp.gnu.org/pub/gnu/libiconv-])],[- if test x$os_win32 = xyes; then+AC_RUN_IFELSE([AC_LANG_SOURCE([[+ #define CONFIGURE_IN+ #include "iconv-detect.c"+ ]])],+ [AC_MSG_RESULT([found])],+ [AC_MSG_RESULT([not found])+ AC_MSG_WARN([+ *** The iconv-detect program was unable to determine the+ *** preferred charset name formats recognized by your+ *** iconv library. It is suggested that you install a+ *** working iconv library such as the one found at+ *** ftp://ftp.gnu.org/pub/gnu/libiconv+ ])],+ [if test x$os_win32 = xyes; then AC_MSG_RESULT([using known win32 result]) echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h echo >>iconv-detect.h@@ -347,11 +350,11 @@ AC_TRY_RUN([ echo '#define ICONV_10646 "UCS-4BE"' >>iconv-detect.h else AC_MSG_RESULT([unknown])- AC_WARN([- *** We can't determine the preferred charset name formats- *** recognized by your iconv library. You are- *** cross-compiling and supposed to know what you are doing.- *** Please construct the iconv-detect.h file manually.+ AC_MSG_WARN([+ *** We can't determine the preferred charset name formats+ *** recognized by your iconv library. You are+ *** cross-compiling and supposed to know what you are doing.+ *** Please construct the iconv-detect.h file manually. ]) fi ])@@ -359,26 +362,33 @@ AC_TRY_RUN([ CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" -dnl alloca()-AC_CHECK_HEADERS(alloca.h) -dnl waitpid() etc-AC_CHECK_HEADERS(sys/wait.h)+dnl Check for proper alloca()+AC_FUNC_ALLOCA++dnl Check for POSIX compatible sys/wait.h+AC_HEADER_SYS_WAIT if test x$os_win32 != xyes; then dnl check for socklen_t (in Unix98) 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_TRY_COMPILE([#include <sys/types.h>- #include <sys/socket.h>- int accept (int, struct sockaddr *, 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_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[]],+ [[socklen_t x;]])],+ [AC_MSG_RESULT([yes])],++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[+ #include <sys/types.h>+ #include <sys/socket.h>+ ]]+ [[+ int accept (int, struct sockaddr *, 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_DEFINE(socklen_t,int)])]) fi @@ -400,35 +410,33 @@ AM_CONDITIONAL(ENABLE_TEST_COMPONENT, [test x$enable_test_comp = xyes]) dnl *************** dnl Timezone checks dnl ***************-AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,- AC_TRY_COMPILE([- #include <time.h>- ], [- struct tm tm;+AC_CACHE_CHECK(for tm_gmtoff in struct tm, [ac_cv_struct_tm_gmtoff],+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include <time.h> ]],+ [[ struct tm tm; tm.tm_gmtoff = 1;- ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))+ ]]+ )],[ac_cv_struct_tm_gmtoff=yes],[ac_cv_struct_tm_gmtoff=no])) if test $ac_cv_struct_tm_gmtoff = yes; then AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if struct tm has a tm_gmtoff member]) else- AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,- AC_TRY_COMPILE([- #include <time.h>- ], [- timezone = 1;- ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))+ AC_CACHE_CHECK(for timezone variable, [ac_cv_var_timezone],+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include <time.h> ]],+ [[ timezone = 1; ]]+ )],[ac_cv_var_timezone=yes],[ac_cv_var_timezone=no])) if test $ac_cv_var_timezone = yes; then AC_DEFINE(HAVE_TIMEZONE, 1, [Define if libc defines a timezone variable])- AC_CACHE_CHECK(for altzone variable, ac_cv_var_altzone,- AC_TRY_COMPILE([- #include <time.h>- ], [- altzone = 1;- ], ac_cv_var_altzone=yes, ac_cv_var_altzone=no))+ AC_CACHE_CHECK(for altzone variable, [ac_cv_var_altzone],+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include <time.h> ]],+ [[ altzone = 1; ]]+ )],[ac_cv_var_altzone=yes],[ac_cv_var_altzone=no])) if test $ac_cv_var_altzone = yes; then AC_DEFINE(HAVE_ALTZONE, 1, [Define if libc defines an altzone variable]) fi else- AC_ERROR(unable to find a way to determine timezone)+ AC_MSG_ERROR([unable to find a way to determine timezone]) fi fi @@ -439,19 +447,14 @@ dnl ************************************************** dnl ctime_r prototype dnl ************************************************** -AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,+AC_CACHE_CHECK([if ctime_r wants three arguments], [ac_cv_ctime_r_three_args], [- AC_TRY_COMPILE([- #include <time.h>- ],[- char *buf;+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include <time.h> ]],+ [[ char *buf; time_t date;- ctime_r (&date, buf, 100);- ],[- ac_cv_ctime_r_three_args=yes- ],[- ac_cv_ctime_r_three_args=no- ])+ ctime_r (&date, buf, 100); ]]+ )],[ac_cv_ctime_r_three_args=yes],[ac_cv_ctime_r_three_args=no]) ]) if test x"$ac_cv_ctime_r_three_args" = xyes ; then@@ -463,28 +466,24 @@ dnl gethostbyname_r prototype dnl ************************************************** AC_CHECK_FUNCS(gethostbyname_r,[-AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_five_args,+AC_CACHE_CHECK([if gethostbyname_r wants five arguments], [ac_cv_gethostbyname_r_five_args], [- AC_TRY_COMPILE([+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> - #define BUFSIZE (sizeof(struct hostent)+10)- ],[+ #define BUFSIZE (sizeof(struct hostent)+10) ]],+ [[ struct hostent hent; char buffer[BUFSIZE]; int bufsize=BUFSIZE; int h_errno;-- (void)gethostbyname_r ("www.ximian.com", &hent, buffer, bufsize, &h_errno);- ],[- ac_cv_gethostbyname_r_five_args=yes- ],[- ac_cv_gethostbyname_r_five_args=no- ])+ (void)gethostbyname_r ("www.ximian.com", &hent, buffer, bufsize, &h_errno); ]]+ )],[ac_cv_gethostbyname_r_five_args=yes],[ac_cv_gethostbyname_r_five_args=no]) ])]) if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then@@ -496,28 +495,24 @@ dnl gethostbyaddr_r prototype dnl ************************************************** AC_CHECK_FUNCS(gethostbyaddr_r,[-AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], ac_cv_gethostbyaddr_r_seven_args,+AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], [ac_cv_gethostbyaddr_r_seven_args], [- AC_TRY_COMPILE([+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h>- #define BUFSIZE (sizeof(struct hostent)+10)- ],[+ ]],+ [[ struct hostent hent; char buffer[BUFSIZE]; int bufsize=BUFSIZE; int h_errno;-- (void)gethostbyaddr_r ("www.ximian.com", 14, AF_INET, &hent, buffer, bufsize, &h_errno);- ],[- ac_cv_gethostbyaddr_r_seven_args=yes- ],[- ac_cv_gethostbyaddr_r_seven_args=no- ])+ (void)gethostbyaddr_r ("www.ximian.com", 14, AF_INET, &hent, buffer, bufsize, &h_errno); ]]+ )],[ac_cv_gethostbyaddr_r_seven_args=yes],[ac_cv_gethostbyaddr_r_seven_args=no]) ])]) if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then@@ -528,10 +523,25 @@ dnl ************************************************** dnl stat(v)fs location/type dnl ************************************************** -AC_CHECK_HEADERS(sys/statvfs.h)+AC_CHECK_HEADERS([sys/statvfs.h],[],[],+ [[+ #if #HAVE_SYS_STATVFS_H+ #include <sys/statvfs.h>+ #endif+ ]]) AC_CHECK_FUNCS(statvfs)-AC_CHECK_HEADERS(sys/param.h)-AC_CHECK_HEADERS(sys/mount.h)+AC_CHECK_HEADERS([sys/param.h],[],[],+ [[+ #if #HAVE_SYS_PARAM_H+ #include <sys/param.h>+ #endif+ ]])+AC_CHECK_HEADERS([sys/mount.h],[],[],+ [[+ #if #HAVE_SYS_MOUNT_H+ #include <sys/mount.h>+ #endif+ ]]) AC_CHECK_FUNCS(statfs) dnl **************************************************@@ -552,10 +562,9 @@ dnl ************************************************** have_xfree=no AC_COMPILE_IFELSE([ #include <X11/XF86keysym.h>- int main(int argc,char **argv) {+ int main() { return 0;- }- ],+ }], have_xfree=yes ) AC_MSG_CHECKING([for X11 XFree86 headers])@@ -734,24 +743,22 @@ if test "x$enable_pilot_conduits" = "xyes"; then 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>+ AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8],+ AC_RUN_IFELSE([AC_LANG_SOURCE(+ [[ #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);+ int main (){+ 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);+ return (0); }- ],- [ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no]))+ ]]+ )],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no])) CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save"@@ -821,13 +828,16 @@ if test "x${with_krb5}" != "xno"; then 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",+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context,])],+ [ac_cv_lib_kerberos5="$mitlibs"], [ LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs",+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],+ [ac_cv_lib_kerberos5="$heimlibs"], [ LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs"- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no")+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb5_init_context])],+ [ac_cv_lib_kerberos5="$sunlibs"], [ac_cv_lib_kerberos5="no"]) ]) ]) LDFLAGS="$LDFLAGS_save"@@ -868,8 +878,16 @@ else 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])])-AC_CHECK_HEADER([com_err.h],[AC_DEFINE([HAVE_COM_ERR_H], 1, [Have comm_err.h])])+AC_CHECK_HEADER([et/com_err.h],,,+[[#if HAVE_ET_COM_ERR_H+#include <et/com_err.h>+#endif+]])+AC_CHECK_HEADER([com_err.h],,,+[[#if HAVE_ET_COM_ERR_H+#include <com_err.h>+#endif+]]) msg_krb4="no" if test "x${with_krb4}" != "xno"; then@@ -881,20 +899,24 @@ if test "x${with_krb4}" != "xno"; then mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err" # Look for MIT krb5 compat krb4 LDFLAGS="$LDFLAGS -L$with_krb4_libs $mitcompatlibs"- AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs")+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],+ [ac_cv_lib_kerberos4="$mitcompatlibs"]) if test "$ac_cv_lib_kerberos4" = "no"; then # Look for KTH krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"- AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken")+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],+ [ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"]) fi if test "$ac_cv_lib_kerberos4" = "no"; then # Look for old MIT krb4 LDFLAGS="$LDFLAGS_save -L$with_krb4_libs -lkrb"- AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb",+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],+ [ac_cv_lib_kerberos4="-lkrb"], [ LDFLAGS="$LDFLAGS -ldes"- AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes")+ AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],+ [ac_cv_lib_kerberos4="-lkrb -ldes"]) ]) fi ])@@ -917,9 +939,11 @@ if test "x${with_krb4}" != "xno"; then CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $KRB4_CFLAGS"- AC_TRY_COMPILE([#include "krb.h"- int krb_sendauth;- ],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],)+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(+ [[ #include "krb.h"+ int krb_sendauth;+ ]]+ ,[[]])],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],[]) CFLAGS="$CFLAGS_save" fi else@@ -1087,7 +1111,13 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_MSG_RESULT([""]) CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"- AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ])+ AC_CHECK_HEADERS([nspr.h prio.h],[ moz_nspr_includes="yes" ],,+ [[+ #if HAVE_NSPR_H+ #include <nspr.h>+ #include <prio.h>+ #endif+ ]]) CPPFLAGS="$CPPFLAGS_save" if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then@@ -1129,7 +1159,8 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LDFLAGS="$LDFLAGS" fi - AC_TRY_LINK_FUNC(PR_Init, ac_cv_moz_nspr_libs="yes", ac_cv_moz_nspr_libs="no")+ AC_LINK_IFELSE([AC_LANG_CALL([], [PR_Init])],+ [ac_cv_moz_nspr_libs="yes"], [ac_cv_moz_nspr_libs="no"]) CFLAGS="$CFLAGS_save" LDFLAGS="$LDFLAGS_save" LIBS="$LIBS_save"@@ -1159,7 +1190,13 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then AC_CHECK_HEADERS(nss.h ssl.h smime.h, [ have_nss_includes="yes" ],- [ have_nss_includes="no" ])+ [ have_nss_includes="no" ],+ [ #if HAVE_NSPR_H+ #include <nss.h>+ #include <ssl.h>+ #include <smime.h>+ #endif+ ]) CPPFLAGS="$CPPFLAGS_save" @@ -1200,11 +1237,13 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then LIBS_save="$LIBS" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" LIBS="$nsslibs $nsprlibs"- AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")+ AC_LINK_IFELSE([AC_LANG_CALL([], [NSS_Init])],+ [ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"]) if test "$ac_cv_moz_nss_libs" = no; then nsslibs="-lssl3 -lsmime3 -lnss3" LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"- AC_TRY_LINK_FUNC(NSS_Init, ac_cv_moz_nss_libs="yes", ac_cv_moz_nss_libs="no")+ AC_LINK_IFELSE([AC_LANG_CALL([], [NSS_Init])],+ [ac_cv_moz_nss_libs="yes"], [ac_cv_moz_nss_libs="no"]) fi LDFLAGS="$LDFLAGS_save" LIBS="$LIBS_save"@@ -1302,6 +1341,7 @@ fi dnl ****************************** dnl OpenSSL dnl ******************************+dnl Warning : This stuff is unmaintained! dnl only continue detecting OpenSSL if we haven't already found all of the dnl Mozilla libnss includes/libraries and if user actually wants ssl support@@ -1448,8 +1488,19 @@ FULL_GNOME_DEPS="libbonoboui-2.0 gconf-2.0 gthread-2.0 gobject-2.0 libgnomeui-2. CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`"-AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h)-AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h)+AC_CHECK_HEADERS([libgnomeui/gnome-icon-lookup.h],[],[],+ [[+ #if HAVE_LIBGNOMEUI_GNOME_ICON_LOOKUP_H+ #include <libgnomeui/gnome-icon-lookup.h>+ #endif+ ]])++AC_CHECK_HEADERS([libgnomeui/gnome-thumbnail.h],[],[],+ [[+ #if HAVE_LIBGNOMEUI_GNOME_THUMBNAIL_H+ #include <libgnomeui/gnome-thumbnail.h>+ #endif+ ]]) CPPFLAGS="$CPPFLAGS_save" PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"])@@ -1463,17 +1514,19 @@ else fi AC_MSG_CHECKING([for yTNEF])-AC_TRY_COMPILE([#include <stdio.h>- #include <ytnef.h>],- [TNEFStruct *tnef;], tnef_ok=yes, tnef_ok=no)+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[+ #include <stdio.h>+ #include <ytnef.h> ]],+ [[TNEFStruct *tnef;]])],[tnef_ok=yes],[tnef_ok=no]) if test "$tnef_ok" = "yes"; then AC_MSG_RESULT([yes]) TNEF_ATTACHMENTS="tnef-attachments" TNEF_CFLAGS="-DHAVE_YTNEF_H" else- AC_TRY_COMPILE([#include <stdio.h>- #include <libytnef/ytnef.h>],- [TNEFStruct *tnef;], tnef_ok=yes, tnef_ok=no)+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[+ #include <stdio.h>+ #include <libytnef/ytnef.h>]],+ [[TNEFStruct *tnef;]])],[tnef_ok=yes],[tnef_ok=no]) if test "$tnef_ok" = "yes"; then AC_MSG_RESULT([yes]) TNEF_ATTACHMENTS="tnef-attachments"