diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-08-25 12:44:49 +0200 |
| commit | ae0a2bfdeb9ceacb80aa03375353039d425b14b9 (patch) | |
| tree | daec55145477bcec69273e03d5c9ff10c10a4137 /nx-X11/lib/m4 | |
| parent | cbe2c0e44f412d07024207f374c0f56684adb088 (diff) | |
| parent | 3b7e5a42f5abecb903a9d730d163d704520efb07 (diff) | |
| download | nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.gz nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.tar.bz2 nx-libs-ae0a2bfdeb9ceacb80aa03375353039d425b14b9.zip | |
Merge branch 'sunweaver-pr/libnx-x11-autoreconf' into 3.6.x
Attributes GH PR #498: https://github.com/ArcticaProject/nx-libs/pull/498
Diffstat (limited to 'nx-X11/lib/m4')
| -rw-r--r-- | nx-X11/lib/m4/ax_define_dir.m4 | 49 | ||||
| l--------- | nx-X11/lib/m4/nx-macros.m4 | 1 | ||||
| l--------- | nx-X11/lib/m4/nx-xtrans.m4 | 1 |
3 files changed, 51 insertions, 0 deletions
diff --git a/nx-X11/lib/m4/ax_define_dir.m4 b/nx-X11/lib/m4/ax_define_dir.m4 new file mode 100644 index 000000000..b74d155fd --- /dev/null +++ b/nx-X11/lib/m4/ax_define_dir.m4 @@ -0,0 +1,49 @@ +# =========================================================================== +# http://www.gnu.org/software/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 6 + +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/nx-X11/lib/m4/nx-macros.m4 b/nx-X11/lib/m4/nx-macros.m4 new file mode 120000 index 000000000..efbc5bdb4 --- /dev/null +++ b/nx-X11/lib/m4/nx-macros.m4 @@ -0,0 +1 @@ +../../../m4/nx-macros.m4
\ No newline at end of file diff --git a/nx-X11/lib/m4/nx-xtrans.m4 b/nx-X11/lib/m4/nx-xtrans.m4 new file mode 120000 index 000000000..5e3aef91e --- /dev/null +++ b/nx-X11/lib/m4/nx-xtrans.m4 @@ -0,0 +1 @@ +../../../m4/nx-xtrans.m4
\ No newline at end of file |