--- o/configure.ac	2011-08-09 23:16:48.000000000 +0200
+++ n/configure.ac	2012-02-24 00:50:00.998676744 +0100
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.57])
+AC_PREREQ([2.68])
 
 dnl Modify also RCVERSION variable when modifying release
-AC_INIT([tigervnc], [1.1.0], [http://www.tigervnc.org])
+AC_INIT([tigervnc],[1.1.0],[http://www.tigervnc.org])
 RCVERSION="1,1,0,0"
 AC_SUBST([RCVERSION])
 
@@ -98,17 +98,17 @@
 	SAVE_CPPFLAGS=${CPPFLAGS}
 	CPPFLAGS="${CPPFLAGS} ${GNUTLS_CFLAGS}"
 	AC_MSG_CHECKING([for GnuTLS library])
-	AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_global_init),
+	AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_global_init)],
 		       [GNUTLS_LIBS=${GNUTLS_LDFLAGS}
 			AC_DEFINE(HAVE_GNUTLS, 1, [Is gnutls present? ])
 			AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
 	AC_MSG_CHECKING([for gnutls_transport_set_global_errno() function])
-	AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_transport_set_global_errno),
+	AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_transport_set_global_errno)],
 		       AC_MSG_RESULT(yes),
 		       [AC_DEFINE(HAVE_OLD_GNUTLS, 1, [Does gnutls lack the gnutls_transport_set_global_errno() function? ])
 			AC_MSG_RESULT(no)])
 	AC_MSG_CHECKING([for gnutls_x509_crt_print() function])
-	AC_LINK_IFELSE(AC_LANG_CALL([], gnutls_x509_crt_print),
+	AC_LINK_IFELSE([AC_LANG_CALL([], gnutls_x509_crt_print)],
 		       [AC_DEFINE(HAVE_GNUTLS_X509_CRT_PRINT, 1, [Is the gnutls_x509_crt_print() function present? ])
 			AC_MSG_RESULT(yes)],
 			AC_MSG_RESULT(no))
@@ -172,13 +172,10 @@
 dnl gethostbyname, inet_addr, htons etc. Check if it's necessary.
 dnl NOTE: Did not want to use AC_SEARCH_LIBS which would add
 dnl   -lbsd to LIBS. We set INET_LIB instead.
-AC_LANG_SAVE
-AC_LANG_C
 AC_CHECK_FUNC(gethostbyname,INET_LIB_REQ=,INET_LIB_REQ=yes)
 if test "$INET_LIB_REQ" = yes; then
 	AC_CHECK_LIB(bsd,gethostbyname,INET_LIB=-lbsd,INET_LIB=)
 fi
-AC_LANG_RESTORE
 AC_SUBST(INET_LIB)
 
 AC_CHECK_FUNC(setenv, AC_DEFINE([HAVE_SETENV], [1], [Is setenv() present?]))
@@ -240,7 +237,7 @@
 AC_CONFIG_FILES([makemacpkg:release/makemacpkg.in])
 AC_CONFIG_FILES([maketarball:release/maketarball.in])
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 common/Makefile
 common/os/Makefile
@@ -262,3 +259,4 @@
 win/resdefs.h
 po/Makefile.in
 ])
+AC_OUTPUT