[eog-plugins] Require automake 1.11 and libtool 2.2



commit a546089df8d5eabed8305a8e67bb99241e60e0a5
Author: Felix Riemann <friemann gnome org>
Date:   Tue Jan 7 23:28:54 2014 +0100

    Require automake 1.11 and libtool 2.2
    
    Automake 1.11 was already required due to XZ support.
    eog dropped support for libtool 1.x already.

 autogen.sh   |    2 +-
 configure.ac |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 4230a9a..5bcb697 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,7 +17,7 @@ which gnome-autogen.sh || {
     exit 1
 }
 REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_AUTOMAKE_VERSION=1.11
 REQUIRED_INTLTOOL_VERSION=0.40.0
 REQUIRED_PKG_CONFIG_VERSION=0.16.0
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index bca8854..18c9251 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,17 +12,16 @@ AC_SUBST(EOG_PLUGINS_MAJOR)
 
 AC_PREREQ(2.59)
 
-AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip])
+AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip])
 # Support silencing the build output if supported (automake-1.11+)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([config.h])
-AC_DISABLE_STATIC
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 
-AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]