diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2010-03-31 17:12:37 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2010-03-31 17:12:37 -0400 |
| commit | 19671092fce79699d7bd306ae4f906347fe8d68e (patch) | |
| tree | c325fff465fd0fa14f5fa95c27b5acdb67b62814 | |
| parent | ee8deed4006d89231f71e3692d487eeaf1fd312c (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) | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8dc15f7..5575c7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,8 @@ bin_PROGRAMS = xfd AM_CFLAGS = $(XFD_CFLAGS) $(CWARNFLAGS) -DXRENDER -D_BSD_SOURCE xfd_LDADD = $(XFD_LIBS) +ACLOCAL_AMFLAGS = -I m4 + xfd_SOURCES = \ grid.c \ grid.h \ diff --git a/configure.ac b/configure.ac index 86f2a99..85e63b7 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT(xfd,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfd) +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 8e80584..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 @@ -30,6 +30,8 @@ # 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], [ prefix_NONE= |