Blame irstlm-configure.patch

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