Only check for Perl once in Samba 3.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 15:49:36 +0000 (16:49 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 Jan 2009 15:49:36 +0000 (16:49 +0100)
m4/check_perl.m4 [moved from source4/build/m4/check_perl.m4 with 100% similarity]
source3/configure.in
source4/build/m4/env.m4

index de6ad0e..4191915 100644 (file)
@@ -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])
index ca9f05e..a988dd0 100644 (file)
@@ -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/])])