diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2006-09-19 04:39:07 +0000 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2006-09-19 04:39:07 +0000 |
| commit | 1cf60015d7d78668c83737be6015dc880fd04ebf (patch) | |
| tree | 4a70718efa5e0e5f6a02c2ab5ddafb19690e659c /m4 | |
| parent | 821c883f9df9cc0e5b81aa2e070727996cf3bc4e (diff) | |
2006-09-19 Kristian Høgsberg <krh@redhat.com>
* poppler/GlobalParams.cc: Add scanEncodingDirs() to automatically
scan in any encodings found under ${datadir}/poppler.
* m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/define-dir.m4 | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/m4/define-dir.m4 b/m4/define-dir.m4 new file mode 100644 index 00000000..5e8c5ae1 --- /dev/null +++ b/m4/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 <kasal@ucw.cz> +dnl @author Andreas Schwab <schwab@suse.de> +dnl @author Guido Draheim <guidod@gmx.de> +dnl @author Alexandre Oliva +dnl @version 2005-07-29 +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 +]) |