summaryrefslogtreecommitdiff
path: root/source4/lib/registry
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-26 14:18:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:16 -0500
commit8ee1ee66edb1c98b63cbc26741080932995156a4 (patch)
tree06d6d15aeb9addb392328abcae53bb7673b7b91d /source4/lib/registry
parentbf300c868781fed3b0c0556b4e40608589ad1585 (diff)
downloadsamba-8ee1ee66edb1c98b63cbc26741080932995156a4.tar.gz
samba-8ee1ee66edb1c98b63cbc26741080932995156a4.tar.bz2
samba-8ee1ee66edb1c98b63cbc26741080932995156a4.zip
r11303: Support defining and installing public headers for libraries.
Support installing libraries. Get rid of pkg-config file (will be autogenerated later on). (This used to be commit b4745032a2c55752c527026feb221ccc3dce10c8)
Diffstat (limited to 'source4/lib/registry')
-rw-r--r--source4/lib/registry/config.m42
-rw-r--r--source4/lib/registry/config.mk1
-rw-r--r--source4/lib/registry/winregistry.pc.in10
3 files changed, 1 insertions, 12 deletions
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index d0d1d2c54b..27e55c63b4 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -5,8 +5,6 @@ if test t$BLDSHARED = ttrue; then
fi
LIBWINREG=libwinregistry
-AC_CONFIG_FILES(lib/registry/winregistry.pc)
-
SMB_MODULE_DEFAULT(registry_gconf, NOT)
SMB_EXT_LIB_FROM_PKGCONFIG(gconf, gconf-2.0)
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 288e3d21ee..51387df303 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -90,6 +90,7 @@ ADD_OBJ_FILES = \
patchfile.o
REQUIRED_SUBSYSTEMS = \
LIBBASIC
+PUBLIC_HEADERS = registry.h
# End MODULE registry_ldb
################################################
diff --git a/source4/lib/registry/winregistry.pc.in b/source4/lib/registry/winregistry.pc.in
deleted file mode 100644
index ad134da236..0000000000
--- a/source4/lib/registry/winregistry.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: winregistry
-Description: Windows registry library
-Version: @PACKAGE_VERSION@
-Libs: @LIBS@ @REG_LIBS@ -L${prefix}/lib -lwinregistry
-Cflags: -I${includedir} @CFLAGS@ @CFLAGS@