sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

Only check for Perl once in Samba 3.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-01-21 16:49:36 +01:00
parent 4967f6948f
commit 3a4e61ecd8
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
source4/build/m4/check_perl.m4 → m4/check_perl.m4
View File

19
source3/configure.in
View 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])

2
source4/build/m4/env.m4
View 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/])])