projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Relax automake requirements and make 1.11 features optional -- kevin brintnall
[rrdtool.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
7d3dde7
..
2f4be2c
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,5
+1,6
@@
dnl RRDtool AutoConf script ...
dnl ---------------------------
dnl RRDtool AutoConf script ...
dnl ---------------------------
+dnl $Id$
dnl
dnl Created by Jeff Allen, Tobi Oetiker, Blair Zajac
dnl
dnl
dnl Created by Jeff Allen, Tobi Oetiker, Blair Zajac
dnl
@@
-7,6
+8,9
@@
dnl Inspiration from http://autoconf-archive.cryp.to
dnl tell automake the this script is for rrdtool
dnl tell automake the this script is for rrdtool
+dnl Minimum Autoconf version required.
+AC_PREREQ(2.59)
+
dnl the official version number is
dnl a.b.c
AC_INIT([rrdtool],[1.3.999])
dnl the official version number is
dnl a.b.c
AC_INIT([rrdtool],[1.3.999])
@@
-31,10
+35,10
@@
LIBVERS=5:0:1
AC_SUBST(LIBVERS)
AC_CANONICAL_TARGET
AC_SUBST(LIBVERS)
AC_CANONICAL_TARGET
-AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE(
[silent-rules]
)
+m4_version_prereq(2.60, [AC_USE_SYSTEM_EXTENSIONS], [#])
+AM_INIT_AUTOMAKE(
m4_version_prereq(2.63, [silent-rules], [[]])
)
AM_MAINTAINER_MODE
AM_MAINTAINER_MODE
-
AM_SILENT_RULES([yes
])
+
m4_version_prereq(2.63, [AM_SILENT_RULES([yes])], [#
])
AC_CONFIG_HEADERS([rrd_config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([rrd_config.h])
AC_CONFIG_MACRO_DIR([m4])
@@
-48,9
+52,6
@@
AC_SUBST(VERSION)
AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
-dnl Minimum Autoconf version required.
-AC_PREREQ(2.59)
-
dnl At the TOP of the HEADER
AH_TOP([
dnl At the TOP of the HEADER
AH_TOP([
@@
-263,8
+264,7
@@
AC_CHECK_FUNCS(posix_fadvise)
CONFIGURE_PART(Libintl Processing)
CONFIGURE_PART(Libintl Processing)
-
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION(0.14.4)
AM_GNU_GETTEXT()
CONFIGURE_PART(IEEE Math Checks)
AM_GNU_GETTEXT()
CONFIGURE_PART(IEEE Math Checks)