From f4c43f70dff3cb9702fd62bc388353d02589e618 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu, 8 Oct 2009 20:27:49 -0700
Subject: Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive

---
 acinclude.m4 | 17 +++++++++--------
 configure.ac |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 44971b9..b7501e8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,10 +1,10 @@
 # ===========================================================================
-#          http://www.nongnu.org/autoconf-archive/ac_define_dir.html
+#          http://www.nongnu.org/autoconf-archive/ax_define_dir.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#   AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
 #
 # DESCRIPTION
 #
@@ -16,7 +16,7 @@
 #
 #   Example:
 #
-#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#      AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
 #
 # LICENSE
 #
@@ -29,17 +29,18 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
-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
 ])
diff --git a/configure.ac b/configure.ac
index 34e3ea1..ae0f78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_MSG_CHECKING([where to install localized messages])
 AC_ARG_WITH([localedir], AC_HELP_STRING([--with-localedir=<path>],
 	[Path to install message files in (default: datadir/locale)]),
 	[LOCALEDIR=${withval}], [LOCALEDIR=${datadir}/locale])
-AC_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages])
+AX_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages])
 if test "x$LOCALEDIR" = "xno" -o "x$USE_GETTEXT" = "xno" ; then
 	AC_MSG_RESULT([nowhere])
 	USE_GETTEXT="no"
-- 
cgit v1.2.1