svn commit: samba r6790 - in branches/SAMBA_4_0/source/lib/ldb: .
include
jelmer at samba.org
jelmer at samba.org
Sat May 14 22:16:03 GMT 2005
Author: jelmer
Date: 2005-05-14 22:16:02 +0000 (Sat, 14 May 2005)
New Revision: 6790
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6790
Log:
Use config.h file for ldb and add test for stdint.h
Modified:
branches/SAMBA_4_0/source/lib/ldb/Makefile.in
branches/SAMBA_4_0/source/lib/ldb/autogen.sh
branches/SAMBA_4_0/source/lib/ldb/configure.in
branches/SAMBA_4_0/source/lib/ldb/include/includes.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2005-05-14 18:34:44 UTC (rev 6789)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2005-05-14 22:16:02 UTC (rev 6790)
@@ -7,8 +7,9 @@
libdir = @libdir@
bindir = @bindir@
WITH_GCOV = @WITH_GCOV@
+WITH_LDAP = @WITH_LDAP@
-ifeq ($(WITH_LDAP),1)
+ifeq ($(WITH_LDAP),yes)
OPENLDAP_PREFIX=/usr
LDAP_LIBS=-L$(OPENLDAP_PREFIX)/lib -llber -lldap
LDAP_FLAGS=-DHAVE_LDAP=1
Modified: branches/SAMBA_4_0/source/lib/ldb/autogen.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/autogen.sh 2005-05-14 18:34:44 UTC (rev 6789)
+++ branches/SAMBA_4_0/source/lib/ldb/autogen.sh 2005-05-14 22:16:02 UTC (rev 6790)
@@ -1,6 +1,7 @@
#!/bin/sh
autoconf || exit 1
+autoheader || exit 1
echo "Now run ./configure and then make."
exit 0
Modified: branches/SAMBA_4_0/source/lib/ldb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.in 2005-05-14 18:34:44 UTC (rev 6789)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.in 2005-05-14 22:16:02 UTC (rev 6790)
@@ -20,6 +20,10 @@
AC_FUNC_MMAP
AC_PATH_PROG(YODL2MAN,yodl2man)
AC_PATH_PROG(GCOV,gcov)
+AC_CHECK_HEADERS(stdint.h)
+AC_CONFIG_HEADER(include/config.h)
sinclude(ldap.m4)
+WITH_LDAP=$with_ldap_support
+AC_SUBST(WITH_LDAP)
sinclude(config.m4)
AC_OUTPUT(Makefile ldb.pc)
Modified: branches/SAMBA_4_0/source/lib/ldb/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/includes.h 2005-05-14 18:34:44 UTC (rev 6789)
+++ branches/SAMBA_4_0/source/lib/ldb/include/includes.h 2005-05-14 22:16:02 UTC (rev 6790)
@@ -5,8 +5,8 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include "config.h"
#include <stdio.h>
-#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
@@ -18,7 +18,9 @@
#include <fnmatch.h>
#include <sys/time.h>
#include <time.h>
+#ifdef HAVE_STDINT_H
#include <stdint.h>
+#endif
#include "ldb.h"
#include "ldb_private.h"
More information about the samba-cvs
mailing list