Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

diff --git a/.gitignore b/.gitignore
index e51be509edf324c1148308e8fc139a8348c8132d..a8c1f9a4cc3860eb35a21046d5610c72bc8b198b 100644 (file)
--- 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 f7251f597b44bf6a35accb8747bf0edc241c5fd4..0a59e41b0371db626e51ad4612bdd98cec6ba62c 100644 (file)
--- 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 540a05d100b29b6e63475dcfcebcdbd1672158fa..af1b590c988ccaf5a93071e8d50384614cd82e26 100644 (file)
--- 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 820c55e363ef524b2e75f6bd0462a31d6abe68fb..89d6af90430b88751611b4cb5db8cc99a3720bb2 100644 (file)
--- 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 d6fe3158aafaacc2430157be73d089fe3c1a16dd..c06ac16de4418e13d057258144ec79fe0c46f281 100755 (executable)
--- 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 => {