--- pidgin-otr-4.0.2/configure.ac
+++ pidgin-otr-4.0.2/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce configure.
 
-AC_INIT(pidgin-otr, 4.0.2)
+AC_INIT([pidgin-otr],[4.0.2])
 
 AM_CONFIG_HEADER(config.h)
 
@@ -9,6 +9,10 @@
 
 AM_INIT_AUTOMAKE([-Wall -Werror])
 
+AC_CONFIG_MACRO_DIR([m4])
+AM_GNU_GETTEXT(external)
+AM_GNU_GETTEXT_VERSION(0.22)
+
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AC_PROG_CC
@@ -22,7 +26,7 @@
 
 PKG_CHECK_MODULES([EXTRA], [glib-2.0 >= 2.6 gtk+-2.0 >= 2.6 pidgin >= 2.0 purple >= 2.0])
 
-AC_PROG_INTLTOOL
+IT_PROG_INTLTOOL
 
 GETTEXT_PACKAGE=pidgin-otr
 AC_SUBST(GETTEXT_PACKAGE)
@@ -38,9 +42,7 @@
   AC_CACHE_CHECK([whether the compiler accepts $1], VAR, [
     otr_saved_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -pedantic -Werror $1"
-    AC_TRY_COMPILE([], [return 0;],
-                   [AS_VAR_SET(VAR,yes)],
-                   [AS_VAR_SET(VAR,no)])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET(VAR,yes)],[AS_VAR_SET(VAR,no)])
     CFLAGS="$otr_saved_CFLAGS"
   ])
   if test x$VAR = xyes; then
@@ -64,9 +66,7 @@
     AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>], [fputs("", stdout)])],
                   [AS_VAR_SET(VAR,yes)],
                   [AS_VAR_SET(VAR,no)],
-           [AC_TRY_LINK([], [return 0;],
-                                   [AS_VAR_SET(VAR,yes)],
-                                   [AS_VAR_SET(VAR,no)])])
+           [AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[AS_VAR_SET(VAR,yes)],[AS_VAR_SET(VAR,no)])])
     CFLAGS="$otr_saved_CFLAGS"
     LDFLAGS="$otr_saved_LDFLAGS"
     LIBS="$otr_saved_LIBS"
@@ -166,4 +166,5 @@
     OTR_CHECK_LDFLAGS(-z relro -z now, "$all_ldflags_for_check", "$all_libs_for_check")
 fi
 
-AC_OUTPUT([Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile po/Makefile.in])
+AC_OUTPUT