Make the autotools steps reliable.

loolwsd/Makefile.am

@@ -4,6 +4,8 @@ bin_PROGRAMS = loolwsd loolforkit loolmap loolmount
 
 dist_bin_SCRIPTS = loolwsd-systemplate-setup discovery.xml
 
+ACLOCAL_AMFLAGS = -I m4
+
 AM_CPPFLAGS = -pthread
 AM_LDFLAGS = -pthread -Wl,-E
 

loolwsd/README

@@ -28,11 +28,10 @@ Building
 loolwsd uses autoconf/automake, so especially when building from .git
 (as opposed to from a distribution tarball) you need the usual fun:
 
-    autoreconf
     libtoolize
+    aclocal
     automake --add-missing
-
-possibly iterating several times...
+    autoreconf
 
 and then
 

loolwsd/configure.ac

@@ -8,6 +8,8 @@ LT_INIT([disable-static])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
 
+AC_CONFIG_MACRO_DIR([m4])
+
 LOOLWSD_VERSION_MAJOR=`echo $VERSION | awk -F. '{print $1}'`
 LOOLWSD_VERSION_MINOR=`echo $VERSION | awk -F. '{print $2}'`
 LOOLWSD_VERSION_MICRO=`echo $VERSION | awk -F. '{print $3}'`
@@ -22,8 +24,6 @@ AC_DEFINE_UNQUOTED([LOOLWSD_VERSION],[["$LOOLWSD_VERSION"]],[LibreOffice On-Line
 
 AC_CONFIG_SRCDIR([LOOLWSD.cpp])
 
-AC_CONFIG_HEADERS([config.h])
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC