From 95caeb1046c1899075238400fb07092542c91dcd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Nov 2006 03:26:11 +0000 Subject: r19678: Fix the build for now (ugly hack because of circular dependencies) (This used to be commit 0953bb7d5f2f2a81688f5421e1fbfa3bc38aa810) --- source4/build/smb_build/config_mk.pm | 1 + source4/lib/charset/config.mk | 1 + source4/utils/config.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index c11a0458d8..f89e817f5f 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -76,6 +76,7 @@ my $section_types = { "PUBLIC_HEADERS" => "list", "CFLAGS" => "list", + "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", "USE_HOSTCC" => "bool" diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 4f0c80c79d..fff447574f 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -9,5 +9,6 @@ PUBLIC_HEADERS = charset.h PUBLIC_PROTO_HEADER = charset_proto.h PUBLIC_DEPENDENCIES = ICONV PRIVATE_DEPENDENCIES = DYNCONFIG +LDFLAGS = -lsamba-config -lsamba-util # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 69d5a3b77f..0e5b5e2990 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -50,6 +50,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-UTIL \ NDR_XATTR \ WRAP_XATTR + # End BINARY getntacl ################################# -- cgit