summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-03 17:08:53 +0000
committerKevin E Martin <kem@kem.org>2005-12-03 17:08:53 +0000
commit49ec5678565848aee0c47e8bd59d0a78c012583f (patch)
tree953bfbd18669d3ade5100801b7e3969ae7bf2bb2
parente4062756abb6aa70734ea42d08c8cf9edcc0dae0 (diff)
Add m4 magic to allow AS_HELP_STRING to work with older versions ofXORG-6_99_99_903MODULAR_COPY
autoconf 2.57.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 72bbade..f7bd2e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
+ Add m4 magic to allow AS_HELP_STRING to work with older versions
+ of autoconf 2.57.
+
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
Update package version number for X11R7 RC3 release.
2005-11-23 Eric Anholt <anholt@FreeBSD.org>
diff --git a/configure.ac b/configure.ac
index 2805f46..c17a5a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AC_PATH_PROG(BDFTOPCF, bdftopcf)
AC_PATH_PROG(MKFONTSCALE, mkfontscale)
AC_PATH_PROG(MKFONTDIR, mkfontdir)
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic
AC_ARG_WITH(fontdir,
AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]),