Make check_*.m4 m4 library files just contain functions that can be

executed from other m4 files.

diff --git a/source4/scripting/python/ac_pkg_swig.m4 b/source4/build/m4/ac_pkg_swig.m4
similarity index 100%
rename from source4/scripting/python/ac_pkg_swig.m4
rename to source4/build/m4/ac_pkg_swig.m4

diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4
index a7609693febadb3d597c6aa5c6cc6ed9b303dda8..50cabfdf3c74ee3b69f068a0d551ab9e3eed420f 100644 (file)
--- a/source4/build/m4/check_make.m4
+++ b/source4/build/m4/check_make.m4
@@ -25,27 +25,9 @@ else
 fi
 ])
 
-AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])])
-
+AC_DEFUN([AC_SAMBA_GNU_MAKE_VERSION], 
+[
 AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[
                samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null`
        ])
-       GNU_MAKE_VERSION=$samba_cv_gnu_make_version
-       AC_SUBST(GNU_MAKE_VERSION)
-
-
-new_make=no
-AC_MSG_CHECKING([for GNU make >= 3.81])
-if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
-       new_make=yes
-fi
-AC_MSG_RESULT($new_make)
-automatic_dependencies=no
-AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])
-AC_MSG_CHECKING([Whether to use automatic dependencies])
-AC_ARG_ENABLE(automatic-dependencies,
-[  --enable-automatic-dependencies Enable automatic dependencies],
-[ automatic_dependencies=$enableval ], 
-[ automatic_dependencies=no ])
-AC_MSG_RESULT($automatic_dependencies)
-AC_SUBST(automatic_dependencies)
+])

diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4
index 601798be471c4208834bd691a6dc94b41872b449..aaec9cf950883e97efbc7859b987361f927da81e 100644 (file)
--- a/source4/build/m4/check_perl.m4
+++ b/source4/build/m4/check_perl.m4
@@ -30,6 +30,3 @@ else
 fi
 ])
 
-AC_SAMBA_PERL([], [AC_MSG_ERROR([Please install perl from http://www.perl.com/])])
-
-AC_PATH_PROG(YAPP, yapp, false)

diff --git a/source4/scripting/python/config.m4 b/source4/build/m4/check_python.m4
similarity index 83%
rename from source4/scripting/python/config.m4
rename to source4/build/m4/check_python.m4
index d191526c8b3358d0a2a79ead81c3121945546d9c..96f93a3d7535c842639a44352e339a2a1ac5bc82 100644 (file)
--- a/source4/scripting/python/config.m4
+++ b/source4/build/m4/check_python.m4
@@ -1,12 +1,13 @@
-m4_include(scripting/python/ac_pkg_swig.m4)
-
+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_PROG_SWIG(1.3.36)
-
 AC_DEFUN([TRY_LINK_PYTHON],
 [
        if test $working_python = no; then
@@ -85,16 +86,4 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
        fi
 ])
 
-AC_SAMBA_PYTHON_DEVEL([
-SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
-SMB_ENABLE(EXT_LIB_PYTHON,YES)
-SMB_ENABLE(LIBPYTHON,YES)
-],[
-AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
-])
-
-AC_MSG_CHECKING(python library directory)
-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
-AC_MSG_RESULT($pythondir)
 
-AC_SUBST(pythondir)

diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 6c040b9babc276a5563a810f149e4292506b1031..360ce17a1c6ee526d23d1ae20c027b366e2c786d 100644 (file)
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -1,6 +1,7 @@
 dnl SMB Build Environment Checks
 dnl -------------------------------------------------------
 dnl  Copyright (C) Stefan (metze) Metzmacher 2004
+dnl  Copyright (C) Jelmer Vernooij 2005,2008
 dnl  Released under the GNU GPL
 dnl -------------------------------------------------------
 dnl
@@ -40,7 +41,55 @@ fi
 
 m4_include(build/m4/check_path.m4)
 m4_include(build/m4/check_perl.m4)
+
+AC_SAMBA_PERL([], [AC_MSG_ERROR([Please install perl from http://www.perl.com/])])
+
+AC_PATH_PROG(YAPP, yapp, false)
+
 m4_include(build/m4/check_cc.m4)
 m4_include(build/m4/check_ld.m4)
 m4_include(build/m4/check_make.m4)
+
+AC_SAMBA_GNU_MAKE([AC_MSG_RESULT(found)], [AC_MSG_ERROR([Unable to find GNU make])])
+AC_SAMBA_GNU_MAKE_VERSION()
+GNU_MAKE_VERSION=$samba_cv_gnu_make_version
+AC_SUBST(GNU_MAKE_VERSION)
+
+new_make=no
+AC_MSG_CHECKING([for GNU make >= 3.81])
+if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
+       new_make=yes
+fi
+AC_MSG_RESULT($new_make)
+automatic_dependencies=no
+AX_CFLAGS_GCC_OPTION([-M -MT conftest.d -MF conftest.o], [], [ automatic_dependencies=$new_make ], [])
+AC_MSG_CHECKING([Whether to use automatic dependencies])
+AC_ARG_ENABLE(automatic-dependencies,
+[  --enable-automatic-dependencies Enable automatic dependencies],
+[ automatic_dependencies=$enableval ], 
+[ automatic_dependencies=no ])
+AC_MSG_RESULT($automatic_dependencies)
+AC_SUBST(automatic_dependencies)
+
 m4_include(build/m4/check_doc.m4)
+
+m4_include(build/m4/check_python.m4)
+
+m4_include(build/m4/ac_pkg_swig.m4)
+
+
+AC_PROG_SWIG(1.3.36)
+
+AC_SAMBA_PYTHON_DEVEL([
+SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
+SMB_ENABLE(EXT_LIB_PYTHON,YES)
+SMB_ENABLE(LIBPYTHON,YES)
+],[
+AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
+])
+
+AC_MSG_CHECKING(python library directory)
+pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
+AC_MSG_RESULT($pythondir)
+
+AC_SUBST(pythondir)

diff --git a/source4/configure.ac b/source4/configure.ac
index 62f9dc43a0a26bbd3feaabdc7c042dd6fb4d1e96..8fcaefdf6c2dca1ca3aecb77bbe06f3887793986 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -94,7 +94,6 @@ m4_include(lib/tls/config.m4)
 m4_include(lib/events/libevents.m4)
 
 dnl m4_include(auth/kerberos/config.m4)
-m4_include(scripting/python/config.m4)
 m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)