diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 16:49:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 16:49:36 +0100 |
| commit | 3a4e61ecd809ceccced6e863a27b53264eee3efe (patch) | |
| tree | 0a99903e0600a76f5a58e4c766cfecb18dc95ab8 | |
| parent | 4967f6948f479b0b2a3b7a3c05b5709e42207604 (diff) | |
| download | samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.gz samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.bz2 samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.zip | |
Only check for Perl once in Samba 3.
| -rw-r--r-- | m4/check_perl.m4 (renamed from source4/build/m4/check_perl.m4) | 0 | ||||
| -rw-r--r-- | source3/configure.in | 19 | ||||
| -rw-r--r-- | source4/build/m4/env.m4 | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/source4/build/m4/check_perl.m4 b/m4/check_perl.m4 index aaec9cf950..aaec9cf950 100644 --- a/source4/build/m4/check_perl.m4 +++ b/m4/check_perl.m4 diff --git a/source3/configure.in b/source3/configure.in index de6ad0ee99..4191915f96 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/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 ca9f05e16b..a988dd0f58 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/])]) |