diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:03:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:03:35 +0200 |
| commit | d435b20322433b335a4fc5693cce0399a3f27b2d (patch) | |
| tree | 8d96b388ee1058340a9d7c1a3c4096169ac3839f /libXfont/aclocal.m4 | |
| parent | 2614b017fb8a28f360897ece66815934fd1562f5 (diff) | |
| download | vcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.tar.gz vcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.tar.bz2 vcxsrv-d435b20322433b335a4fc5693cce0399a3f27b2d.zip | |
Updated to libXfont 1.4.8
Diffstat (limited to 'libXfont/aclocal.m4')
| -rw-r--r-- | libXfont/aclocal.m4 | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libXfont/aclocal.m4 b/libXfont/aclocal.m4 index 17ad91eb5..e65b6ecd5 100644 --- a/libXfont/aclocal.m4 +++ b/libXfont/aclocal.m4 @@ -9929,7 +9929,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.18.0]) +m4_define([vers_have], [1.19.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -9979,6 +9979,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" AC_MSG_RESULT([yes]) else @@ -9987,6 +9988,7 @@ else fi rm -f conftest.$ac_ext AC_SUBST(RAWCPPFLAGS) +AC_SUBST(TRADITIONALCPPFLAGS) ]) # XORG_PROG_RAWCPP # XORG_MANPAGE_SECTIONS() @@ -10774,6 +10776,29 @@ fi]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP +# XORG_WITH_M4([MIN-VERSION]) +# --------------------------- +# Minimum version: 1.19.0 +# +# This macro attempts to locate an m4 macro processor which supports +# -I option and is only useful for modules relying on M4 in order to +# expand macros in source code files. +# +# Interface to module: +# M4: returns the path of the m4 program found +# returns the path set by the user in the environment +# +AC_DEFUN([XORG_WITH_M4], [ +AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4], + [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4], + [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \ + ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]], + [AC_MSG_ERROR([could not find m4 that supports -I option])], + [$PATH:/usr/gnu/bin])]) + +AC_SUBST([M4], [$ac_cv_path_M4]) +]) # XORG_WITH_M4 + # XORG_WITH_PS2PDF([DEFAULT]) # ---------------- # Minimum version: 1.6.0 |