From f607ad2e9013bc52d409faf8e628b8c6092f7d61 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 Jan 2009 18:07:41 +0100
Subject: Move check_python.m4 to common m4 directory.

---
 source4/build/m4/check_python.m4 | 100 ---------------------------------------
 source4/build/m4/env.m4          |   2 +-
 2 files changed, 1 insertion(+), 101 deletions(-)
 delete mode 100644 source4/build/m4/check_python.m4

(limited to 'source4/build')

diff --git a/source4/build/m4/check_python.m4 b/source4/build/m4/check_python.m4
deleted file mode 100644
index 7e56af76f7..0000000000
--- a/source4/build/m4/check_python.m4
+++ /dev/null
@@ -1,100 +0,0 @@
-dnl Autoconf macros for finding a Python development environment
-dnl
-dnl Copyright (C) 2007-2008 Jelmer Vernooij <jelmer@samba.org>
-dnl Published under the GNU GPL, v3 or later
-dnl
-AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-	version to use, for example '2.3'. This string 
-	will be appended to the Python interpreter
-	canonical name.])
-
-AC_DEFUN([TRY_LINK_PYTHON],
-[
-	if test $working_python = no; then
-		ac_save_LIBS="$LIBS"
-		ac_save_CFLAGS="$CFLAGS"
-		LIBS="$LIBS $1"
-		CFLAGS="$CFLAGS $2"
-
-		AC_TRY_LINK([
-				/* we have our own configure tests */
-				#include <Python.h>
-			],[
-				Py_InitModule(NULL, NULL);
-			],[
-				PYTHON_LDFLAGS="$1"
-				PYTHON_CFLAGS="$2"
-				working_python=yes
-			])
-		LIBS="$ac_save_LIBS"
-		CFLAGS="$ac_save_CFLAGS"
-	fi
-])
-
-dnl Try to find a Python implementation including header files
-dnl AC_SAMBA_PYTHON_DEVEL(RUN-IF-FOUND, RUN-IF-NOT-FOUND)
-dnl
-dnl Will set the following variables:
-dnl $PYTHON
-dnl $PYTHON_CONFIG (if found)
-dnl $PYTHON_CFLAGS
-dnl $PYTHON_LDFLAGS
-AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
-[
-	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-	if test -z "$PYTHON"; then
-		working_python=no
-		AC_MSG_WARN([No python found])
-	fi
-
-	dnl assume no working python
-	working_python=no
-
-	if test -z "$PYTHON_VERSION"; then 
-		AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
-	else 
-		AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config])
-	fi
-
-	if test -z "$PYTHON_CONFIG"; then
-		AC_MSG_WARN([No python-config found])
-	else
-		TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-		TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
-		if test x$working_python = xno; then
-			# It seems the library path isn't included on some systems
-			base=`$PYTHON_CONFIG --prefix`
-			TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
-			TRY_LINK_PYTHON([`echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
-		fi
-	fi
-
-	if test x$PYTHON != x
-	then
-		DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \
-					      print '-I%s -I%s %s' % ( \
-							sysconfig.get_python_inc(), \
-							sysconfig.get_python_inc(plat_specific=1), \
-							sysconfig.get_config_var('CFLAGS'))"`
-		DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; \
-					       print '%s %s -lpython%s -L%s %s -L%s' % ( \
-							sysconfig.get_config_var('LIBS'), \
-							sysconfig.get_config_var('SYSLIBS'), \
-							sysconfig.get_config_var('VERSION'), \
-							sysconfig.get_config_var('LIBDIR'), \
-							sysconfig.get_config_var('LDFLAGS'), \
-							sysconfig.get_config_var('LIBPL'))"`
-		TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
-	fi
-
-	AC_MSG_CHECKING(working python module support)
-	if test $working_python = yes; then
-		AC_MSG_RESULT([yes])
-		$1
-	else
-		AC_MSG_RESULT([no])
-		$2
-	fi
-])
-
-
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index a988dd0f58..738ab8b1ae 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -73,7 +73,7 @@ AC_SUBST(automatic_dependencies)
 
 m4_include(build/m4/check_doc.m4)
 
-m4_include(build/m4/check_python.m4)
+m4_include(../m4/check_python.m4)
 
 AC_SAMBA_PYTHON_DEVEL([
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
-- 
cgit