From 62eeddf4ba3b12102fd31fd0795f2d704676b14c Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 6 Sep 2009 15:41:16 -0400
Subject: [PATCH] Replace AC_DEFINE_DIR private copy with official AX_DEFINE_DIR #23750

The official copy is now installed in share/aclocal.
http://www.nongnu.org/autoconf-archive/ax_define_dir.html
The private copy of this modules has beeen removed and configure.ac
has been updated.
---
 acinclude.m4 |   45 ---------------------------------------------
 configure.ac |    2 +-
 2 files changed, 1 insertions(+), 46 deletions(-)
 delete mode 100644 acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 44971b9..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-# ===========================================================================
-#          http://www.nongnu.org/autoconf-archive/ac_define_dir.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
-#
-# DESCRIPTION
-#
-#   This macro sets VARNAME to the expansion of the DIR variable, taking
-#   care of fixing up ${prefix} and such.
-#
-#   VARNAME is then offered as both an output variable and a C preprocessor
-#   symbol.
-#
-#   Example:
-#
-#      AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
-#   Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2008 Alexandre Oliva
-#
-#   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.
-
-AC_DEFUN([AC_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])
-  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"
-- 
1.6.0.4