BIND 10 master, updated. 4846fa711c1003092a15f61be4ccd0660828a28c [master] Make a minor whitespace fix to the last but one ChangeLog entry

[BIND 10 source code commits]

The branch, master has been updated
       via  4846fa711c1003092a15f61be4ccd0660828a28c (commit)
       via  8c1eb198095738cac179dd2252119cfb27f47fdd (commit)
       via  fcf2f08db9ebc2198236bfa25cf73286821cba6b (commit)
      from  7d8efaf11c66fc7dfbb79060ded52f779fd523f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4846fa711c1003092a15f61be4ccd0660828a28c
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon May 7 10:42:38 2012 +0530

    [master] Make a minor whitespace fix to the last but one ChangeLog entry

commit 8c1eb198095738cac179dd2252119cfb27f47fdd
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon May 7 10:42:15 2012 +0530

    [1930] Add ChangeLog entry

commit fcf2f08db9ebc2198236bfa25cf73286821cba6b
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 4 15:15:51 2012 +0530

    [1930] Install headers into bind10-specific directory

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                     |    2 ++
 ChangeLog                      |    7 ++++++-
 Makefile.am                    |    3 +++
 configure.ac                   |    1 +
 dns++.pc.in                    |   11 +++++++++++
 src/lib/dns/Makefile.am        |    2 +-
 src/lib/exceptions/Makefile.am |    2 +-
 7 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 dns++.pc.in

-----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1dfbe9f..da9d3b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ TAGS
 /missing
 /py-compile
 /stamp-h1
+
+/dns++.pc
diff --git a/ChangeLog b/ChangeLog
index 63b14aa..20164c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-431.	[func]*         muks
+432.	[bug]*		muks
+	BIND 10 now installs its header files in a BIND 10 specific
+	sub-directory in the install prefix.
+	(Trac #1930, git fcf2f08db9ebc2198236bfa25cf73286821cba6b)
+
+431.	[func]*		muks
 	BIND 10 no longer starts b10-stats-httpd by default.
 	(Trac #1885, git 5c8bbd7ab648b6b7c48e366e7510dedca5386f6c)
 
diff --git a/Makefile.am b/Makefile.am
index c90453a..54216b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -402,3 +402,6 @@ EXTRA_DIST += ext/asio/asio/system_error.hpp
 EXTRA_DIST += ext/asio/asio/deadline_timer.hpp
 EXTRA_DIST += ext/asio/asio/stream_socket_service.hpp
 EXTRA_DIST += ext/coroutine/coroutine.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = dns++.pc
diff --git a/configure.ac b/configure.ac
index d6eec68..af9125f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,6 +1120,7 @@ AC_CONFIG_FILES([Makefile
                  tests/tools/badpacket/Makefile
                  tests/tools/badpacket/tests/Makefile
                  tests/tools/perfdhcp/Makefile
+                 dns++.pc
                ])
 AC_OUTPUT([doc/version.ent
            src/bin/cfgmgr/b10-cfgmgr.py
diff --git a/dns++.pc.in b/dns++.pc.in
new file mode 100644
index 0000000..d2a7e06
--- /dev/null
+++ b/dns++.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: dns++
+Description: BIND 10 DNS library
+Version: @PACKAGE_VERSION@
+Requires: botan-1.8
+Cflags: -I${includedir}/@PACKAGE_NAME@
+Libs: -L${libdir} -ldns++ -lcryptolink -lutil -lexceptions -lm
diff --git a/src/lib/dns/Makefile.am b/src/lib/dns/Makefile.am
index 39f4429..2cd889d 100644
--- a/src/lib/dns/Makefile.am
+++ b/src/lib/dns/Makefile.am
@@ -140,7 +140,7 @@ rrparamregistry.cc: rrparamregistry-placeholder.cc
 rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: Makefile
 	./gen-rdatacode.py
 
-libdns___includedir = $(includedir)/dns
+libdns___includedir = $(includedir)/$(PACKAGE_NAME)/dns
 libdns___include_HEADERS = \
 	edns.h \
 	exceptions.h \
diff --git a/src/lib/exceptions/Makefile.am b/src/lib/exceptions/Makefile.am
index eff83b2..1d0ce2d 100644
--- a/src/lib/exceptions/Makefile.am
+++ b/src/lib/exceptions/Makefile.am
@@ -8,5 +8,5 @@ libexceptions_la_SOURCES = exceptions.h exceptions.cc
 
 CLEANFILES = *.gcno *.gcda
 
-libexceptions_includedir = $(includedir)/exceptions
+libexceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
 libexceptions_include_HEADERS = exceptions.h