--- configure.ac.orig	2015-12-09 16:31:15.000000000 -0700
+++ configure.ac	2016-01-07 20:08:02.431208996 -0700
@@ -1,52 +1,50 @@
-AC_INIT([irstlm], [5.80.06])
+AC_INIT([irstlm], [6.00.05])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_PROG_CXX
-AC_PROG_LIBTOOL
+AM_PROG_AR
+LT_INIT
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-m4_pattern_allow([AM_PROG_AR],[AM_PROG_AR])
-AM_PROG_AR
-
 AC_ARG_ENABLE([doc],
-   [AC_HELP_STRING([--enable-doc|--disable-doc], [Enable or Disable (default) creation of documentation])])
+   [AS_HELP_STRING([--enable-doc|--disable-doc], [Enable or Disable (default) creation of documentation])])
 
 AC_ARG_ENABLE([trace],
-   [AC_HELP_STRING([--enable-trace|--disable-trace], [Enable (default) or Disable trace info at run-time])])
+   [AS_HELP_STRING([--enable-trace|--disable-trace], [Enable (default) or Disable trace info at run-time])])
 
 AC_ARG_ENABLE([assert],
-   [AC_HELP_STRING([--enable-assert|--disable-assert], [Enable (default) or Disable assert calls at run-time])])
+   [AS_HELP_STRING([--enable-assert|--disable-assert], [Enable (default) or Disable assert calls at run-time])])
 
 AC_ARG_ENABLE([debugging],
-   [AC_HELP_STRING([--enable-debugging|--disable-debugging], [Enable or Disable (default) debugging info ("-g -O2")])])
+   [AS_HELP_STRING([--enable-debugging|--disable-debugging], [Enable or Disable (default) debugging info ("-g -O2")])])
 
 AC_ARG_ENABLE(profiling,
-   [AC_HELP_STRING([--enable-profiling|--disable-profiling], [Enable or Disable (default) profiling info ("-pg")])])
+   [AS_HELP_STRING([--enable-profiling|--disable-profiling], [Enable or Disable (default) profiling info ("-pg")])])
 
 AC_ARG_ENABLE(caching,
-   [AC_HELP_STRING([--enable-caching|--disable-caching], [Enable or Disable (default) internal caches to store probs and other info])])
+   [AS_HELP_STRING([--enable-caching|--disable-caching], [Enable or Disable (default) internal caches to store probs and other info])])
 
 AC_ARG_ENABLE(output,
-   [AC_HELP_STRING([--enable-output|--disable-output], [Enable (default) or Disable part of the output])])
+   [AS_HELP_STRING([--enable-output|--disable-output], [Enable (default) or Disable part of the output])])
 
 AC_ARG_ENABLE(interpolatedsearch,
-   [AC_HELP_STRING([--enable-interpolatedsearch|--disable-interpolatedsearch], [Enable or Disable (default) interpolated search for n-grams])])
+   [AS_HELP_STRING([--enable-interpolatedsearch|--disable-interpolatedsearch], [Enable or Disable (default) interpolated search for n-grams])])
 
 AC_ARG_ENABLE(optimization,
-   [AC_HELP_STRING([--enable-optimization|--disable-optimization], [Enable or Disable (default) optimization info ("-O3")])])
+   [AS_HELP_STRING([--enable-optimization|--disable-optimization], [Enable or Disable (default) optimization info ("-O3")])])
 
 AC_ARG_ENABLE(cxx0,
-   [AC_HELP_STRING([--enable-cxx0|--disable-cxx0], [Enable or Disable (default) c++0x dialect ("-std=c++0x")])])
+   [AS_HELP_STRING([--enable-cxx0|--disable-cxx0], [Enable or Disable (default) c++0x dialect ("-std=c++0x")])])
 
 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=VAL], [(optional) level of tracing; default 0, tracing disabled])],
+            [AS_HELP_STRING([--with-tracelevel=VAL], [(optional) level of tracing; default 0, tracing disabled])],
             [with_tracelevel=$withval],
             [with_tracelevel=0]
            )
@@ -163,7 +161,7 @@
 if test "x$enable_cxx0" != 'xno'
 then
     AC_MSG_NOTICE([c++x0 dialect is enabled (default), compilation with "-DHAVE_CXX0 -std=c++0x "])
-    CPPFLAGS="$CPPFLAGS -DHAVE_CXX0 -std=c++0x";
+    CPPFLAGS="$CPPFLAGS -DHAVE_CXX0 -std=c++11";
 else
     AC_MSG_NOTICE([c++x0 dialect is disabled, compilation without "-std=c++0x" and with "-UHAVE_CXX0"])
     CPPFLAGS="$CPPFLAGS -UHAVE_CXX0";
--- Makefile.am.orig	2015-12-09 16:31:15.000000000 -0700
+++ Makefile.am	2016-01-07 20:49:28.446318888 -0700
@@ -10,9 +10,5 @@
 
 LN_S=@LN_S@
 
-install-exec-hook:
-	cd ${exec_prefix}/ && \
-	  ${LN_S} -n -f lib lib64
-
 dist-hook:
 	rm -rf `find $(distdir)/doc -type d -name .svn`