summaryrefslogtreecommitdiff
path: root/source4
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 /source4
parent4967f6948f479b0b2a3b7a3c05b5709e42207604 (diff)
downloadsamba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.gz
samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.tar.bz2
samba-3a4e61ecd809ceccced6e863a27b53264eee3efe.zip
Only check for Perl once in Samba 3.
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_perl.m432
-rw-r--r--source4/build/m4/env.m42
2 files changed, 1 insertions, 33 deletions
diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4
deleted file mode 100644
index aaec9cf950..0000000000
--- a/source4/build/m4/check_perl.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl SMB Build Environment Perl Checks
-dnl -------------------------------------------------------
-dnl Copyright (C) Stefan (metze) Metzmacher 2004
-dnl Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-
-AC_DEFUN([AC_SAMBA_PERL],
-[
-case "$host_os" in
- *irix*)
- # On IRIX, we prefer Freeware or Nekoware Perl, because the
- # system perl is so ancient.
- AC_PATH_PROG(PERL, perl, "", "/usr/freeware/bin:/usr/nekoware/bin:$PATH")
- ;;
- *)
- AC_PATH_PROG(PERL, perl)
- ;;
-esac
-
-if test x"$PERL" = x""; then
- AC_MSG_WARN([No version of perl was found!])
- $2
-else
- if test x"$debug" = x"yes";then
- PERL="$PERL -W"
- fi
- export PERL
- $1
-fi
-])
-
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/])])