summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-21 16:49:36 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-21 16:49:36 +0100
commit3a4e61ecd809ceccced6e863a27b53264eee3efe (patch)
tree0a99903e0600a76f5a58e4c766cfecb18dc95ab8 /source3
parent4967f6948f479b0b2a3b7a3c05b5709e42207604 (diff)
downloadsamba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.gz
samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.bz2
samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.zip
Only check for Perl once in Samba 3.
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in19
1 files changed, 8 insertions, 11 deletions
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])