summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@me.com>2016-03-10 12:57:50 -0700
committerNathan Hjelm <hjelmn@me.com>2016-03-11 08:45:50 -0700
commit2040ab109c8470fa5bcaf094fdf8f0488e6cc8f5 (patch)
tree8db8404d183eebaf647671f44df65a811e8085b9
parent0dcc646bb536c293f6e53c802d85c6bdd416867a (diff)
downloadlibusb-2040ab109c8470fa5bcaf094fdf8f0488e6cc8f5.tar.gz
configure: bump autoconf version and remove obsolete AM_MAINTAINER_MODE
This commit bumps the minimum autoconf version to 2.69. This only affects maintainers and will ensure libusb tarballs have up-to-date configure scripts. At the same time we are removing the AM_MAINTAINER_MODE macro as even its creator recommends against using it. Closes #122 Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--.travis.yml2
-rw-r--r--configure.ac3
-rw-r--r--libusb/version_nano.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 585cd6f..d4469b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
+# Require trusty for now as it has a more recent version of autoconf
sudo: required
+dist: trusty
language: c
compiler:
diff --git a/configure.ac b/configure.ac
index 9f3e639..77efdec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,13 @@ lt_age="1"
LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
AM_INIT_AUTOMAKE
-AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([libusb/core.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-AC_PREREQ([2.50])
+AC_PREREQ([2.69])
AC_PROG_CC
AC_PROG_CXX
LT_INIT
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index cb99241..86202f8 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11102
+#define LIBUSB_NANO 11105