summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-20 11:03:45 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-20 11:03:45 +1000
commitcb42e59b77ca71d949dd88b3f121946c06a97d29 (patch)
tree2b46811cf63c0feae00cf1512723bc7f793aae9e
parent8052309d5a4d0d4b7c63806cfdba5e6dcc161461 (diff)
parent7015b7840c0e8bc85c77de2442b46a8c71449163 (diff)
downloadsamba-cb42e59b77ca71d949dd88b3f121946c06a97d29.tar.gz
samba-cb42e59b77ca71d949dd88b3f121946c06a97d29.tar.bz2
samba-cb42e59b77ca71d949dd88b3f121946c06a97d29.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 67b47606b9c5b794d8feea5ba200098e9b9e33e3)
-rw-r--r--source4/auth/ntlmssp/config.mk2
-rw-r--r--source4/lib/tdb/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index ca58e28a24..129f58de83 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -2,7 +2,7 @@
MSRPC_PARSE_OBJ_FILES = $(addprefix $(authsrcdir)/ntlmssp/, ntlmssp_parse.o)
-$(eval $(call proto_header_template,$(authsrcdir)/ntlmssp/msrpc_parse.h,$(MSRPC_PARSE_OBJ_FILES)))
+$(eval $(call proto_header_template,$(authsrcdir)/ntlmssp/msrpc_parse.h,$(MSRPC_PARSE_OBJ_FILES:.o=.c)))
################################################
# Start MODULE gensec_ntlmssp
diff --git a/source4/lib/tdb/configure.ac b/source4/lib/tdb/configure.ac
index 9b16a82c33..eaf70d30b4 100644
--- a/source4/lib/tdb/configure.ac
+++ b/source4/lib/tdb/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(tdb, 1.1.1)
+AC_INIT(tdb, 1.1.2)
AC_CONFIG_SRCDIR([common/tdb.c])
AC_CONFIG_HEADER(include/config.h)
AC_LIBREPLACE_ALL_CHECKS