diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 21:33:27 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-08 21:33:27 -0700 |
| commit | f82769a1a75e17f66b67a5f71dcf889955569a57 (patch) | |
| tree | 2a464ae842df59c2adad3716d669af564f29ef5d | |
| parent | 0ce97e4422409de070af7fd70da590db12c58579 (diff) | |
Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive
| -rw-r--r-- | acinclude.m4 | 23 | ||||
| -rwxr-xr-x | configure.ac | 2 |
2 files changed, 11 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index db42d3e..b7501e8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,10 +1,10 @@ # =========================================================================== -# http://autoconf-archive.cryp.to/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,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> @@ -33,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 915587e..3cc1430 100755 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ AC_ARG_WITH(appdefaultdir, [Set app-default directory (default: ${datadir}/X11/app-defaults)]), [appdefaultdir="$withval"], [appdefaultdir=${datadir}/X11/app-defaults]) -AC_DEFINE_DIR([appdefaultdir], [appdefaultdir], [app default data directory]) +AX_DEFINE_DIR([appdefaultdir], [appdefaultdir], [app default data directory]) # Replacement for Imake ToolkitStringsABIOptions, controls string tables # generated by util/string.list in StringDefs.h & Shell.h |