summaryrefslogtreecommitdiff
path: root/source4/lib/replace/libreplace.m4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-06-10 13:19:56 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-06-10 13:19:56 +1000
commit7721ea8f9c75d304111935048167dd27525cc91a (patch)
treefdc6563d085003cf6fe003748fb85291166a5454 /source4/lib/replace/libreplace.m4
parent7974ccbebf5c684200850a726d79b976eaeea261 (diff)
parent1384f836b601d35f3c499a9e26c3e3b0d12b3ad0 (diff)
downloadsamba-7721ea8f9c75d304111935048167dd27525cc91a.tar.gz
samba-7721ea8f9c75d304111935048167dd27525cc91a.tar.bz2
samba-7721ea8f9c75d304111935048167dd27525cc91a.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 1d52d9cc70158dbe30325220aa5c1e6203c8b72b)
Diffstat (limited to 'source4/lib/replace/libreplace.m4')
-rw-r--r--source4/lib/replace/libreplace.m43
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index 6a85ff5a82..71fa041672 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/lib/replace/libreplace.m4
@@ -299,4 +299,5 @@ m4_include(libreplace_cc.m4)
m4_include(libreplace_ld.m4)
m4_include(libreplace_network.m4)
m4_include(libreplace_macros.m4)
-m4_include(autoconf-2.60.m4)
+
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[m4_include(autoconf-2.60.m4)])