Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

Conflicts:

	source/library-versions.in
(This used to be commit 11acca7d3884731491709dd09b7de2edc8bb5811)

diff --git a/source3/configure.in b/source3/configure.in
index d077d9b9560c4b0bea91c0f59280f24cae92744b..1906d7450547b16222ce7e6ccfee6c46ab21243f 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6626,6 +6626,7 @@ AC_SUBST(SMBD_LIBS)
 AC_OUTPUT(Makefile library-versions
          script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
          lib/netapi/examples/Makefile
+         pkgconfig/smbclient.pc pkgconfig/netapi.pc pkgconfig/smbsharemodes.pc
          )
 
 #################################################

diff --git a/source3/library-versions.in b/source3/library-versions.in
index ad6ecc466726c3cda5af906b99ccae425146fb45..cdd1807e232de851c2dda442799a8dbc0a253ebc 100644 (file)
--- a/source3/library-versions.in
+++ b/source3/library-versions.in
@@ -5,6 +5,5 @@
 bin/libsmbclient.@SHLIBEXT@:0:1
 bin/libsmbsharemodes.@SHLIBEXT@:0:2
 bin/libaddns.@SHLIBEXT@:0:1
-bin/libmsrpc.@SHLIBEXT@:0:1
 bin/libwbclient.@SHLIBEXT@:0:1
-
+bin/libnetapi.@SHLIBEXT@:0:1

diff --git a/source3/pkgconfig/netapi.pc.in b/source3/pkgconfig/netapi.pc.in
new file mode 100644 (file)
index 0000000..b1f60b2
--- /dev/null
+++ b/source3/pkgconfig/netapi.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Samba libnetapi
+Description: A library to control CIFS servers
+Version: 0
+URL: http://www.samba.org/
+#Libs: -L@libdir@ -lnetapi
+Libs: -lnetapi
+Libs.private: -lnetapi @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
+Cflags: -I@includedir@
+

diff --git a/source3/pkgconfig/smbclient.pc.in b/source3/pkgconfig/smbclient.pc.in
new file mode 100644 (file)
index 0000000..969abbe
--- /dev/null
+++ b/source3/pkgconfig/smbclient.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Samba libsmbclient
+Description: A library to access CIFS servers
+Version: 0
+URL: http://www.samba.org/
+#Libs: -L@libdir@ -lsmbclient
+Libs: -lsmbclient
+Libs.private: -lsmbclient @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
+Cflags: -I@includedir@
+

diff --git a/source3/pkgconfig/smbsharemodes.pc.in b/source3/pkgconfig/smbsharemodes.pc.in
new file mode 100644 (file)
index 0000000..dcb0d2e
--- /dev/null
+++ b/source3/pkgconfig/smbsharemodes.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Samba libsmbsharemodes
+Description: A library
+Version: 0
+URL: http://www.samba.org/
+#Libs: -L@libdir@ -lsmbsharemodes
+Libs: -lsmbsharemodes
+Libs.private: -lsmbsharemodes @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
+Cflags: -I@includedir@
+