Browse Source

[1930] Install headers into bind10-specific directory

Mukund Sivaraman 13 years ago
parent
commit
fcf2f08db9
6 changed files with 19 additions and 2 deletions
  1. 2 0
      .gitignore
  2. 3 0
      Makefile.am
  3. 1 0
      configure.ac
  4. 11 0
      dns++.pc.in
  5. 1 1
      src/lib/dns/Makefile.am
  6. 1 1
      src/lib/exceptions/Makefile.am

+ 2 - 0
.gitignore

@@ -27,3 +27,5 @@ TAGS
 /missing
 /py-compile
 /stamp-h1
+
+/dns++.pc

+ 3 - 0
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

+ 1 - 0
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

+ 11 - 0
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

+ 1 - 1
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 \

+ 1 - 1
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