diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2013-12-04 13:28:04 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-22 11:05:30 -0800 |
| commit | 1d4dbc2f2b4d2acca2691c3c7464a45aac59d73f (patch) | |
| tree | 4a4129fb11239ecbc9523930e2876f5acfec60b1 | |
| parent | 2d2d49dab5c5718989de97d7227aac793479745e (diff) | |
libtool: bump minimum required version to 2.2
LT_PREREQ([2.2])
LT_INIT
AC_CONFIG_MACRO_DIR([m4]) is recommended to locate local macros,
which is fully used starting automake 1.14.
ACLOCAL_AMFLAGS in Makefile.am is deprecated since automake 1.14.
The comment is to prevent developers from removing the statement
as suggested in 1.14 which would break earlier versions.
Automake 1.14 is already in use by many.
This patch works on versions prior and post 1.14
References:
Building the X Window System from Source:
http://www.x.org/wiki/Building_the_X_Window_System/#index2h3
Discussion on xorg minimum autotools requirements:
http://lists.x.org/archives/xorg-devel/2013-October/038325.html
Tested with autoconf 2.60, automake 1.10.3 and libtool 2.2
The same upgrade will be applied to libraries and drivers.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5bf760b2e..add69d193 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ AUTOMAKE_OPTIONS=nostdinc + +# Required for automake < 1.14 ACLOCAL_AMFLAGS = -I m4 if COMPOSITE diff --git a/configure.ac b/configure.ac index 234cf21b2..425dbae04 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AC_INIT([xorg-server], 1.15.99.900, [https://bugs.freedesktop.org/enter_bug.cgi? RELEASE_DATE="2014-01-09" RELEASE_NAME="Golden Gaytime" AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_USE_SYSTEM_EXTENSIONS @@ -74,9 +75,8 @@ AC_CONFIG_HEADERS(include/version-config.h) AM_PROG_AS AC_PROG_LN_S -AC_LIBTOOL_WIN32_DLL -AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_PREREQ([2.2]) +LT_INIT([disable-static win32-dll]) PKG_PROG_PKG_CONFIG AC_PROG_LEX AC_PROG_YACC |