Only check for Perl once in Samba 3.

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 de6ad0ee99d5cede8eecf1c112c6259fe339b07f..4191915f96fd2e9d3477485dbb6f41766dfae281 100644 (file)
--- 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 ca9f05e16b025fa5ad6bec6933b2946b647d1b63..a988dd0f58d0f4fd7c4dc48b392384e92254a82d 100644 (file)
--- 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/])])