summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-01-30 23:09:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:51:36 -0500
commitd4a62250cc9c747460ac5752851846fb86d78700 (patch)
treeb4e41df2dced8a18fa269622a8173a72b406ce0b
parentd778912c3a14287f9f78a852defeb2ca86d95e17 (diff)
downloadsamba-d4a62250cc9c747460ac5752851846fb86d78700.tar.gz
samba-d4a62250cc9c747460ac5752851846fb86d78700.tar.bz2
samba-d4a62250cc9c747460ac5752851846fb86d78700.zip
r13241: Work around missing AS_HELP_STRING definition in autoconf 2.57. Fix
from Brad Hards <bradh@frogmouth.net>. (This used to be commit 3ade52398a345cc50c1bf52298e36ab1804b00ec)
-rw-r--r--source4/build/m4/env.m45
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index c20160fdb5..435d5793a6 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -10,6 +10,11 @@ AC_CANONICAL_HOST
AC_SUBST(srcdir)
export srcdir;
+dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is deprecated
+dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already
+dnl defined.
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
# we always set builddir to "." as that's nicer than
# having the absolute path of the current work directory
builddir=.