summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/configure.in24
-rw-r--r--source3/samba4.m41
-rw-r--r--source4/build/m4/ac_pkg_swig.m4 (renamed from source4/scripting/python/ac_pkg_swig.m4)0
-rw-r--r--source4/build/m4/check_make.m434
-rw-r--r--source4/build/m4/check_path.m42
-rw-r--r--source4/build/m4/check_perl.m416
-rw-r--r--source4/build/m4/check_python.m489
-rw-r--r--source4/build/m4/env.m449
-rw-r--r--source4/configure.ac1
-rw-r--r--source4/scripting/python/config.m483
10 files changed, 186 insertions, 113 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 1eba4a0a58..7d05b63122 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6219,7 +6219,29 @@ MSG
fi
AC_ARG_ENABLE(merged-build,
-[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])])
+[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
+[], [ enable_merged_build=auto ])
+
+if test x$enable_merged_build = xauto; then
+ merged_build_possible=yes
+
+ # Check for GNU make
+ m4_include(../source4/build/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])
+
+ AC_MSG_CHECKING([whether it would be possible to do a merged build])
+ AC_MSG_RESULT([$merged_build_possible])
+
+ dnl FIXME: enable_merged_build=$merged_build_possible
+fi
if test x$enable_merged_build = xyes; then
MERGED_BUILD=1
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 9cf01507de..2f932689e1 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -87,7 +87,6 @@ eventsdir="../source4/lib/events"
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)
diff --git a/source4/scripting/python/ac_pkg_swig.m4 b/source4/build/m4/ac_pkg_swig.m4
index 8d3561a0a7..8d3561a0a7 100644
--- a/source4/scripting/python/ac_pkg_swig.m4
+++ b/source4/build/m4/ac_pkg_swig.m4
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4
index f497684453..343913f884 100644
--- a/source4/build/m4/check_make.m4
+++ b/source4/build/m4/check_make.m4
@@ -6,34 +6,28 @@ dnl Released under the GNU GPL
dnl -------------------------------------------------------
dnl
+AC_DEFUN([AC_SAMBA_GNU_MAKE],
+[
AC_PATH_PROGS(MAKE,gmake make)
AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [
if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
then
- AC_MSG_ERROR([Unable to find GNU make])
+ samba_cv_gnu_make=no
+else
+ samba_cv_gnu_make=yes
+fi
+])
+if test x$samba_cv_gnu_make = xyes; then
+ $1
+else
+ $2
fi
])
+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_path.m4 b/source4/build/m4/check_path.m4
index 666dd3b0ae..f7266e6e44 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -43,7 +43,7 @@ if test x$fhs = xyes; then
winbindd_privileged_socket_dir="${localstatedir}/lib/samba/winbindd_privileged"
else
# Check to prevent installing directly under /usr without the FHS
- AS_IF([test $prefix == /usr || $prefix == /usr/local],[
+ AS_IF([test $prefix == /usr || test $prefix == /usr/local],[
AC_MSG_ERROR([Don't install directly under "/usr" or "/usr/local" without using the FHS option (--enable-fhs). This could lead to file loss!])
])
fi
diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4
index 82ca242499..aaec9cf950 100644
--- a/source4/build/m4/check_perl.m4
+++ b/source4/build/m4/check_perl.m4
@@ -5,6 +5,8 @@ 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
@@ -18,11 +20,13 @@ esac
if test x"$PERL" = x""; then
AC_MSG_WARN([No version of perl was found!])
- AC_MSG_ERROR([Please install perl from http://www.perl.com/])
+ $2
+else
+ if test x"$debug" = x"yes";then
+ PERL="$PERL -W"
+ fi
+ export PERL
+ $1
fi
-if test x"$debug" = x"yes";then
- PERL="$PERL -W"
-fi
-export PERL
+])
-AC_PATH_PROG(YAPP, yapp, false)
diff --git a/source4/build/m4/check_python.m4 b/source4/build/m4/check_python.m4
new file mode 100644
index 0000000000..96f93a3d75
--- /dev/null
+++ b/source4/build/m4/check_python.m4
@@ -0,0 +1,89 @@
+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' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), 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 6c040b9bab..360ce17a1c 100644
--- 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 97b1174a0f..5ea0e51edf 100644
--- 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)
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
deleted file mode 100644
index 843c3f7873..0000000000
--- a/source4/scripting/python/config.m4
+++ /dev/null
@@ -1,83 +0,0 @@
-m4_include(scripting/python/ac_pkg_swig.m4)
-
-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_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-if test -z "$PYTHON"; then
- working_python=no
- AC_MSG_WARN([No python found])
-fi
-
-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 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' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
- TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
-fi
-
-SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
-
-AC_MSG_CHECKING(working python module support)
-if test $working_python = yes; then
- SMB_ENABLE(EXT_LIB_PYTHON,YES)
- SMB_ENABLE(LIBPYTHON,YES)
- AC_MSG_RESULT([yes])
-else
- AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
-fi
-
-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)