diff options
| author | Jeremy Allison <jra@samba.org> | 2007-12-21 13:14:59 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-12-21 13:14:59 -0800 |
| commit | 9a2b54dfb695d36eafed3e2184bc6c1d34a408f9 (patch) | |
| tree | b2a5aaf1e4a9491f6cd38bf4ff2fd0b35f5a902a | |
| parent | b775fe0a170f9b6043aaea2c025fd70528c7e7e8 (diff) | |
| parent | f2ebf076a41cf96b0367049ee979d5b98052b3db (diff) | |
| download | samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.tar.gz samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.tar.bz2 samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.zip | |
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)
| -rw-r--r-- | source3/configure.in | 1 | ||||
| -rw-r--r-- | source3/library-versions.in | 3 | ||||
| -rw-r--r-- | source3/pkgconfig/netapi.pc.in | 14 | ||||
| -rw-r--r-- | source3/pkgconfig/smbclient.pc.in | 14 | ||||
| -rw-r--r-- | source3/pkgconfig/smbsharemodes.pc.in | 14 |
5 files changed, 44 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index d077d9b956..1906d74505 100644 --- 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 ad6ecc4667..cdd1807e23 100644 --- 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 index 0000000000..b1f60b240e --- /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 index 0000000000..969abbe1ff --- /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 index 0000000000..dcb0d2eeda --- /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@ + |