diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-04-01 21:07:54 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-04-01 21:07:54 -0400 |
| commit | d4a7b15b3ed9e7cf94dbf64f929ae954bada9f60 (patch) | |
| tree | 4d199041c939316be1bdf89c60cd356c3cd55757 | |
| parent | e0920779d1227338e61aaab16458b9daad508c36 (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 version of the macro from GNU
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/ax_define_dir.m4 (renamed from acinclude.m4) | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index d3b3c3e..6238176 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,8 @@ SUBDIRS = src sxpm cxpm +ACLOCAL_AMFLAGS = -I m4 + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xpm.pc MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 8d3617a..b8fa91a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ AC_PREREQ(2.57) AC_INIT([libXpm], 3.5.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm) AC_CONFIG_SRCDIR([Makefile.am]) -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS 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], [ |