summaryrefslogtreecommitdiff
path: root/libgphoto2_port
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-07 12:12:11 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2021-11-07 22:28:48 +0100
commite866cd22566427d33003e3544f3fd22633384f6f (patch)
tree14a47f4a2f6e7b491468a3a0e836045865795d0d /libgphoto2_port
parent52d968ab3b9288bf8de50bd9774d0b26c2ef9231 (diff)
downloadlibgphoto2-e866cd22566427d33003e3544f3fd22633384f6f.tar.gz
Require at least automake 1.14
This gives us a few more features, and a few less conditionals conditionally reimplementing features added to automake before automake 1.14. automake 1.14 is almost the same automake version requirement as libexif uses (libexif requires 1.14.1). automake 1.14 has been released 2013-06-20. If you ever need to build a post 2021 libgphoto2 from git on a system with pre 1.14 automake, you can can always prepare a tarball using "make dist" on a system with automake 1.14 or later, and build that tarball on the older machine.
Diffstat (limited to 'libgphoto2_port')
-rw-r--r--libgphoto2_port/configure.ac19
1 files changed, 6 insertions, 13 deletions
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index dbba7b918..7bcb0c90a 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -10,29 +10,23 @@ AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2-port-version.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([auto-m4])
AC_CONFIG_AUX_DIR([auto-aux])
-dnl Working around bug in automake <= 1.9.6:
-dnl - Please do not add filename-length-max=99 here.
-dnl - Otherwise "make distdir" will fail in libgphoto2
-dnl The generated Makefile rule fails to remove the absolute part at
-dnl the beginning of the /path/to/buildroot/PACKAGE-VERSION/foo/bar
-dnl before determining the string length. However, the only relevant
-dnl string to determine the length of would be PACKAGE-VERSION/foo/bar
AM_INIT_AUTOMAKE([
-Wall
gnu
- 1.9
+ 1.14
dist-bzip2
check-news
subdir-objects
])
-AC_LANG([C])
-# Use the silent-rules feature when possible.
-m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
AM_SILENT_RULES([no])
+AC_LANG([C])
+
+
+
dnl Flag all GP_ strings in result as error unless specifically allowed.
m4_pattern_forbid([^_?GP_])dnl
@@ -79,8 +73,7 @@ dnl ---------------------------------------------------------------------------
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
-AM_PROG_CC_C_O
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+AM_PROG_AR
dnl Something with the sequences is not quite alright yet.