From 1d9301290edc263e21962341ef6b468bb8a65f86 Mon Sep 17 00:00:00 2001 From: EEva Date: Mon, 14 Sep 2009 15:39:32 +0200 Subject: [PATCH] Des nouveaux changements pour garder ac_define_dir --- olono_X11/ac-helpers/ac_define_dir.m4 | 34 +++++++++++++++++++++++++++ olono_X11/configure.ac | 3 +++ 2 files changed, 37 insertions(+) create mode 100644 olono_X11/ac-helpers/ac_define_dir.m4 diff --git a/olono_X11/ac-helpers/ac_define_dir.m4 b/olono_X11/ac-helpers/ac_define_dir.m4 new file mode 100644 index 0000000..e15cea2 --- /dev/null +++ b/olono_X11/ac-helpers/ac_define_dir.m4 @@ -0,0 +1,34 @@ +dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) +dnl +dnl This macro sets VARNAME to the expansion of the DIR variable, +dnl taking care of fixing up ${prefix} and such. +dnl +dnl VARNAME is then offered as both an output variable and a C +dnl preprocessor symbol. +dnl +dnl Example: +dnl +dnl AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +dnl +dnl @category Misc +dnl @author Stepan Kasal +dnl @author Andreas Schwab +dnl @author Guido U. Draheim +dnl @author Alexandre Oliva +dnl @version 2006-10-13 +dnl @license AllPermissive + +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/olono_X11/configure.ac b/olono_X11/configure.ac index b10fa8e..f381c33 100644 --- a/olono_X11/configure.ac +++ b/olono_X11/configure.ac @@ -2,6 +2,9 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([OloNO], [0.4], [ail@isep.fr]) +dnl Definition +sinclude(ac-helpers/ac_define_dir.m4) + dnl Non GNU, but very handy : AC_DEFINE_DIR([LIBDIR], [libdir], [Where the libs are placed to.]) AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])