summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index ff39b63bc..c876bd5b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,17 +14,10 @@ AC_CONFIG_SRCDIR([libgphoto2/gphoto2-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 gphoto-suite
-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
foreign
- 1.9
+ 1.14
dist-bzip2
dist-xz
check-news
@@ -54,8 +47,6 @@ dnl libtool 2014-10-27 2.4.3
dnl libtool 2011-10-18 2.4.2
-# Use the silent-rules feature when possible.
-m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
AM_SILENT_RULES([no])
@@ -120,8 +111,7 @@ AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
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.
dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the