From: Ondřej Surý Date: Wed, 26 Jun 2019 08:21:49 +0000 (+0200) Subject: The BIND 9 libraries are now internal-only, so remove isc-config.sh X-Git-Tag: v9.15.3~19^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b44351e6514cc4fd46bd0beb9adc5f3f31c481d;p=thirdparty%2Fbind9.git The BIND 9 libraries are now internal-only, so remove isc-config.sh The isc-config.sh script was introduced before pkg-config as is a purely historical thing. There are two reason for removal of isc-config.sh scripts: a) The BIND 9 libraries are now meant to be used only from BIND 9, so there's no reason to provide convenience script to link with the libraries. b) Even if that was not the case, we should and would replace the isc-config.sh with respective pkg-config (.pc) file for every library. --- diff --git a/CHANGES b/CHANGES index 53bd0aae5bf..a52396e271e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5272. [cleanup] Remove isc-config.sh script as the BIND 9 libraries + are now purely internal. [GL #1123] + 5271. [func] The normal (non-debugging) output of dnssec-signzone and dnssec-verify tools now goes to stdout, instead of the combination of stderr and stdout. diff --git a/Makefile.in b/Makefile.in index bb98b5af2e5..4b0a82e9d23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,10 +18,6 @@ SUBDIRS = make lib fuzz bin doc TARGETS = PREREQS = bind.keys.h -MANPAGES = isc-config.sh.1 - -HTMLPAGES = isc-config.sh.html - MANOBJS = README HISTORY OPTIONS CONTRIBUTING PLATFORMS \ ${MANPAGES} ${HTMLPAGES} @@ -35,7 +31,7 @@ bind.keys.h: ${top_srcdir}/bind.keys ${srcdir}/util/bindkeys.pl distclean:: rm -f config.cache config.h config.log config.status TAGS - rm -f libtool isc-config.sh configure.lineno + rm -f libtool configure.lineno rm -f util/conf.sh docutil/docbook2man-wrapper.sh # XXX we should clean libtool stuff too. Only do this after we add rules @@ -54,21 +50,11 @@ installdirs: ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 -install:: isc-config.sh installdirs - ${INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir} - rm -f ${DESTDIR}${bindir}/bind9-config - @LN@ ${DESTDIR}${bindir}/isc-config.sh ${DESTDIR}${bindir}/bind9-config - ${INSTALL_DATA} ${top_srcdir}/isc-config.sh.1 ${DESTDIR}${mandir}/man1 - rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 - @LN@ ${DESTDIR}${mandir}/man1/isc-config.sh.1 ${DESTDIR}${mandir}/man1/bind9-config.1 +install:: installdirs ${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir} uninstall:: rm -f ${DESTDIR}${sysconfdir}/bind.keys - rm -f ${DESTDIR}${mandir}/man1/bind9-config.1 - rm -f ${DESTDIR}${mandir}/man1/isc-config.sh.1 - rm -f ${DESTDIR}${bindir}/bind9-config - rm -f ${DESTDIR}${bindir}/isc-config.sh tags: rm -f TAGS diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh index ca7b5cc2b57..d400f38d4a3 100644 --- a/bin/tests/system/builtin/tests.sh +++ b/bin/tests/system/builtin/tests.sh @@ -157,7 +157,6 @@ sleep 1 grep "zone serial (0) unchanged." ns1/named.run > /dev/null && ret=1 if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi -VERSION=`../../../../isc-config.sh --version | cut -d = -f 2` HOSTNAME=`$FEATURETEST --gethostname` BIND_VERSION_STRING=$($NAMED -V | head -1) BIND_VERSION=$($NAMED -V | sed -ne 's/^BIND \([^ ]*\).*/\1/p') diff --git a/configure b/configure index 9bad924402e..15168c12cd7 100755 --- a/configure +++ b/configure @@ -23305,7 +23305,7 @@ ac_config_commands="$ac_config_commands chmod" # elsewhere if there's a good reason for doing so. # -ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/unittest.sh fuzz/Makefile" +ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/plugins/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/pthreads/Makefile lib/isc/pthreads/include/Makefile lib/isc/pthreads/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccc/tests/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/unittest.sh fuzz/Makefile" # @@ -24381,7 +24381,6 @@ do "doc/xsl/isc-docbook-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-docbook-html.xsl" ;; "doc/xsl/isc-manpage.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-manpage.xsl" ;; "doc/xsl/isc-notes-html.xsl") CONFIG_FILES="$CONFIG_FILES doc/xsl/isc-notes-html.xsl" ;; - "isc-config.sh") CONFIG_FILES="$CONFIG_FILES isc-config.sh" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/bind9/Makefile") CONFIG_FILES="$CONFIG_FILES lib/bind9/Makefile" ;; "lib/bind9/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/bind9/include/Makefile" ;; @@ -25564,7 +25563,7 @@ ltmain=$ac_aux_dir/ltmain.sh chmod +x "$ofile" ;; - "chmod":C) chmod a+x isc-config.sh doc/doxygen/doxygen-input-filter ;; + "chmod":C) chmod a+x doc/doxygen/doxygen-input-filter ;; esac done # for ac_tag diff --git a/configure.ac b/configure.ac index 071231377cc..9a0a37abb27 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,7 +2762,7 @@ AC_SUBST(BUILD_LIBS) AC_CONFIG_COMMANDS( [chmod], - [chmod a+x isc-config.sh doc/doxygen/doxygen-input-filter]) + [chmod a+x doc/doxygen/doxygen-input-filter]) # # Files to configure. These are listed here because we used to @@ -2843,7 +2843,6 @@ AC_CONFIG_FILES([ doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl - isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile diff --git a/isc-config.sh.1 b/isc-config.sh.1 deleted file mode 100644 index ef4bf08172f..00000000000 --- a/isc-config.sh.1 +++ /dev/null @@ -1,94 +0,0 @@ -.\" Copyright (C) 2009, 2014-2019 Internet Systems Consortium, Inc. ("ISC") -.\" -.\" This Source Code Form is subject to the terms of the Mozilla Public -.\" License, v. 2.0. If a copy of the MPL was not distributed with this -.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. -.\" -.hy 0 -.ad l -'\" t -.\" Title: isc-config.sh -.\" Author: -.\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2009-02-18 -.\" Manual: BIND9 -.\" Source: ISC -.\" Language: English -.\" -.TH "ISC\-CONFIG\&.SH" "1" "2009\-02\-18" "ISC" "BIND9" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -isc-config.sh \- Get information about the installed version of ISC BIND -.SH "SYNOPSIS" -.HP \w'\fBisc\-config\&.sh\fR\ 'u -\fBisc\-config\&.sh\fR [\fB\-\-cflags\fR] [\fB\-\-exec\-prefix\fR] [\fB\-\-libs\fR] [\fB\-\-prefix\fR] [\fB\-\-version\fR] [libraries...] -.SH "DESCRIPTION" -.PP -\fBisc\-config\&.sh\fR -prints information related to the installed version of ISC BIND, such as the compiler and linker flags required to compile and link programs that use ISC BIND libraries\&. -.PP -The optional libraries are used to report specific details for compiling and linking for the listed libraries\&. The allowed choices are: -\fBisc\fR, -\fBisccc\fR, -\fBisccfg\fR, -\fBdns\fR, -\fBbind9\fR\&. Multiple libraries may be listed on the command line\&. (Some libraries require other libraries, so are implied\&.) -.SH "OPTIONS" -.PP -\-\-cflags -.RS 4 -Prints the compiler command line options required to compile files that use ISC BIND\&. Use the -\fBlibraries\fR -command line argument(s) to print additional specific flags to pass to the C compiler\&. -.RE -.PP -\-\-exec\-prefix -.RS 4 -Prints the directory prefix used in the ISC BIND installation for architecture dependent files to standard output\&. -.RE -.PP -\-\-libs -.RS 4 -Prints the linker command line options used to link with the ISC BIND libraries\&. Use the -\fBlibraries\fR -command line argument(s) to print additional specific flags\&. -.RE -.PP -\-\-prefix -.RS 4 -Prints the directory prefix used in the ISC BIND installation for architecture independent files to standard output\&. -.RE -.PP -\-\-version -.RS 4 -Prints the version of the installed ISC BIND suite\&. -.RE -.SH "RETURN VALUES" -.PP -\fBisc\-config\&.sh\fR -returns an exit status of 1 if invoked with invalid arguments or no arguments at all\&. It returns 0 if information was successfully printed\&. -.SH "AUTHOR" -.PP -\fBInternet Systems Consortium, Inc\&.\fR -.SH "COPYRIGHT" -.br -Copyright \(co 2009, 2014-2019 Internet Systems Consortium, Inc. ("ISC") -.br diff --git a/isc-config.sh.docbook b/isc-config.sh.docbook deleted file mode 100644 index 7c38aca095e..00000000000 --- a/isc-config.sh.docbook +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - 2009-02-18 - - - ISC - Internet Systems Consortium, Inc. - - - - isc-config.sh - 1 - BIND9 - - - - - 2009 - 2014 - 2015 - 2016 - 2017 - 2018 - 2019 - Internet Systems Consortium, Inc. ("ISC") - - - - - isc-config.sh - Get information about the installed version of ISC BIND - - - - - isc-config.sh - - - - - - libraries - - - - DESCRIPTION - - isc-config.sh - prints information related to the installed version of ISC BIND, - such as the compiler and linker flags required to compile - and link programs that use ISC BIND libraries. - - - The optional libraries are used to report specific details - for compiling and linking for the listed libraries. - The allowed choices are: - , - , - , - , - . - Multiple libraries may be listed on the command line. - (Some libraries require other libraries, so are implied.) - - - - - OPTIONS - - - - - - --cflags - - - Prints the compiler command line options required to - compile files that use ISC BIND. - Use the command line argument(s) - to print additional specific flags to pass to the C compiler. - - - - - - --exec-prefix - - - Prints the directory prefix used in the ISC BIND installation - for architecture dependent files to standard output. - - - - - - --libs - - - Prints the linker command line options used to - link with the ISC BIND libraries. - Use the command line argument(s) - to print additional specific flags. - - - - - - --prefix - - - Prints the directory prefix used in the ISC BIND installation - for architecture independent files to standard output. - - - - - - --version - - - Prints the version of the installed ISC BIND suite. - - - - - - - - - RETURN VALUES - - isc-config.sh - returns an exit status of 1 if - invoked with invalid arguments or no arguments at all. - It returns 0 if information was successfully printed. - - - - diff --git a/isc-config.sh.html b/isc-config.sh.html deleted file mode 100644 index 5f6e48b1fd1..00000000000 --- a/isc-config.sh.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - -isc-config.sh - - -
-
- - - - - - - -
-

Name

-

- isc-config.sh - — Get information about the installed version of ISC BIND -

-
- -
-

Synopsis

-

- isc-config.sh - [--cflags] - [--exec-prefix] - [--libs] - [--prefix] - [--version] - [libraries...] -

-
- -
-

DESCRIPTION

- -

isc-config.sh - prints information related to the installed version of ISC BIND, - such as the compiler and linker flags required to compile - and link programs that use ISC BIND libraries. -

-

- The optional libraries are used to report specific details - for compiling and linking for the listed libraries. - The allowed choices are: - isc, - isccc, - isccfg, - dns, - bind9. - Multiple libraries may be listed on the command line. - (Some libraries require other libraries, so are implied.) -

- -
- -
-

OPTIONS

- - -
-
--cflags
-
-

- Prints the compiler command line options required to - compile files that use ISC BIND. - Use the libraries command line argument(s) - to print additional specific flags to pass to the C compiler. -

-
-
--exec-prefix
-
-

- Prints the directory prefix used in the ISC BIND installation - for architecture dependent files to standard output. -

-
-
--libs
-
-

- Prints the linker command line options used to - link with the ISC BIND libraries. - Use the libraries command line argument(s) - to print additional specific flags. -

-
-
--prefix
-
-

- Prints the directory prefix used in the ISC BIND installation - for architecture independent files to standard output. -

-
-
--version
-
-

- Prints the version of the installed ISC BIND suite. -

-
-
- -
- -
-

RETURN VALUES

- -

isc-config.sh - returns an exit status of 1 if - invoked with invalid arguments or no arguments at all. - It returns 0 if information was successfully printed. -

-
- -
- diff --git a/isc-config.sh.in b/isc-config.sh.in deleted file mode 100644 index 40f9bba5a37..00000000000 --- a/isc-config.sh.in +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh -# -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set= -includedir=@includedir@ -libdir=@libdir@ - -usage() -{ - cat << EOF -Usage: isc-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--version] - [--libs] - [--cflags] -Libraries: - isc - isccc - isccfg - dns - bind9 - irs -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case "$1" in - --prefix=*) - prefix=$optarg - if test "x$exec_prefix_set" = x ; then - exec_prefix=$prefix - exec_prefix_set=true - fi - ;; - --prefix) - echo_prefix=true - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=true - ;; - --exec-prefix) - echo_exec_prefix=true - ;; - --version) - echo VERSION=@BIND9_VERSION@ - exit 0 - ;; - --cflags) - echo_cflags=true - ;; - --libs) - echo_libs=true; - ;; - irs) - libirs=true; - libdns=true; - libisccfg=true; - libisc=true; - ;; - isc) - libisc=true; - ;; - isccc) - libisccc=true; - libisc=true; - ;; - isccfg) - libisccfg=true; - libisc=true; - ;; - dns) - libdns=true; - libisc=true; - ;; - bind9) - libdns=true; - libisc=true; - libisccfg=true; - libbind9=true; - ;; - *) - usage 1 1>&2 - esac - shift -done - -if test x"$echo_prefix" = x"true" ; then - echo $prefix -fi -if test x"$echo_exec_prefix" = x"true" ; then - echo $exec_prefix -fi -if test x"$echo_cflags" = x"true"; then - if test x"${exec_prefix_set}" = x"true"; then - includes="-I${exec_prefix}/include" - else - includes="-I${includedir}" - fi - if test x"$libisc" = x"true"; then - includes="$includes @ALWAYS_DEFINES@ @STD_CINCLUDES@ @STD_CDEFINES@ @CCOPT@" - fi - echo $includes -fi -if test x"$echo_libs" = x"true"; then - if test x"${exec_prefix_set}" = x"true"; then - libs="-L${exec_prefix}/lib" - else - libs="-L${libdir}" - fi - if test x"$libirs" = x"true" ; then - libs="$libs -lirs" - fi - if test x"$libbind9" = x"true" ; then - libs="$libs -lbind9" - fi - if test x"$libdns" = x"true" ; then - libs="$libs -ldns @DNS_CRYPTO_LIBS@" - fi - if test x"$libisccfg" = x"true" ; then - libs="$libs -lisccfg" - fi - if test x"$libisccc" = x"true" ; then - libs="$libs -lisccc" - fi - if test x"$libisc" = x"true" ; then - libs="$libs -lisc @OPENSSL_LIBS@" - needothers=true - fi - if test x"$needothers" = x"true" ; then - libs="$libs @CCOPT@ @LIBS@" - fi - echo $libs -fi diff --git a/util/copyrights b/util/copyrights index 2f07ed08191..ce505528e3c 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1578,10 +1578,6 @@ ./fuzz/fuzz.h C 2018,2019 ./fuzz/main.c C 2018,2019 ./install-sh X 1998,1999,2000,2001,2018,2019 -./isc-config.sh.1 MAN DOCBOOK -./isc-config.sh.docbook SGML 2009,2014,2015,2016,2017,2018,2019 -./isc-config.sh.html HTML DOCBOOK -./isc-config.sh.in SH 2000,2001,2003,2004,2007,2012,2013,2015,2016,2017,2018,2019 ./lib/Kyuafile X 2017,2018,2019 ./lib/bind9/api X 2001,2006,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 ./lib/bind9/check.c C 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 diff --git a/win32utils/Configure b/win32utils/Configure index 8c9dc228f30..cdd876da93c 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -24,7 +24,6 @@ use Cwd; my $configfile = "..\\config.h"; my $platformfile = "..\\lib\\isc\\win32\\include\\isc\\platform.h"; my $confshfile = "..\\bin\\tests\\system\\conf.sh"; -my $icshfile = "..\\isc-config.sh"; my @filelist = ("..\\bin\\python\\dnssec-checkds.py", "..\\bin\\python\\dnssec-coverage.py", @@ -863,7 +862,6 @@ if ($want_clean eq "yes") { unlink($configfile); unlink($platformfile); unlink($confshfile); - unlink($icshfile); foreach $file (@filelist) { unlink($file); @@ -2160,44 +2158,6 @@ sub setupconfsh { close F; } -# setup isc-config.sh with %configvar accepting undefined - -sub setupicsh { - my $line; - my @Lines; - my $val; - - open F, $icshfile . ".in" || die $!; - @Lines = ; - close F; - - foreach $line (@Lines) { - chomp $line; - while ($line =~ /@([^@]+)\@/) { - if ($1 ~~ @substvar) { - if (defined($configvar{$1})) { - $val = kw($configvar{$1}); - $line = "$`$val$'"; - } else { - $line = "$`$'"; - } - } else { - $line = "$`__$1__$'"; - } - } - } - - open F, ">" . $icshfile || die $!; - if ($verbose) { - print "Setting up $icshfile\n"; - } - binmode(F); - foreach $line (@Lines) { - print F $line . "\n"; - } - close F; -} - # setup a file with %configcond stack and %config{var,defd,inc,lib,dll,test} sub setupfile { @@ -2817,8 +2777,6 @@ if (($want_win32 eq "yes") || ($want_x64 eq "yes")) { setupconfsh(); - setupicsh(); - my $file; foreach $file (@filelist) { setupfile($file);