diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-02-17 16:04:48 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-02-17 16:04:48 -0800 |
| commit | b13f63b103135f04843a401acd162d820fee2a09 (patch) | |
| tree | f7ef4931ab5f40885e5fa4c56ad694fd9a17fc9e | |
| parent | 484aacc4e4f98c7c5c8c0135f8fee2dff51aa9d5 (diff) | |
Add defines for default TET directories
Not used yet, but will be much better than constant getenv("TET_ROOT").
| -rw-r--r-- | acinclude.m4 | 49 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 52 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 00000000..fdc8505a --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,49 @@ +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ax_define_dir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_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: +# +# AX_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. This file is offered as-is, without any +# warranty. + +#serial 5 + +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 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 d3cdf375..c421a3ce 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,10 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER([config.h]) # Directory setup +AX_DEFINE_DIR([DEFAULT_TET_ROOT], [datadir], [Default TET root directory]) AC_SUBST([DEFAULT_TET_ROOT], ['${datadir}']) +AX_DEFINE_DIR([DEFAULT_TET_EXEC_ROOT], [libexecdir], + [Default TET root execution directory]) AC_SUBST([DEFAULT_TET_EXEC_ROOT], ['${libexecdir}']) # Checks for programs. |