diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 4 | ||||
| -rwxr-xr-x | source4/pidl/tests/wireshark-conf.pl | 5 |
5 files changed, 7 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index e51be509ed..a8c1f9a4cc 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/source4/configure.ac b/source4/configure.ac index f7251f597b..0a59e41b03 100644 --- a/source4/configure.ac +++ b/source4/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/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 540a05d100..af1b590c98 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/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/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 820c55e363..89d6af9043 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/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/source4/pidl/tests/wireshark-conf.pl b/source4/pidl/tests/wireshark-conf.pl index d6fe3158aa..c06ac16de4 100755 --- a/source4/pidl/tests/wireshark-conf.pl +++ b/source4/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 => { |