From f354e06035a6661b29f665890933c9d0108cd3e5 Mon Sep 17 00:00:00 2001 From: Petr Mensik Date: Fri, 18 Oct 2019 21:55:19 +0200 Subject: [PATCH] Do not define ISC_PKCS11_INCLUDES isc library is no longer different. Just dns library is different. Do not try to use isc-pkcs11 library for no reason. --- bin/dnssec-pkcs11/Makefile.in | 8 ++++---- bin/named-pkcs11/Makefile.in | 10 +++++----- bin/pkcs11/Makefile.in | 6 +++--- configure.ac | 15 --------------- lib/Makefile.in | 2 +- lib/dns-pkcs11/tests/Makefile.in | 4 ++-- make/includes.in | 6 ------ 7 files changed, 15 insertions(+), 36 deletions(-) diff --git a/bin/dnssec-pkcs11/Makefile.in b/bin/dnssec-pkcs11/Makefile.in index 5067ee1..54b9f10 100644 --- a/bin/dnssec-pkcs11/Makefile.in +++ b/bin/dnssec-pkcs11/Makefile.in @@ -15,17 +15,17 @@ VERSION=@BIND9_VERSION@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} @OPENSSL_INCLUDES@ +CINCLUDES = ${DNS_PKCS11_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ CDEFINES = -DVERSION=\"${VERSION}\" CWARNINGS = DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@ +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ -ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ +ISCDEPLIBS = ../../lib/isc/libisc.@A@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} diff --git a/bin/named-pkcs11/Makefile.in b/bin/named-pkcs11/Makefile.in index 416e12e..a0e8314 100644 --- a/bin/named-pkcs11/Makefile.in +++ b/bin/named-pkcs11/Makefile.in @@ -43,9 +43,9 @@ DLZDRIVER_INCLUDES = @DLZ_DRIVER_INCLUDES@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \ - ${NS_INCLUDES} ${DNS_PKCS11_INCLUDES} \ + ${NS_PKCS11_INCLUDES} ${DNS_PKCS11_INCLUDES} \ ${BIND9_INCLUDES} ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \ - ${ISC_PKCS11_INCLUDES} ${DLZDRIVER_INCLUDES} \ + ${ISC_INCLUDES} ${DLZDRIVER_INCLUDES} \ ${DBDRIVER_INCLUDES} ${MAXMINDDB_CFLAGS} \ @OPENSSL_INCLUDES@ @@ -56,15 +56,15 @@ CWARNINGS = DNSLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCLIBS = ../../lib/isccc/libisccc.@A@ -ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@ -ISCNOSYMLIBS = ../../lib/isc-pkcs11/libisc-pkcs11-nosymtbl.@A@ @OPENSSL_LIBS@ +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ +ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ BIND9LIBS = ../../lib/bind9/libbind9.@A@ NSLIBS = ../../lib/ns/libns.@A@ DNSDEPLIBS = ../../lib/dns-pkcs11/libdns-pkcs11.@A@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ ISCCCDEPLIBS = ../../lib/isccc/libisccc.@A@ -ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ +ISCDEPLIBS = ../../lib/isc/libisc.@A@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@ NSDEPLIBS = ../../lib/ns/libns.@A@ diff --git a/bin/pkcs11/Makefile.in b/bin/pkcs11/Makefile.in index 0e542f3..96aec05 100644 --- a/bin/pkcs11/Makefile.in +++ b/bin/pkcs11/Makefile.in @@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = ${ISC_PKCS11_INCLUDES} +CINCLUDES = ${ISC_INCLUDES} CDEFINES = -ISCLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ @OPENSSL_LIBS@ +ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ -ISCDEPLIBS = ../../lib/isc-pkcs11/libisc-pkcs11.@A@ +ISCDEPLIBS = ../../lib/isc/libisc.@A@ DEPLIBS = ${ISCDEPLIBS} diff --git a/configure.ac b/configure.ac index 6d4cdcc..39c1d95 100644 --- a/configure.ac +++ b/configure.ac @@ -2535,7 +2535,6 @@ if test "X$srcdir" != "X"; then BIND9_NS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns/include" BIND9_BIND9_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/bind9/include" BIND9_IRS_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/irs/include" - BIND9_ISC_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/isc-pkcs11/include" BIND9_DNS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/dns-pkcs11/include" BIND9_NS_PKCS11_BUILDINCLUDE="-I${BIND9_TOP_BUILDDIR}/lib/ns-pkcs11/include" else @@ -3114,20 +3113,6 @@ AC_CONFIG_FILES([ lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile - lib/isc-pkcs11/pthreads/Makefile - lib/isc-pkcs11/pthreads/include/Makefile - lib/isc-pkcs11/pthreads/include/isc/Makefile - lib/isc-pkcs11/Makefile - lib/isc-pkcs11/include/Makefile - lib/isc-pkcs11/include/isc/Makefile - lib/isc-pkcs11/include/isc/platform.h - lib/isc-pkcs11/include/pk11/Makefile - lib/isc-pkcs11/include/pkcs11/Makefile - lib/isc-pkcs11/tests/Makefile - lib/isc-pkcs11/unix/Makefile - lib/isc-pkcs11/unix/include/Makefile - lib/isc-pkcs11/unix/include/isc/Makefile - lib/isc-pkcs11/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile diff --git a/lib/Makefile.in b/lib/Makefile.in index 439d748..3f655e8 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@ # Attempt to disable parallel processing. .NOTPARALLEL: .NO_PARALLEL: -SUBDIRS = isc isc-pkcs11 isccc dns dns-pkcs11 ns isccfg bind9 irs samples +SUBDIRS = isc isccc dns dns-pkcs11 ns isccfg bind9 irs samples TARGETS = @BIND9_MAKE_RULES@ diff --git a/lib/dns-pkcs11/tests/Makefile.in b/lib/dns-pkcs11/tests/Makefile.in index 9f78596..ac187c9 100644 --- a/lib/dns-pkcs11/tests/Makefile.in +++ b/lib/dns-pkcs11/tests/Makefile.in @@ -19,8 +19,8 @@ CINCLUDES = -I. -Iinclude ${DNS_PKCS11_INCLUDES} ${ISC_PKCS11_INCLUDES} \ @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ CDEFINES = -DTESTS="\"${top_builddir}/lib/dns-pkcs11/tests/\"" -ISCLIBS = ../../isc-pkcs11/libisc-pkcs11.@A@ -ISCDEPLIBS = ../../isc-pkcs11/libisc-pkcs11.@A@ +ISCLIBS = ../../isc/libisc.@A@ +ISCDEPLIBS = ../../isc/libisc.@A@ DNSLIBS = ../libdns-pkcs11.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@ DNSDEPLIBS = ../libdns-pkcs11.@A@ diff --git a/make/includes.in b/make/includes.in index 6e6572b..7b17738 100644 --- a/make/includes.in +++ b/make/includes.in @@ -40,12 +40,6 @@ BIND9_INCLUDES = @BIND9_BIND9_BUILDINCLUDE@ \ TEST_INCLUDES = \ -I${top_srcdir}/lib/tests/include -ISC_PKCS11_INCLUDES = @BIND9_ISC_PKCS11_BUILDINCLUDE@ \ - -I${top_srcdir}/lib/isc-pkcs11 \ - -I${top_srcdir}/lib/isc-pkcs11/include \ - -I${top_srcdir}/lib/isc-pkcs11/unix/include \ - -I${top_srcdir}/lib/isc-pkcs11/pthreads/include - DNS_PKCS11_INCLUDES = @BIND9_DNS_PKCS11_BUILDINCLUDE@ \ -I${top_srcdir}/lib/dns-pkcs11/include -- 2.20.1