summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-14 07:30:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:40 -0500
commita9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad (patch)
tree4ee728714a3a36f11903713fd833dbe557d8c583
parentd184a9cc329c900f98147423e3350cfeb22e1e88 (diff)
downloadsamba-a9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad.tar.gz
samba-a9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad.tar.bz2
samba-a9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad.zip
r18503: - _GNU_SOURCE is defined by libreplace
- move AS_HELP_STRING replacement to libreplace metze (This used to be commit ace406a36ebbed230bf6c844e4639bac5e6c9882)
-rw-r--r--source4/build/m4/env.m47
-rw-r--r--source4/lib/replace/libreplace_macros.m44
2 files changed, 4 insertions, 7 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 7f6495fea2..7b5a5d19dd 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -10,11 +10,6 @@ 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=.
@@ -31,8 +26,6 @@ if test -n "${SAMBA_VERSION_SVN_REVISION}";then
echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}"
fi
-AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
-
m4_include(build/m4/check_path.m4)
m4_include(build/m4/check_perl.m4)
m4_include(build/m4/check_cc.m4)
diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 913de5eab1..41ec03f07a 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -264,3 +264,7 @@ define(AC_ADD_INCLUDE,
EOF
])
+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]))])