From 58667ce79cf12408c51c34f364840ed6b6d03074 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 27 Aug 2009 14:30:32 +0000
Subject: [PATCH] Add pkg-config script and document versioning.

---
 Makefile.am    |  4 ++++
 NEWS           | 15 ++++++++++++++-
 configure.ac   |  1 +
 ykpers-1.pc.in | 11 +++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 ykpers-1.pc.in

diff --git a/Makefile.am b/Makefile.am
index 806f560..7a13049 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,10 +44,14 @@ libykpers_1_la_SOURCES = ykpers.c ykpbkdf2.h ykpbkdf2.c
 libykpers_1_la_SOURCES += rfc4634/hmac.c rfc4634/usha.c rfc4634/sha.h	\
 	rfc4634/sha1.c rfc4634/sha224-256.c rfc4634/sha384-512.c	\
 	rfc4634/sha-private.h
+libykpers_1_la_SOURCES += ykpers-1.pc.in
 libykpers_1_la_LIBADD = $(LTLIBYUBIKEY) ./ykcore/libykcore.la
 libykpers_1_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ykpers-1.pc
+
 # The command line tools.
 
 bin_PROGRAMS = ykpersonalize
diff --git a/NEWS b/NEWS
index e8cba20..7f7b8e7 100644
--- a/NEWS
+++ b/NEWS
@@ -7,11 +7,24 @@ It's still possible to give modhex numbers by preceding them with
 `m:'.
 
 ** Make it possible to program the second configuration.
-Added the two flags -1 and -2 to ykpersonalize.
+Added the two flags -1 and -2 to ykpersonalize.  This is to support
+the YubiKey II.
 
 ** Have ykpersonalize show the new configuration and prompt.
 This makes it possible for the user to prevent incorrect configurations.
 
+** Rename installed library to "libykpers-1" and place
+** installed header files in sub-directory ykpers-1/.
+From now on we promise to retain API and ABI under this name forever.
+The shared library will be installed as /usr/lib/libykpers-1.so and
+the header files into /usr/include/ykpers-1/.  If there is ever an
+incompatible API or ABI change in the future, it will be released as a
+a new library libykpers-2 with header files in ykpers-2/.
+
+** Add pkg-config script "ykpers-1".
+To learn which flags to build the applications that uses the library,
+use "pkg-config --cflags --libs ykpers-1".
+
 * Version 0.95 (released 2009-08-17)
 
 ** Enable handling of programming access code.
diff --git a/configure.ac b/configure.ac
index 9b8fcdc..e308ad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ fi
 
 AC_CONFIG_FILES([
   Makefile
+  ykpers-1.pc
   ykcore/Makefile
 ])
 AC_OUTPUT
diff --git a/ykpers-1.pc.in b/ykpers-1.pc.in
new file mode 100644
index 0000000..4d0a700
--- /dev/null
+++ b/ykpers-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Libykpers
+Description: Personalization library for the YubiKey
+URL: http://www.yubico.com/
+Version: @VERSION@
+Libs: -L${libdir} -lykpers-1
+Cflags: -I${includedir}/ykpers-1
-- 
2.39.5