r12254: Add some (hopefully correct) descriptions for libraries that are installed.

Install pkg-config files.
(This used to be commit a86abe84e2cae7c6188c094a92c6b62aace02fdf)

15 files changed, 29 insertions, 3 deletions

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 57f7bc4f0d..8c51560f86 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -3,6 +3,7 @@
 [LIBRARY::GENSEC]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Generic Security Library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
 INIT_FUNCTION = gensec_init
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 986d1aa213..6982e28977 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -238,7 +238,7 @@ sub SharedLibrary($$)
 {
 	my ($self,$ctx) = @_;
 
-	push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_NAME}");
+	push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}");
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
 	$self->_prepare_list($ctx, "CFLAGS");
@@ -408,6 +408,11 @@ sub PkgConfig($$)
 	$link_name =~ s/^LIB//g;
 	$link_name = lc($link_name);
 
+	if (not defined($ctx->{DESCRIPTION})) {
+		warn("$ctx->{NAME} has not DESCRIPTION set, not generating .pc file");
+		return;
+	}
+
 	my $path = "$ctx->{BASEDIR}/$link_name.pc";
 
 	push (@{$self->{pc_files}}, $path);
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index da3ee1353d..5ad1fa7184 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -4,6 +4,7 @@
 # Start SUBSYSTEM GTKSMB
 [LIBRARY::GTKSMB]
 MAJOR_VERSION = 0
+DESCRIPTION = Common Samba-related widgets for GTK+ applications
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index a531145060..486f8d8a1e 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -32,6 +32,7 @@ PUBLIC_HEADERS = tdr/tdr.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Simple marshall/unmarshall library
 INIT_OBJ_FILES = tdr/tdr.o
 
 ##############################
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 31c75a1712..a47fd59577 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -80,6 +80,7 @@ NOPROTO = YES
 [LIBRARY::LIBLDB]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = LDAP-like embedded database library
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
 		common/ldb.o
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 51387df303..a76595b94d 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -81,6 +81,7 @@ REQUIRED_SUBSYSTEMS = \
 [LIBRARY::REGISTRY]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Windows-style registry library
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
 		common/reg_interface.o
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index f98a456261..ff6771a244 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Library for reading Samba3 data files
 PUBLIC_HEADERS = samba3.h
 ADD_OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
 		idmap.o winsdb.o samba3.o group.o \
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index b4a4d8c4d0..92a97e557e 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -5,6 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES
+DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 INIT_OBJ_FILES = socket_wrapper.o
 # End SUBSYSTEM SOCKET_WRAPPER
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 4d96b6c161..69483aad92 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Trivial Database Library
 INIT_OBJ_FILES = \
 		common/tdb.o
 ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index cbbc2f4235..782dac2dd7 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -34,6 +34,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = NetBios over TCP/IP client library
 ADD_OBJ_FILES = \
 	nbt/nbtname.o \
 	nbt/nbtsocket.o \
@@ -58,6 +59,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = CLDAP client library
 ADD_OBJ_FILES = cldap/cldap.o
 PUBLIC_HEADERS = cldap/cldap.h
 NOPROTO=YES
@@ -67,6 +69,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = WINS Replication client library
 ADD_OBJ_FILES = \
 	wrepl/winsrepl.o
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
@@ -84,6 +87,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = SMB/CIFS client library
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
 	LIBCLI_DGRAM LIBCLI_SMB2
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 0234f3f866..e998675fcb 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = User-friendly access to Samba interfaces
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
 				 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
 				 libnet_vampire.h userinfo.h userman.h
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index bf50a23608..fafdae0f9c 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
 INIT_OBJ_FILES = \
 		ndr/ndr.o
@@ -539,6 +540,7 @@ NOPROTO = YES
 [LIBRARY::LIBRPC]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = DCE/RPC client library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = rpc/dcerpc.h
 REQUIRED_SUBSYSTEMS = LIBNDR RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER
diff --git a/source4/main.mk b/source4/main.mk
index 74d33c8f32..585265bc24 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -65,6 +65,7 @@ INSTALLPERMS = 0755
 # These can be overridden by command line switches (see smbd(8))
 # or in smb.conf (see smb.conf(5))
 CONFIGFILE = $(CONFIGDIR)/smb.conf
+PKGCONFIGDIR = $(LIBDIR)/pkgconfig
 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
 
 PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
@@ -75,7 +76,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
 	 -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\"
 
 install: showlayout installbin installdat installswat installmisc installlib \
-	installheader
+	installheader installpc
 
 # DESTDIR is used here to prevent packagers wasting their time
 # duplicating the Makefile. Remove it and you will have the privilege
@@ -86,7 +87,7 @@ install: showlayout installbin installdat installswat installmisc installlib \
 # is not used.
 
 installdirs:
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(PKGCONFIGDIR)
 
 installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
 	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
@@ -111,6 +112,9 @@ installman: installdirs
 installmisc: installdirs
 	@$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)
 
+installpc: installdirs
+	@cp $(PC_FILES) $(DESTDIR)$(PKGCONFIGDIR)
+
 uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader
 
 uninstallmisc:
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 12bea83825..cefc704c6e 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -3,6 +3,7 @@
 [LIBRARY::LIBWINBIND_CLIENT]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Client library for communicating with winbind
 RELEASE_VERSION = 1
 ADD_OBJ_FILES = wb_common.o
 NOPROTO=YES
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 2ab484610e..95f0886d06 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -77,6 +77,7 @@ ADD_OBJ_FILES = \
 PUBLIC_HEADERS = ntvfs.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Virtual File System with NTFS semantics
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
 		ntvfs_base.o