diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
| commit | 01fc095d6e2fa1b883b3f429085b4aca4254f105 (patch) | |
| tree | 51ca606a357c9c626dbd8067ec89fa9263445e1f /source4/lib/replace | |
| parent | ffbea676771bae16be547529eb1136c61d78203f (diff) | |
| parent | 7206c5fc4a0fc9d310fef199c6ff9d0300bc956b (diff) | |
| download | samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.gz samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.bz2 samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 3 | ||||
| -rw-r--r-- | source4/lib/replace/win32.m4 | 8 |
2 files changed, 6 insertions, 5 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)]) diff --git a/source4/lib/replace/win32.m4 b/source4/lib/replace/win32.m4 index 9ac84cdf2a..eb364e2cb9 100644 --- a/source4/lib/replace/win32.m4 +++ b/source4/lib/replace/win32.m4 @@ -2,7 +2,7 @@ AC_CHECK_HEADERS(direct.h windows.h winsock2.h ws2tcpip.h) ####################################### # Check for mkdir mode -AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode, +AC_CACHE_CHECK( [whether mkdir supports mode], libreplace_cv_mkdir_has_mode, AC_TRY_COMPILE([ #include <stdio.h> #ifdef HAVE_DIRECT_H @@ -11,10 +11,10 @@ AC_CACHE_CHECK( [whether mkdir supports mode], ac_mkdir_has_mode, mkdir("foo",0777); return 0; ], - ac_mkdir_has_mode="yes", - ac_mkdir_has_mode="no") ) + libreplace_cv_mkdir_has_mode="yes", + libreplace_cv_mkdir_has_mode="no") ) -if test "$ac_mkdir_has_mode" = "yes" +if test "$libreplace_cv_mkdir_has_mode" = "yes" then AC_DEFINE(HAVE_MKDIR_MODE, 1, [Define if target mkdir supports mode option]) fi |