config: upgrade AC_DEFINE_DIR to AX_DEFINE_DIR

Use the latest version now hosted by GNU.
The renaming protects Autoconf namespace.
There is no functional change in the macro.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

diff --git a/configure.ac b/configure.ac
index bba0cff..c0e1e9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_PROG_LIBTOOL
 pciids_path=/usr/share/hwdata
 AC_ARG_WITH(pciids-path, AC_HELP_STRING([--with-pciids-path=PCIIDS_PATH],
        [Path to pci.ids file]), [pciids_path="$withval"])
-AC_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids])
+AX_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids])
 
 AC_ARG_ENABLE(linux-rom-fallback, AS_HELP_STRING([--enable-linux-rom-fallback],
                [Enable support for falling back to /dev/mem for roms (default: disabled)]),

diff --git a/m4/ac_define_dir.m4 b/m4/ax_define_dir.m4
similarity index 69%
rename from m4/ac_define_dir.m4
rename to m4/ax_define_dir.m4
index db42d3e..b74d155 100644 (file)
--- a/m4/ac_define_dir.m4
+++ b/m4/ax_define_dir.m4
@@ -1,10 +1,10 @@
 # ===========================================================================
-#             http://autoconf-archive.cryp.to/ac_define_dir.html
+#       http://www.gnu.org/software/autoconf-archive/ax_define_dir.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#   AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
 #
 # DESCRIPTION
 #
@@ -16,13 +16,9 @@
 #
 #   Example:
 #
-#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#     AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
 #
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
+# LICENSE
 #
 #   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
 #   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
@@ -31,19 +27,23 @@
 #
 #   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
 
-AC_DEFUN([AC_DEFINE_DIR], [
+AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
+AC_DEFUN([AX_DEFINE_DIR], [
   prefix_NONE=
   exec_prefix_NONE=
   test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
   test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
 dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
 dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  eval ax_define_dir="\"[$]$2\""
+  eval ax_define_dir="\"$ax_define_dir\""
+  AC_SUBST($1, "$ax_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3])
   test "$prefix_NONE" && prefix=NONE
   test "$exec_prefix_NONE" && exec_prefix=NONE
 ])