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
commitc4629658e950c9ac010fa7f9fcb62d5bf28c4d18 (patch)
treee1853e696e987a873a72794b7a9f78bb4b0583e0
parentf9668e4e48180b9f2b784f0d97b2af8bafc93a8a (diff)
Add m4 magic to allow AS_HELP_STRING to work with older versions ofXORG-6_99_99_903
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 d9392be..86d13d1 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-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
diff --git a/configure.ac b/configure.ac
index affab0c..bd8e463 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AC_PATH_PROG(MKFONTSCALE, mkfontscale)
AC_PATH_PROG(MKFONTDIR, mkfontdir)
AC_PATH_PROG(FCCACHE, fc-cache)
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
DEFAULT_TTFFONTDIR=${libdir}/X11/fonts/TTF
AC_ARG_WITH(fontdir,
AS_HELP_STRING([--with-ttf-fontdir=FONTDIR], [Path to install TTF fonts]),