[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-804-gb14d61a
Jelmer Vernooij
jelmer at samba.org
Wed Feb 13 16:05:03 GMT 2008
The branch, v4-0-test has been updated
via b14d61a3b8055b7a8172e18e5bd69e7cab6eacdb (commit)
via 86f88eb7b51377344eebf0b6fabad0f5459b3f45 (commit)
via 5572bf854d935f3fc526a38378d23791da249f0f (commit)
via aea50426366dbe971d25d2a948db57885ce224b9 (commit)
from 0c5539e5fedd4123f61d50ee29acdc5a5f0faf76 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b14d61a3b8055b7a8172e18e5bd69e7cab6eacdb
Merge: 86f88eb7b51377344eebf0b6fabad0f5459b3f45 0c5539e5fedd4123f61d50ee29acdc5a5f0faf76
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 13 17:03:49 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
commit 86f88eb7b51377344eebf0b6fabad0f5459b3f45
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 13 17:01:37 2008 +0100
Never build .so versions of tdb/talloc from Samba 4 itself. Rather,
use shared library versions if they are provided by the system.
This puts talloc and tdb in a similar situation as popt:
the system version is used if provided but if it's not there or if it
is too old, we use our internal version statically.
commit 5572bf854d935f3fc526a38378d23791da249f0f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 13 16:24:25 2008 +0100
Ignore pidl Makefile, which is autogenerated.
commit aea50426366dbe971d25d2a948db57885ce224b9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 13 02:28:41 2008 +0100
Add simple test for ETT_FIELD.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
source/configure.ac | 2 --
source/lib/talloc/config.mk | 4 +---
source/lib/tdb/config.mk | 4 +---
source/pidl/tests/wireshark-conf.pl | 5 ++++-
5 files changed, 7 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index e51be50..a8c1f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+source/pidl/Makefile
source/mkconfig.mk
source/test-results
source/lib/gencache/gencache.h
diff --git a/source/configure.ac b/source/configure.ac
index f7251f5..0a59e41 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -40,7 +40,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0,
[
m4_include(lib/talloc/libtalloc.m4)
SMB_INCLUDE_MK(lib/talloc/config.mk)
- AC_CONFIG_FILES(lib/talloc/talloc.pc)
]
)
@@ -49,7 +48,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
[
m4_include(lib/tdb/libtdb.m4)
SMB_INCLUDE_MK(lib/tdb/config.mk)
- AC_CONFIG_FILES(lib/tdb/tdb.pc)
]
)
diff --git a/source/lib/talloc/config.mk b/source/lib/talloc/config.mk
index 540a05d..af1b590 100644
--- a/source/lib/talloc/config.mk
+++ b/source/lib/talloc/config.mk
@@ -1,8 +1,6 @@
[LIBRARY::LIBTALLOC]
-VERSION = 1.2.0
-SO_VERSION = 1
+OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = talloc.o
-PC_FILE = talloc.pc
MANPAGE = talloc.3
CFLAGS = -Ilib/talloc
PUBLIC_HEADERS = talloc.h
diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index 820c55e..89d6af9 100644
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -1,9 +1,7 @@
################################################
# Start SUBSYSTEM LIBTDB
[LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = tdb.pc
+OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = \
common/tdb.o common/dump.o common/io.o common/lock.o \
common/open.o common/traverse.o common/freelist.o \
diff --git a/source/pidl/tests/wireshark-conf.pl b/source/pidl/tests/wireshark-conf.pl
index d6fe315..c06ac16 100755
--- a/source/pidl/tests/wireshark-conf.pl
+++ b/source/pidl/tests/wireshark-conf.pl
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 47;
+use Test::More tests => 48;
use FindBin qw($RealBin);
use lib "$RealBin";
use Util;
@@ -164,6 +164,9 @@ test_errors("nofile:1: no dissectorname specified\n",
test_errors("nofile:1: incomplete HF_FIELD command\n",
sub { parse_conf("HF_FIELD hf_idx\n"); });
+test_errors("nofile:1: incomplete ETT_FIELD command\n",
+ sub { parse_conf("ETT_FIELD\n"); });
+
is_deeply(parse_conf("TYPE winreg_String dissect_myminregstring(); FT_STRING BASE_DEC 0 0 0 2\n"), {
types => {
winreg_String => {
--
Samba Shared Repository
More information about the samba-cvs
mailing list