[1930] Install headers into bind10-specific directory

diff --git a/.gitignore b/.gitignore
index 1dfbe9ffd4f5452c3417506556b8d716007aea76..da9d3b4bdb4d9e61b7de64b33e336c7f870628bc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ TAGS
 /missing
 /py-compile
 /stamp-h1
+
+/dns++.pc

diff --git a/Makefile.am b/Makefile.am
index c90453ace93da65f98bafaeba09fb2aff6d1da3e..54216b612af524fedeecb6cb1b50650e1dde78f3 100644 (file)
--- 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 d6eec68c9f8c3389cf4c7374485e7cb59a2df1dd..af9125f5af8d61ec79d78472d459df252ab183ee 100644 (file)
--- 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 (file)
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 39f44297b94293bfa95fd71897e7733efb74a571..2cd889d60c7bf40c85f7926f19644a5921539993 100644 (file)
--- 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 eff83b2b96696d06cef655110937400113030154..1d0ce2d4d9b3009c9c5637e85693dc37020c9acf 100644 (file)
--- 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