Dear Denis et al, attached are three very small patches for the build system that make xournal build also with automake-1.13 (where some features have been hard-obsoleted), and fix the usage of ar. It would be great to have these imported into master.
(For the interested, background for the automake stuff: http://www.flameeyes.eu/autotools-mythbuster/forwardporting/automake.html ) best, Andreas -- Andreas K. Huettel Gentoo Linux developer dilfri...@gentoo.org http://www.akhuettel.de/
>From 0a1f22f433addb3317b225c8e26c4268ce6df856 Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" <dilfri...@gentoo.org> Date: Wed, 1 May 2013 23:55:18 +0200 Subject: [PATCH] Let automake define AR, since it is used for libttsubset.a --- configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.in b/configure.in index ba827c7..a74f7ef 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC AC_PROG_RANLIB +AM_PROG_AR AC_HEADER_STDC LDFLAGS="$LDFLAGS -lz -lm" -- 1.8.2.1
>From 8f80915eade771f97eae8241adad9118c9144363 Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" <dilfri...@gentoo.org> Date: Thu, 2 May 2013 18:17:14 +0200 Subject: [PATCH] remove call to AM_PROG_CC_STDC obsolete in automake-1.13 --- configure.in | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.in b/configure.in index a74f7ef..664d933 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,6 @@ AM_MAINTAINER_MODE AC_ISC_POSIX AC_PROG_CC -AM_PROG_CC_STDC AC_PROG_RANLIB AM_PROG_AR AC_HEADER_STDC -- 1.8.2.1
>From ae2821f664b0615779638cdd1eca414e500e7f92 Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" <dilfri...@gentoo.org> Date: Tue, 30 Apr 2013 22:29:32 +0200 Subject: [PATCH] replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 52a07df..ba827c7 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) AM_INIT_AUTOMAKE(xournal, 0.4.7) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AM_MAINTAINER_MODE AC_ISC_POSIX -- 1.8.2.1
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with <2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________ Xournal-devel mailing list Xournal-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xournal-devel
