Merge branch 'master' of ssh://git.samba.org/data/git/samba
[mat/samba.git] / source3 / samba4.m4
index edfc0092dcf2dbebdf6df8956efb4f8b9bdc746f..02f0e853e5bf9b56e815087e44ca6ada9dd7b37d 100644 (file)
@@ -1,51 +1,71 @@
-BLDSHARED=true
 AC_SUBST(BLDSHARED)
 smbtorture4_path=bin/smbtorture4
 m4_include(build/m4/public.m4)
 
+m4_include(build/m4/check_python.m4)
+
+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)
+
 m4_include(lib/smbreadline/readline.m4)
 m4_include(heimdal_build/internal.m4)
-m4_include(lib/util/fault.m4)
-m4_include(lib/util/signal.m4)
-m4_include(lib/util/util.m4)
-m4_include(lib/util/fsusage.m4)
-m4_include(lib/util/xattr.m4)
-m4_include(lib/util/capability.m4)
-m4_include(lib/util/time.m4)
-m4_include(lib/popt/samba.m4)
-m4_include(lib/charset/config.m4)
+m4_include(../lib/util/fault.m4)
+m4_include(../lib/util/signal.m4)
+m4_include(../lib/util/util.m4)
+m4_include(../lib/util/fsusage.m4)
+m4_include(../lib/util/xattr.m4)
+m4_include(../lib/util/capability.m4)
+m4_include(../lib/util/time.m4)
+m4_include(../lib/popt/samba.m4)
+m4_include(../lib/util/charset/config.m4)
 m4_include(lib/socket/config.m4)
-m4_include(nsswitch/nsstest.m4)
-m4_include(pidl/config.m4)
-m4_include(lib/zlib.m4)
-
-AC_CONFIG_FILES(../samba4/source/lib/registry/registry.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/ndr.pc)
-AC_CONFIG_FILES(../samba4/source/lib/torture/torture.pc)
-AC_CONFIG_FILES(../samba4/source/auth/gensec/gensec.pc)
-AC_CONFIG_FILES(../samba4/source/param/samba-hostconfig.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc_samr.pc)
-AC_CONFIG_FILES(../samba4/source/librpc/dcerpc_atsvc.pc)
+m4_include(../nsswitch/nsstest.m4)
+m4_include(../pidl/config.m4)
+AC_ZLIB([
+SMB_EXT_LIB(ZLIB, [${ZLIB_LIBS}])
+],[
+SMB_INCLUDE_MK(lib/zlib.mk)
+])
+
+
+AC_CONFIG_FILES(../source4/lib/registry/registry.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc.pc)
+AC_CONFIG_FILES(../librpc/ndr.pc)
+AC_CONFIG_FILES(../lib/torture/torture.pc)
+AC_CONFIG_FILES(../source4/auth/gensec/gensec.pc)
+AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc_samr.pc)
+AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],
        [
-               SMB_INCLUDE_MK(lib/talloc/config.mk)
+               SMB_INCLUDE_MK(../lib/talloc/config.mk)
        ]
 )
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.3,
        [],
        [
-               m4_include(lib/tdb/libtdb.m4)
-               SMB_INCLUDE_MK(lib/tdb/config.mk)
+               m4_include(../lib/tdb/libtdb.m4)
+               SMB_INCLUDE_MK(../lib/tdb/config.mk)
        ]
 )
 
-SMB_INCLUDE_MK(lib/tdb/python.mk) 
+SMB_INCLUDE_MK(../lib/tdb/python.mk) 
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
        [
                SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
                SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
@@ -69,12 +89,12 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
                        AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
                fi
                ])
-               ldbdir="\$(abspath \$(srcdir)/../samba4/source/lib/ldb)"
+               ldbdir="\$(abspath \$(srcdir)/../source4/lib/ldb)"
                AC_SUBST(ldbdir)
                m4_include(lib/ldb/sqlite3.m4)
                m4_include(lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(lib/ldb/config.mk)
-               AC_CONFIG_FILES(../samba4/source/lib/ldb/ldb.pc)
+               AC_CONFIG_FILES(../source4/lib/ldb/ldb.pc)
        ]
 )
 SMB_INCLUDE_MK(lib/ldb/python.mk) 
@@ -83,11 +103,10 @@ SMB_INCLUDE_MK(lib/ldb/python.mk)
 SMB_ENABLE(swig_ldb,YES)
 
 m4_include(lib/tls/config.m4)
-eventsdir="../samba4/source/lib/events"
-m4_include(lib/events/libevents.m4)
+teventdir="../lib/tevent"
+m4_include(../lib/tevent/libtevent.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)
@@ -95,21 +114,35 @@ m4_include(ntvfs/unixuid/config.m4)
 m4_include(auth/config.m4)
 m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
-m4_include(lib/appweb/config.m4)
-m4_include(nsswitch/config.m4)
+m4_include(../nsswitch/config.m4)
+
+AC_SUBST(INTERN_LDFLAGS)
+AC_SUBST(INSTALL_LINK_FLAGS)
+if test $USESHARED = "true";
+then
+       INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
+       INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
+else
+       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
+fi
 
 dnl Samba 4 files
 AC_SUBST(LD)
 AC_LIBREPLACE_SHLD_FLAGS
-SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ])
+SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
                 
 oldbuilddir="$builddir"
-builddir="$builddir/../samba4/source"
-SMB_WRITE_PERLVARS(../samba4/source/build/smb_build/config.pm)
+builddir="$builddir/../source4"
+oldsrcdir="$srcdir"
+srcdir="$srcdir/../source4"
+AC_SUBST(srcdir)
+AC_SUBST(builddir)
+SMB_WRITE_PERLVARS(../source4/build/smb_build/config.pm)
 builddir="$oldbuilddir"
+srcdir="$oldsrcdir"
 
-echo "configure: creating ../samba4/source/config.mk"
-cat >../samba4/source/config.mk<<CEOF
+echo "configure: creating ../source4/config.mk"
+cat >../source4/config.mk<<CEOF
 # config.mk - Autogenerated by configure, DO NOT EDIT!
 $SMB_INFO_EXT_LIBS
 $SMB_INFO_SUBSYSTEMS
@@ -117,11 +150,11 @@ $SMB_INFO_LIBRARIES
 CEOF
 
 AC_OUTPUT_COMMANDS([
-cd ${srcdir}/../samba4/source
-USESHARED=false $PERL -I${builddir} -I${builddir}/build \
+cd ${srcdir}/../source4
+$PERL -I${builddir} -I${builddir}/build \
     -I. -Ibuild \
-    build/smb_build/main.pl --output=../../source/samba4-data.mk main.mk || exit $?
-cd ../../source
+    build/smb_build/main.pl --output=../source3/samba4-data.mk main.mk || exit $?
+cd ../source3
 ],[
 srcdir="$srcdir"
 builddir="$builddir"