diff options
author | Gaetan Nadon <memsize@videotron.ca> | 2010-04-01 20:30:43 -0400 |
---|---|---|
committer | Gaetan Nadon <memsize@videotron.ca> | 2010-04-05 19:35:53 -0400 |
commit | 723d78fe8e159dee1281f3e4f8dc03825aa334b6 (patch) | |
tree | 9b00bae4b8a3a66bc2a98daec469c6950d0fac8a | |
parent | 99a1c1f2cfa595500704d54e223f1c9e0ff9a10e (diff) |
config: update and relocate AX_DEFINE_DIR macro
Remove deprecated acinclude.m4 macro container file
Use separate macro files as per autoconf recommendation
Use the latest macro from GNU
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | m4/ax_define_dir.m4 (renamed from acinclude.m4) | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 1f2c47c..4fe4670 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,8 @@ SUBDIRS = util src include man +ACLOCAL_AMFLAGS = -I m4 + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xt.pc diff --git a/configure.ac b/configure.ac index c014f69..7cb97bf 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_PREREQ([2.60]) dnl dnl AC_INIT(libXt, 1.0.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/acinclude.m4 b/m4/ax_define_dir.m4 index b7501e8..b74d155 100644 --- a/acinclude.m4 +++ b/m4/ax_define_dir.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_define_dir.html +# http://www.gnu.org/software/autoconf-archive/ax_define_dir.html # =========================================================================== # # SYNOPSIS @@ -16,7 +16,7 @@ # # Example: # -# AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +# AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) # # LICENSE # @@ -27,7 +27,10 @@ # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) AC_DEFUN([AX_DEFINE_DIR], [ |