The branch, master has been updated via 3a4e61ecd809ceccced6e863a27b53264eee3efe (commit) via 4967f6948f479b0b2a3b7a3c05b5709e42207604 (commit) from 4977d913ed54935383155f7b2045fd6679bacc33 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3a4e61ecd809ceccced6e863a27b53264eee3efe Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jan 21 16:49:36 2009 +0100 Only check for Perl once in Samba 3. commit 4967f6948f479b0b2a3b7a3c05b5709e42207604 Author: Jelmer Vernooij <jel...@samba.org> Date: Wed Jan 21 16:46:52 2009 +0100 Move check_make.m4 to the top-level. ----------------------------------------------------------------------- Summary of changes: {source4/build/m4 => m4}/check_make.m4 | 0 {source4/build/m4 => m4}/check_perl.m4 | 0 source3/configure.in | 19 ++++++++----------- source4/build/m4/env.m4 | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) rename {source4/build/m4 => m4}/check_make.m4 (100%) rename {source4/build/m4 => m4}/check_perl.m4 (100%) Changeset truncated at 500 lines: diff --git a/source4/build/m4/check_make.m4 b/m4/check_make.m4 similarity index 100% rename from source4/build/m4/check_make.m4 rename to m4/check_make.m4 diff --git a/source4/build/m4/check_perl.m4 b/m4/check_perl.m4 similarity index 100% rename from source4/build/m4/check_perl.m4 rename to m4/check_perl.m4 diff --git a/source3/configure.in b/source3/configure.in index fb5e7b3..4191915 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -227,10 +227,17 @@ AC_ARG_WITH(profiling-data, ) dnl Checks for programs. +merged_build_possible=yes AC_PROG_INSTALL AC_PROG_AWK -AC_PATH_PROG(PERL, perl) +# Check for GNU make +m4_include(../m4/check_make.m4) +AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no]) + +# Check for perl +m4_include(../m4/check_perl.m4) +AC_SAMBA_PERL([true], [merged_build_possible=no]) AC_CHECK_TOOL(AR, ar) @@ -6278,16 +6285,6 @@ AC_ARG_ENABLE(merged-build, m4_include(../lib/zlib/zlib.m4) if test x$enable_merged_build = xauto; then - merged_build_possible=yes - - # Check for GNU make - m4_include(../source4/build/m4/check_make.m4) - AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no]) - - # Check for perl - m4_include(../source4/build/m4/check_perl.m4) - AC_SAMBA_PERL([true], [merged_build_possible=no]) - # Check for python m4_include(../source4/build/m4/check_python.m4) AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no]) diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index 6f582aa..a988dd0 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -40,7 +40,7 @@ if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then fi m4_include(build/m4/check_path.m4) -m4_include(build/m4/check_perl.m4) +m4_include(../m4/check_perl.m4) AC_SAMBA_PERL([], [AC_MSG_ERROR([Please install perl from http://www.perl.com/])]) @@ -48,7 +48,7 @@ AC_PATH_PROG(YAPP, yapp, false) m4_include(build/m4/check_cc.m4) m4_include(build/m4/check_ld.m4) -m4_include(build/m4/check_make.m4) +m4_include(../m4/check_make.m4) AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])]) AC_SAMBA_GNU_MAKE_VERSION() -- Samba Shared Repository