configure.ac: we should only create ldb.pc when use the internal ldb

[ira/wip.git] / source / configure.ac

diff --git a/source/configure.ac b/source/configure.ac
index bb0dbf47f11158eaa2be84b746f7b602f21085b0..e4e205e6268edc281fdff027e6aaba0c7a87fff7 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -27,11 +27,20 @@ m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(nsswitch/nsstest.m4)
 
+AC_OUTPUT(lib/registry/registry.pc)
+AC_OUTPUT(librpc/dcerpc.pc)
+AC_OUTPUT(librpc/ndr.pc)
+AC_OUTPUT(torture/torture.pc)
+AC_OUTPUT(auth/gensec/gensec.pc)
+AC_OUTPUT(param/samba-config.pc)
+AC_OUTPUT(librpc/dcerpc_samr.pc)
+
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0,
        [],
        [
                m4_include(lib/talloc/libtalloc.m4)
                SMB_INCLUDE_MK(lib/talloc/config.mk)
+               AC_OUTPUT(lib/talloc/talloc.pc)
        ]
 )
 
@@ -40,9 +49,12 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [
                m4_include(lib/tdb/libtdb.m4)
                SMB_INCLUDE_MK(lib/tdb/config.mk)
+               AC_OUTPUT(lib/tdb/tdb.pc)
        ]
 )
 
+SMB_INCLUDE_MK(lib/tdb/python.mk) 
+
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
        [
                SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
@@ -71,132 +83,16 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
                m4_include(lib/ldb/sqlite3.m4)
                m4_include(lib/ldb/libldb.m4)
                SMB_INCLUDE_MK(lib/ldb/config.mk)
+               AC_OUTPUT(lib/ldb/ldb.pc)
        ]
 )
+SMB_INCLUDE_MK(lib/ldb/python.mk) 
 
 m4_include(lib/tls/config.m4)
 m4_include(lib/events/config.m4)
 
 dnl m4_include(auth/kerberos/config.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_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-if test -z "$PYTHON"; then
-       AC_MSG_ERROR([No python found])
-fi
-
-AC_SUBST(PYTHON)
-
-#
-# Check for a version of Python >= 2.1.0
-#
-AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-       ver = string.split(sys.version)[[0]]; \
-       print ver >= '2.1.0'"`
-if test "$ac_supports_python_ver" != "True"; then
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([No recent version of python found])
-else 
-       AC_MSG_RESULT([yes])
-fi
-
-#
-# Check if you have distutils, else fail
-#
-AC_MSG_CHECKING([for the distutils Python package])
-ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-if test -z "$ac_distutils_result"; then
-       AC_MSG_RESULT([yes])
-else
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([distutils not available])
-fi
-
-#
-# Check for Python include path
-#
-AC_MSG_CHECKING([for Python include path])
-if test -z "$PYTHON_CPPFLAGS"; then
-       python_path=`$PYTHON -c "import distutils.sysconfig; \
-                       print distutils.sysconfig.get_python_inc();"`
-       if test -n "${python_path}"; then
-               python_path="-I$python_path"
-       fi
-       PYTHON_CPPFLAGS=$python_path
-fi
-AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-AC_SUBST([PYTHON_CPPFLAGS])
-
-#
-# Check for Python library path
-#
-AC_MSG_CHECKING([for Python library path])
-if test -z "$PYTHON_LDFLAGS"; then
-       # (makes two attempts to ensure we've got a version number
-       # from the interpreter)
-       py_version=`$PYTHON -c "from distutils.sysconfig import *; \
-               from string import join; \
-               print join(get_config_vars('VERSION'))"`
-       if test "$py_version" == "[None]"; then
-               if test -n "$PYTHON_VERSION"; then
-                       py_version=$PYTHON_VERSION
-               else
-                       py_version=`$PYTHON -c "import sys; \
-                               print sys.version[[:3]]"`
-               fi
-       fi
-
-       PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-               from string import join; \
-               print '-L' + get_python_lib(0,1), \
-                       '-lpython';"`$py_version
-fi             
-AC_MSG_RESULT([$PYTHON_LDFLAGS])
-AC_SUBST([PYTHON_LDFLAGS])
-
-#
-# Check for site packages
-#
-AC_MSG_CHECKING([for Python site-packages path])
-if test -z "$PYTHON_SITE_PKG"; then
-       PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-                       print distutils.sysconfig.get_python_lib(0,0);"`
-fi
-AC_MSG_RESULT([$PYTHON_SITE_PKG])
-AC_SUBST([PYTHON_SITE_PKG])
-
-#
-# libraries which must be linked in when embedding
-#
-AC_MSG_CHECKING(python extra libraries)
-if test -z "$PYTHON_EXTRA_LIBS"; then
-   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-                       conf = distutils.sysconfig.get_config_var; \
-                       print conf('LOCALMODLIBS'), conf('LIBS')"`
-fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-AC_SUBST(PYTHON_EXTRA_LIBS)
-
-#
-# linking flags needed when embedding
-#
-AC_MSG_CHECKING(python extra linking flags)
-if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-       PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-               conf = distutils.sysconfig.get_config_var; \
-               print conf('LINKFORSHARED')"`
-fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
-SMB_ENABLE(LIBPYTHON)
-
+m4_include(scripting/python/config.m4)
 m4_include(auth/gensec/config.m4)
 m4_include(smbd/process_model.m4)
 m4_include(ntvfs/posix/config.m4)
@@ -208,7 +104,6 @@ m4_include(kdc/config.m4)
 m4_include(ntvfs/sysdep/config.m4)
 m4_include(lib/appweb/config.m4)
 m4_include(nsswitch/config.m4)
-m4_include(libcli/config.m4)
 
 #################################################
 # add *_CFLAGS only for the real build