From: Günther Deschner Date: Thu, 22 Aug 2013 13:00:32 +0000 (+0200) Subject: pkgconfig: Do not hardcode library version numbers in pc files. X-Git-Tag: talloc-2.1.0~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=573b455de9a45990446af26eea01539a32fef209;p=thirdparty%2Fsamba.git pkgconfig: Do not hardcode library version numbers in pc files. We control version numbers via 'vnum' from the wscript_build files for all other libraries. In case of libndr we already reported a wrong 0.0.1 version via pkgconfig while in fact the library is versioned as 0.0.2. Guenther Signed-off-by: Günther Deschner Reviewed-by: Kai Blin Autobuild-User(master): Kai Blin Autobuild-Date(master): Thu Aug 22 20:48:44 CEST 2013 on sn-devel-104 --- diff --git a/lib/torture/torture.pc.in b/lib/torture/torture.pc.in index 459b35c582a..e0421b0441b 100644 --- a/lib/torture/torture.pc.in +++ b/lib/torture/torture.pc.in @@ -7,6 +7,6 @@ modulesdir=${prefix}/modules/torture Name: torture Description: Samba torture (test) suite Requires: talloc -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -ltorture Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/lib/util/samba-util.pc.in b/lib/util/samba-util.pc.in index a49c1d0290e..65876c45475 100644 --- a/lib/util/samba-util.pc.in +++ b/lib/util/samba-util.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: samba-util Description: Samba utility functions Requires: talloc tevent -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lsamba-util Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/librpc/ndr.pc.in b/librpc/ndr.pc.in index 1ee50cc2ce7..6828ac07ff5 100644 --- a/librpc/ndr.pc.in +++ b/librpc/ndr.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: ndr Description: Network Data Representation Core Library Requires: samba-util talloc -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lndr Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/librpc/ndr_krb5pac.pc.in b/librpc/ndr_krb5pac.pc.in index 21ecb55db75..597bbd10ab9 100644 --- a/librpc/ndr_krb5pac.pc.in +++ b/librpc/ndr_krb5pac.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: ndr-krb5pac Description: NDR marshallers for the KRB5 PAC formats Requires: ndr -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lndr-krb5pac Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/librpc/ndr_nbt.pc.in b/librpc/ndr_nbt.pc.in index 5b69699d09d..2083e2d5ce0 100644 --- a/librpc/ndr_nbt.pc.in +++ b/librpc/ndr_nbt.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: ndr-nbt Description: NDR marshallers for nbt formats Requires: ndr -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lndr-nbt Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1 diff --git a/librpc/ndr_standard.pc.in b/librpc/ndr_standard.pc.in index d400ef1da04..97687ba3280 100644 --- a/librpc/ndr_standard.pc.in +++ b/librpc/ndr_standard.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: ndr-standard Description: NDR marshallers for the standard set of DCE/RPC interfaces Requires: ndr -Version: 0.0.1 +Version: @PACKAGE_VERSION@ Libs: @LIB_RPATH@ -L${libdir} -lndr-standard Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1