diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
| commit | 715cc00bc01e151c10e3d723cd29e126a6464637 (patch) | |
| tree | 538017d459e7531a726e34767c0abcbe5e683faa /source3/configure.in | |
| parent | 293acaf92e7234665e15c3fb7fd600427ffcd5ce (diff) | |
| parent | a868d2f3d5281dea923718486e4e42b20cf8fe74 (diff) | |
| download | samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.gz samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.bz2 samba-715cc00bc01e151c10e3d723cd29e126a6464637.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index f1004778f4..87b4c33417 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6286,7 +6286,7 @@ m4_include(../lib/zlib/zlib.m4) if test x$enable_merged_build = xauto; then # Check for python - m4_include(../source4/build/m4/check_python.m4) + m4_include(../m4/check_python.m4) AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no]) AC_MSG_CHECKING([whether it would be possible to do a merged build]) |