Add pkg-config meta files, suggested by Stéphane LOEUILLET

<stephane.loeuillet@tiscali.fr>.

7 files changed, 58 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 6a71b07c4f..cc6426ce0f 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ See the end for copying conditions.
   actual OID.
 - Add parameter --la-file to libgnutls-config and libgnutls-extra-config,
   tiny patch contributed by Joe Orton <joe@manyfish.co.uk>.
+- Add pkg-config meta files, suggested by Stéphane LOEUILLET
+  <stephane.loeuillet@tiscali.fr>.
 
 * Version 1.1.20 (2004-10-12)
 - Fix compile problem in gl/getpass.c on some systems.
diff --git a/THANKS b/THANKS
index 7da5fe5f7b..da4a49b7be 100644
--- a/THANKS
+++ b/THANKS
@@ -29,6 +29,7 @@ Simon Posnjak                   <simon.posnjak@cetrtapot.si>
 Gerrit P. Haase                 <gp@familiehaase.de>
 Yoann Vandoorselaere            <yoann@prelude-ids.org>
 Joe Orton                       <joe@manyfish.co.uk>
+Stéphane LOEUILLET              <stephane.loeuillet@tiscali.fr>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/configure.in b/configure.in
index afce49235f..f1d32046fc 100644
--- a/configure.in
+++ b/configure.in
@@ -553,6 +553,7 @@ src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \
 doc/scripts/Makefile lib/minitasn1/Makefile lib/x509/Makefile \
 includes/Makefile includes/gnutls/Makefile doc/manpages/Makefile \
 gl/Makefile nettle/Makefile nettle/tests/Makefile \
-crypto/Makefile tests/Makefile])
+crypto/Makefile tests/Makefile \
+lib/gnutls.pc libextra/gnutls-extra.pc])
 
 AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2d2cf44fce..808896a6e1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,11 @@ bin_SCRIPTS = libgnutls-config
 m4datadir = $(datadir)/aclocal
 dist_m4data_DATA = libgnutls.m4
 
+# Pkg-config script.
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnutls.pc
+DISTCLEANFILES = $(pkgconfig_DATA)
+
 if HAVE_LD_VERSION_SCRIPT
   libgnutls_version_script_cmd = -Wl,--version-script=$(srcdir)/libgnutls.vers
 else
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
new file mode 100644
index 0000000000..381708d8b0
--- /dev/null
+++ b/lib/gnutls.pc.in
@@ -0,0 +1,21 @@
+# Process this file with autoconf to produce a pkg-config metadata file.
+# Copyright 2002, 2004  Simon Josefsson
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GnuTLS
+Description: Transport Security Layer implementation for the GNU system
+Version: @VERSION@
+Libs: -L${libdir} -lgnutls
+Cflags: -I${includedir}
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 9f1698328e..2545f3bbd2 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -5,6 +5,11 @@ DIST_SUBDIRS = openpgp opencdk
 m4datadir = $(datadir)/aclocal
 m4data_DATA = libgnutls-extra.m4
 
+# Pkg-config script.
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnutls-extra.pc
+DISTCLEANFILES = $(pkgconfig_DATA)
+
 if HAVE_LD_VERSION_SCRIPT
   libgnutls_extra_version_script_cmd = -Wl,--version-script=$(srcdir)/libgnutls-extra.vers
 else
diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in
new file mode 100644
index 0000000000..8e698796bd
--- /dev/null
+++ b/libextra/gnutls-extra.pc.in
@@ -0,0 +1,22 @@
+# Process this file with autoconf to produce a pkg-config metadata file.
+# Copyright 2002, 2004  Simon Josefsson
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+# 
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GnuTLS-extra
+Description: Additional add-ons for GnuTLS licensed under GPL
+Requires: gnutls
+Version: @VERSION@
+Libs: -L${libdir} -lgnutls-extra
+Cflags: -I${includedir}