summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-08-21 19:54:04 -0400
committerGaetan Nadon <memsize@videotron.ca>2010-08-21 19:55:02 -0400
commit555772964820d88f9481eb48d0431dddd8ba7aa5 (patch)
tree00e9ac39ea97de44e58557907615436e906c8553 /m4
parentfa3f1c1ea8ce4b45976e11520856cfa164f8b92d (diff)
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>
Diffstat (limited to 'm4')
-rw-r--r--m4/ax_define_dir.m4 (renamed from m4/ac_define_dir.m4)28
1 files changed, 14 insertions, 14 deletions
diff --git a/m4/ac_define_dir.m4 b/m4/ax_define_dir.m4
index db42d3e..b74d155 100644
--- 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
])