From acf2fea365b1f8e7ec71196fc0030c01245a660b Mon Sep 17 00:00:00 2001 From: Neil Cook Date: Wed, 2 Dec 2015 13:15:16 -0500 Subject: [PATCH] pkg-config support --- Makefile.in | 12 +++++++++--- configure.ac | 2 +- getdns.pc.in | 11 +++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 getdns.pc.in diff --git a/Makefile.in b/Makefile.in index 331892af..2401c646 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,16 +39,17 @@ datarootdir=@datarootdir@ exec_prefix = @exec_prefix@ bindir = @bindir@ docdir = @docdir@ +libdir = @libdir@ srcdir = @srcdir@ INSTALL = @INSTALL@ -all : default @GETDNS_QUERY@ +all : default @GETDNS_QUERY@ default: cd src && $(MAKE) $@ -install: all @INSTALL_GETDNS_QUERY@ +install: all getdns.pc @INSTALL_GETDNS_QUERY@ $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) $(INSTALL) -m 644 $(srcdir)/AUTHORS $(DESTDIR)$(docdir) $(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(docdir) @@ -57,6 +58,8 @@ install: all @INSTALL_GETDNS_QUERY@ $(INSTALL) -m 644 $(srcdir)/LICENSE $(DESTDIR)$(docdir) $(INSTALL) -m 644 $(srcdir)/NEWS $(DESTDIR)$(docdir) $(INSTALL) -m 644 $(srcdir)/README.md $(DESTDIR)$(docdir) + $(INSTALL) -m 644 -d $(DESTDIR)$(libdir)/pkgconfig + $(INSTALL) -m 644 getdns.pc $(DESTDIR)$(libdir)/pkgconfig $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)/spec $(INSTALL) -m 644 $(srcdir)/spec/index.html $(DESTDIR)$(docdir)/spec $(INSTALL) -m 644 $(srcdir)/spec/getdns*tgz $(DESTDIR)$(docdir)/spec || true @@ -113,7 +116,7 @@ clean: cd src && $(MAKE) $@ cd doc && $(MAKE) $@ cd spec/example && $(MAKE) $@ - rm -f *.o + rm -f *.o *.pc depend: cd src && $(MAKE) $@ @@ -232,6 +235,9 @@ distcheck: $(distdir).tar.gz rm -rf $(distdir) @echo "*** Package $(distdir).tar.gz is ready for distribution" +getdns.pc: getdns.pc.in + ./config.status $@ + Makefile: $(srcdir)/Makefile.in config.status ./config.status $@ diff --git a/configure.ac b/configure.ac index 7422f67c..32df8498 100644 --- a/configure.ac +++ b/configure.ac @@ -877,7 +877,7 @@ AC_SUBST(GETDNS_QUERY) AC_SUBST(INSTALL_GETDNS_QUERY) AC_SUBST(UNINSTALL_GETDNS_QUERY) -AC_CONFIG_FILES([Makefile src/Makefile src/version.c src/getdns/getdns.h src/getdns/getdns_extra.h spec/example/Makefile src/test/Makefile doc/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile src/version.c src/getdns/getdns.h src/getdns/getdns_extra.h spec/example/Makefile src/test/Makefile doc/Makefile getdns.pc]) if [ test -n "$DOXYGEN" ] then AC_CONFIG_FILES([src/Doxyfile]) fi diff --git a/getdns.pc.in b/getdns.pc.in new file mode 100644 index 00000000..604f800f --- /dev/null +++ b/getdns.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: getdns +Version: @GETDNS_VERSION@ +Description: A modern asynchronous DNS library + +Libs: -L${libdir} -lgetdns +Cflags: -I${includedir}