--- trunk/configure.in.orig	2014-08-11 07:16:55.000000000 -0600
+++ trunk/configure.in	2014-09-09 12:30:00.000000000 -0600
@@ -1,22 +1,24 @@
-AC_INIT(src)
+AC_INIT([irstlm], [5.80.06])
+AC_CONFIG_SRCDIR([src])
 
 CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS"
 CXXFLAGS="$CXXFLAGS"
 
 AC_PREFIX_DEFAULT(/usr/local/irstlm)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(irstlm, 5.70.03)
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE
 WEBSITE="http://hlt.fbk.eu/en/irstlm"
 
 AC_CONFIG_MACRO_DIR([m4])
 
+AM_PROG_AR
 AC_PROG_CXX
 AC_PROG_CXXCPP
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 
 AC_DISABLE_SHARED 
-AC_PROG_LIBTOOL
+LT_INIT
 # Shared library are disabled for default
 #LT_INIT([disable-shared])
 
@@ -30,28 +32,28 @@
     AS_HELP_STRING([--enable-debugging|--disable-debugging], [Enable or Disable (default) compilation with debugging "-g -O2" info]))
 
 AC_ARG_ENABLE(profiling,
-            [AC_HELP_STRING([--enable-profiling|--disable-profiling], [Enable or Disable (default) profiling info])])
+            [AS_HELP_STRING([--enable-profiling|--disable-profiling], [Enable or Disable (default) profiling info])])
 
 AC_ARG_ENABLE(traincaching,
-            [AC_HELP_STRING([--enable-traincaching|--disable-traincaching], [Enable or Disable (default) the usage of caching in training])])
+            [AS_HELP_STRING([--enable-traincaching|--disable-traincaching], [Enable or Disable (default) the usage of caching in training])])
 
 AC_ARG_ENABLE(caching,
-            [AC_HELP_STRING([--enable-caching|--disable-caching], [Enable or Disable (default) the usage prob caches to store probs and other info])])
+            [AS_HELP_STRING([--enable-caching|--disable-caching], [Enable or Disable (default) the usage prob caches to store probs and other info])])
 
 AC_ARG_ENABLE(interpsearch,
-            [AC_HELP_STRING([--enable-interpsearch|--disable-interpsearch], [Enable or Disable (default) the use interpolated search to retrieve n-grams])])
+            [AS_HELP_STRING([--enable-interpsearch|--disable-interpsearch], [Enable or Disable (default) the use interpolated search to retrieve n-grams])])
 
 AC_ARG_ENABLE(optimization,
-            [AC_HELP_STRING([--enable-optimization|--disable-optimization], [Enable or Disable (default) compilation with optimization -O3 flag])])
+            [AS_HELP_STRING([--enable-optimization|--disable-optimization], [Enable or Disable (default) compilation with optimization -O3 flag])])
 
 AC_ARG_WITH(zlib,
-            [AC_HELP_STRING([--with-zlib=PATH], [(optional) path to zlib])],
+            [AS_HELP_STRING([--with-zlib=PATH], [(optional) path to zlib])],
             [with_zlib=$withval],
             [with_zlib=no]
            )
 
 AC_ARG_WITH(traceLevel,
-            [AC_HELP_STRING([--with-traceLevel=INT], [(optional) level of tracing; 0 disable tracing, 1 (default) or higher enable increasing tracing])],
+            [AS_HELP_STRING([--with-traceLevel=INT], [(optional) level of tracing; 0 disable tracing, 1 (default) or higher enable increasing tracing])],
             [with_traceLevel=$withval],
             [with_traceLevel=1]
            )
@@ -150,6 +152,6 @@
 
 AC_SUBST(transform,'s/_lm/-lm/')
 
-AC_OUTPUT()
+AC_OUTPUT
 
 AC_MSG_NOTICE([The software will be installed into $prefix])