From c52f54e9533046a52edf84bcc02abedc2dbcb1a7 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 6 Feb 2023 15:27:43 -0800 Subject: Require LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, so it's time to rely on it. configure.ac:35: warning: The macro `AC_LIBTOOL_WIN32_DLL' is obsolete. configure.ac:35: You should run autoupdate. aclocal.m4:11889: AC_LIBTOOL_WIN32_DLL is expanded from... configure.ac:35: the top level configure.ac:35: warning: AC_LIBTOOL_WIN32_DLL: Remove this warning and the call to _LT_SET_OPTION when you configure.ac:35: put the 'win32-dll' option into LT_INIT's first parameter. ./lib/autoconf/general.m4:2434: AC_DIAGNOSE is expanded from... aclocal.m4:11889: AC_LIBTOOL_WIN32_DLL is expanded from... configure.ac:35: the top level configure.ac:36: warning: The macro `AC_PROG_LIBTOOL' is obsolete. configure.ac:36: You should run autoupdate. aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from... configure.ac:36: the top level Signed-off-by: Alan Coopersmith --- Makefile.am | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1049614..ced8684 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,3 +61,5 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index f5c1a78..240610c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,14 +26,14 @@ AC_INIT([libXau], [1.0.11], [https://gitlab.freedesktop.org/xorg/lib/libxau/-/issues], [libXau]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL +LT_INIT([win32-dll]) # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], -- cgit v1.2.1