From 3a4e61ecd809ceccced6e863a27b53264eee3efe Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Jan 2009 16:49:36 +0100
Subject: Only check for Perl once in Samba 3.

---
 source4/build/m4/check_perl.m4 | 32 --------------------------------
 source4/build/m4/env.m4        |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 source4/build/m4/check_perl.m4

(limited to 'source4/build')

diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4
deleted file mode 100644
index aaec9cf9508..00000000000
--- 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 ca9f05e16b0..a988dd0f58d 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/])])
 
-- 
cgit v1.2.1