Commit 3a3cf008 authored by Ondřej Surý's avatar Ondřej Surý

Create a pkgconfig files for libknot-int and libdnssec

parent 4a7463cd
...@@ -58,7 +58,9 @@ ...@@ -58,7 +58,9 @@
/src/knot/conf/libknotd_la-cf-lex.c /src/knot/conf/libknotd_la-cf-lex.c
/src/knot/conf/libknotd_la-cf-parse.c /src/knot/conf/libknotd_la-cf-parse.c
/src/knot/conf/libknotd_la-cf-parse.h /src/knot/conf/libknotd_la-cf-parse.h
/libknot.pc src/dnssec/libdnssec.pc
src/libknot-int.pc
src/libknot.pc
# dnstap # dnstap
/src/dnstap/Makefile /src/dnstap/Makefile
......
...@@ -34,7 +34,9 @@ LT_INIT ...@@ -34,7 +34,9 @@ LT_INIT
# Use pkg-config # Use pkg-config
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])]) m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
AC_CONFIG_FILES([libknot.pc]) AC_CONFIG_FILES([src/libknot.pc
src/libknot-int.pc
src/dnssec/libdnssec.pc])
# Build Knot DNS daemon # Build Knot DNS daemon
AC_ARG_ENABLE([daemon], AC_ARG_ENABLE([daemon],
...@@ -222,7 +224,7 @@ AS_IF([test "$with_urcu" != "no"], [ ...@@ -222,7 +224,7 @@ AS_IF([test "$with_urcu" != "no"], [
PKG_CHECK_MODULES([liburcu], liburcu, [ PKG_CHECK_MODULES([liburcu], liburcu, [
CPPFLAGS="$CPPFLAGS $liburcu_CFLAGS" CPPFLAGS="$CPPFLAGS $liburcu_CFLAGS"
LIBS="$LIBS $liburcu_LIBS" LIBS="$LIBS $liburcu_LIBS"
liburcu_PKGCONFIG="liburcu" liburcu_PKGCONFIG="liburcu >= 0.4.0"
AC_SUBST([liburcu_PKGCONFIG]) AC_SUBST([liburcu_PKGCONFIG])
with_urcu=yes with_urcu=yes
],[ ],[
...@@ -414,11 +416,6 @@ AS_IF([test "$SPHINXBUILD" = "false"], ...@@ -414,11 +416,6 @@ AS_IF([test "$SPHINXBUILD" = "false"],
]) ])
AC_SUBST([libknot_pc_REQ])
AC_SUBST([libknot_pc_REQP])
AC_SUBST([libknot_pc_LIBS])
AC_SUBST([libknot_pc_LIBSP])
AM_CONDITIONAL([HAVE_SPHINXBUILD], test "$SPHINXBUILD" != "false") AM_CONDITIONAL([HAVE_SPHINXBUILD], test "$SPHINXBUILD" != "false")
AM_CONDITIONAL([HAVE_PDFLATEX], test "$PDFLATEX" != "false") AM_CONDITIONAL([HAVE_PDFLATEX], test "$PDFLATEX" != "false")
AM_CONDITIONAL([HAVE_MAKEINFO], test "$MAKEINFO" != "false") AM_CONDITIONAL([HAVE_MAKEINFO], test "$MAKEINFO" != "false")
......
...@@ -442,7 +442,7 @@ libknot_int_la_CPPFLAGS += \ ...@@ -442,7 +442,7 @@ libknot_int_la_CPPFLAGS += \
endif endif
# pkg-config # pkg-config
pkgconfig_DATA = $(top_srcdir)/libknot.pc pkgconfig_DATA = libknot.pc libknot-int.pc
if HAVE_DAEMON if HAVE_DAEMON
# Create storage and run-time directories # Create storage and run-time directories
......
...@@ -123,3 +123,6 @@ libdnssec_la_SOURCES = \ ...@@ -123,3 +123,6 @@ libdnssec_la_SOURCES = \
lib/sign/der.h \ lib/sign/der.h \
lib/sign/sign.c \ lib/sign/sign.c \
lib/tsig.c lib/tsig.c
# pkg-config
pkgconfig_DATA = libdnssec.pc
prefix=@prefix@
exec_prefix=@prefix@
libdir=@libdir@
includedir=@includedir@
Name: libdnssec
Description: Knot DNSSEC library
URL: https://www.knot-dns.cz
Version: @PACKAGE_VERSION@
Requires: gnutls >= 3.0
Requires.private: nettle, jansson
Libs: -L${libdir} -lknot
Cflags: -I${includedir}
prefix=@prefix@
exec_prefix=@prefix@
libdir=@libdir@
includedir=@includedir@
Name: libknot-int
Description: Knot DNS library (common data structures)
URL: https://www.knot-dns.cz
Version: @PACKAGE_VERSION@
Libs: -L${libdir}
Libs.private: @lmdb_LIBS@
Cflags: -I${includedir} @lmdb_CFLAGS@
...@@ -7,8 +7,8 @@ Name: libknot ...@@ -7,8 +7,8 @@ Name: libknot
Description: Knot DNS library Description: Knot DNS library
URL: https://www.knot-dns.cz URL: https://www.knot-dns.cz
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Requires.private: gnutls >= 3.0, nettle, jansson, @liburcu_PKGCONFIG@ Requires: libknot-int = @PACKAGE_VERSION@, libdnssec = @PACKAGE_VERSION@
Libs: -L${libdir} -lknot Requires.private: @liburcu_PKGCONFIG@
Libs.private: -lknot-int -ldnssec @liburcu_LIBS@ @lmdb_LIBS@ Libs: -L${libdir} -lknot -lknot-int -ldnssec
Cflags: -I${includedir} @liburcu_CFLAGS@ @lmdb_CFLAGS@ Libs.private: @liburcu_LIBS@
Cflags: -I${includedir} @liburcu_CFLAGS@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment