[evolution-patches] [evolution]: autoreconf fixes

[Tomasz Kłoczko <kloczek zie pg gda pl>]

Please aprove or refuse for commit (I have RW in CVS tree).
Description inside patch.

kloczek
--
-----------------------------------------------------------
*Ludzie nie mają problemów, tylko sobie sami je stwarzają*
-----------------------------------------------------------
Tomasz Kłoczko, sys adm @zie.pg.gda.pl|*e-mail: kloczek rudy mif pg gda pl*

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.768
diff -u -r1.768 configure.in
--- configure.in	11 Jan 2005 13:55:10 -0000	1.768
+++ configure.in	11 Jan 2005 17:35:30 -0000
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.1.3, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT([evolution],[2.1.3],[http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution])
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -59,7 +59,7 @@
 	AC_MSG_ERROR(You need bison to build Evolution)
 	;;
 esac
-AC_STDC_HEADERS
+AC_HEADER_STDC([])
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -97,11 +97,11 @@
 
 dnl check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([#include <sys/types.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 #include <sys/socket.h>
 socklen_t x;
-],[],[AC_MSG_RESULT(yes)],[
-AC_TRY_COMPILE([#include <sys/types.h>
+]], [[]])],[AC_MSG_RESULT(yes)],[
+_au_changequote([,])AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
 ],[],[
@@ -170,34 +170,34 @@
 dnl Timezone checks
 dnl ***************
 AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-	AC_TRY_COMPILE([
+	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([
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 			#include <time.h>
-		], [
+		]], [[
 			timezone = 1;
-		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+		]])],[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([
+			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 				#include <time.h>
-			], [
+			]], [[
 				altzone = 1;
-			], ac_cv_var_altzone=yes, ac_cv_var_altzone=no))
+			]])],[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
 
@@ -210,13 +210,13 @@
 
 AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,
 [
-	AC_TRY_COMPILE([
+	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
@@ -234,7 +234,7 @@
 AC_CHECK_FUNCS(gethostbyname_r,[
 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>
@@ -242,14 +242,14 @@
 		#include <netdb.h>
 
 		#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
@@ -267,7 +267,7 @@
 AC_CHECK_FUNCS(gethostbyaddr_r,[
 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>
@@ -275,14 +275,14 @@
 		#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
@@ -320,14 +320,14 @@
 dnl **************************************************
 AC_CACHE_CHECK([if system supports getaddrinfo and getnameinfo], have_addrinfo,
 [
-	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>
 
-	],[
+	]], [[
 		struct addrinfo hints, *res;
 		struct sockaddr_in6 sin6;
 		int af = AF_INET6;
@@ -337,7 +337,7 @@
 		getaddrinfo ("www.ximian.com", NULL, &hints, &res);
 		freeaddrinfo (res);
 		getnameinfo((struct sockaddr *)&sin6, sizeof(sin6), host, sizeof(host), serv, sizeof(serv), 0);
-	],[
+	]])],[
 		have_addrinfo=yes
 	],[
 		have_addrinfo=no
@@ -347,7 +347,7 @@
 if test x"$have_addrinfo" = "xno" ; then
    AC_DEFINE(NEED_ADDRINFO,1,[Enable getaddrinfo emulation])
    if test x"$enable_ipv6" = "xyes" ; then
-      AC_ERROR(system doesn't support necessary interfaces for ipv6 support)
+      AC_MSG_ERROR([system doesn't support necessary interfaces for ipv6 support])
    fi
    msg_ipv6=no
 else
@@ -355,20 +355,20 @@
    if test x"$enable_ipv6" = "xyes"; then
         msg_ipv6=yes
 	AC_DEFINE(ENABLE_IPv6,1,[Enable IPv6 support])
-	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>
 
-	],[
+	]], [[
 		struct addrinfo hints;
 		
 		hints.ai_flags = AI_ADDRCONFIG;
-	],[
+	]])],[
 		AC_DEFINE(HAVE_AI_ADDRCONFIG,1,[Define if the system defines the AI_ADDRCONFIG flag for getaddrinfo])
-	])
+	],[])
    else
 	msg_ipv6=no
    fi
@@ -535,7 +535,7 @@
 	LDFLAGS_save="$LDFLAGS"
 	LDFLAGS="$LDFLAGS $GNOME_PILOT_LIBS"
 
-	AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([
+	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>
@@ -552,7 +552,7 @@
 
 	exit (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"
@@ -672,9 +672,9 @@
 		
 		CFLAGS_save="$CFLAGS"
 		CFLAGS="$CFLAGS $KRB4_CFLAGS"
-		AC_TRY_COMPILE([#include "krb.h"
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "krb.h"
 		int krb_sendauth;
-		],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],)
+		]], [[return 0]])],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],[])
 		CFLAGS="$CFLAGS_save"
 	fi
 else
@@ -1478,7 +1478,7 @@
 EVOLUTION_DIR=`(cd $srcdir; pwd)`
 AC_SUBST(EVOLUTION_DIR)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 a11y/Makefile
 a11y/addressbook/Makefile
@@ -1580,6 +1580,7 @@
 evolution-shell.pc
 evolution-plugin.pc
 ])
+AC_OUTPUT
 
 if test "x$with_sub_version" != "x"; then
 echo "