summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2023-12-02 15:03:41 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2023-12-02 15:03:41 -0800
commit8cdcdd12795ee66a19ce4ca4b6630f1f4bb83b32 (patch)
tree477f8e8a111dd8ffa7ffe9f51ea30476a1bb29b8
parentf642d1700ca6579f025008c04f02453219b93084 (diff)
configure: updates to quiet obsolete macro warnings
Clears autoconf warnings: configure.ac:38: warning: The macro 'AC_PROG_LIBTOOL' is obsolete. configure.ac:38: You should run autoupdate. aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from... configure.ac:38: the top level configure.ac:68: warning: The macro 'AC_HELP_STRING' is obsolete. configure.ac:68: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:68: the top level configure.ac:78: warning: The macro 'AC_HELP_STRING' is obsolete. configure.ac:78: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:78: the top level libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac, libtoolize: and rerunning libtoolize and aclocal. libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac8
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 57cec4d..521188e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,3 +41,4 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
EXTRA_DIST = README.md
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 8525bc7..a905b72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,14 @@ AC_INIT([xf86-input-synaptics],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
AC_CONFIG_AUX_DIR(.)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-xz])
# Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
# Initialize X.Org macros 1.13 or later for XORG_ENABLE_UNIT_TESTS
m4_ifndef([XORG_MACROS_VERSION],
@@ -65,7 +65,7 @@ AC_SUBST([sdkdir])
# -----------------------------------------------------------------------------
# Define a configure option for an alternate input module directory
AC_ARG_WITH(xorg-module-dir,
- AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
@@ -75,7 +75,7 @@ AC_SUBST(inputdir)
# Define a configure option for an alternate X Server configuration directory
sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`
AC_ARG_WITH(xorg-conf-dir,
- AC_HELP_STRING([--with-xorg-conf-dir=DIR],
+ AS_HELP_STRING([--with-xorg-conf-dir=DIR],
[Default xorg.conf.d directory [[default=from $PKG_CONFIG xorg-server]]]),
[configdir="$withval"],
[configdir="$sysconfigdir"])