loolwsd/Makefile.am | 2 ++ loolwsd/README | 5 ++--- loolwsd/configure.ac | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-)
New commits: commit cc3ee1033b449349c4f1677acb453270bac5566b Author: Jan Holesovsky <[email protected]> Date: Tue Apr 12 09:39:53 2016 +0200 Make the autotools steps reliable. diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am index d674e55..41d58c8 100644 --- a/loolwsd/Makefile.am +++ b/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 diff --git a/loolwsd/README b/loolwsd/README index 618fe6c..e085889 100644 --- a/loolwsd/README +++ b/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 diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index bd33091..373f94d 100644 --- a/loolwsd/configure.ac +++ b/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 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
