From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 19 Sep 2011 10:15:47 +0000 (+1000)
Subject: Merge branch 'master' of github.com:sahlberg/libnfs
X-Git-Tag: upstream/1.9.6^2~298
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=357f65c0e10b90e5bea7435d9b3925676e937c86;hp=5a1f14543499d49219245b3c0c274ca8c35919c1;p=deb_libnfs.git

Merge branch 'master' of github.com:sahlberg/libnfs
---

diff --git a/.gitignore b/.gitignore
index 0524f87..a7f4650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ libtool
 ltmain.sh
 missing
 stamp-h1
+
+!libnfs.pc.in
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 653060d..03e4419 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,7 @@
 SUBDIRS = mount nfs portmap rquota lib include . $(MAYBE_EXAMPLES)
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libnfs.pc
+
+EXTRA_DIST = README COPYING libnfs.pc.in
+
diff --git a/configure.ac b/configure.ac
index b1f289a..12b33cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,4 +88,4 @@ AC_CONFIG_FILES([Makefile]
                 [examples/Makefile]
                )
 
-AC_OUTPUT
+AC_OUTPUT([libnfs.pc])
diff --git a/libnfs.pc.in b/libnfs.pc.in
new file mode 100644
index 0000000..fdc012c
--- /dev/null
+++ b/libnfs.pc.in
@@ -0,0 +1,14 @@
+# libnfs pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libnfs
+Description: libnfs is a client library for accessing NFS shares over a network.
+Version: @VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} -lnfs
+Cflags: -I${includedir}
diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index 5450ede..03feb04 100644
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -91,6 +91,7 @@ development libraries for LibNFS
 %{_includedir}/nfsc/libnfs-raw-rquota.h
 %{_libdir}/libnfs.a
 %{_libdir}/libnfs.la
+%{_libdir}/pkgconfig/libnfs.pc
 
 %changelog
 * Sun Jul 31 2011 : Version 1.0