From 32b2edb3a8078ef718ae4e71f8c5a793507b623a Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Tue, 27 Jun 2000 00:01:07 +0000
Subject: [PATCH] don't generate util/conf.sh from configure, as the util
 directory does not exist in the released version

---
 configure                  |  4 +---
 configure.in               |  3 +--
 util/.cvsignore            |  1 -
 util/check-instincludes.sh | 17 ++++++++++++-----
 util/conf.sh.in            | 18 ------------------
 util/copyrights            |  1 -
 6 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 util/conf.sh.in

diff --git a/configure b/configure
index 455b475ef6..8cb00c3d38 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# From configure.in Revision: 1.166 
+# From configure.in Revision: 1.167 
 
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
 ## Copyright (C) 1996-1999 Free Software Foundation, Inc.
@@ -4460,7 +4460,6 @@ trap 'rm -fr `echo "make/rules
 	bin/tests/system/lwresd/Makefile
 	bin/tests/headerdep_test.sh
 	bin/dnssec/Makefile
-	util/conf.sh
 	isc-config.sh
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -4697,7 +4696,6 @@ CONFIG_FILES=\${CONFIG_FILES-"make/rules
 	bin/tests/system/lwresd/Makefile
 	bin/tests/headerdep_test.sh
 	bin/dnssec/Makefile
-	util/conf.sh
 	isc-config.sh
 "}
 EOF
diff --git a/configure.in b/configure.in
index 99545411af..b53ab276f0 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.166 $)
+AC_REVISION($Revision: 1.167 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1063,7 +1063,6 @@ AC_OUTPUT(
 	bin/tests/system/lwresd/Makefile
 	bin/tests/headerdep_test.sh
 	bin/dnssec/Makefile
-	util/conf.sh
 	isc-config.sh
 )
 chmod a+x isc-config.sh
diff --git a/util/.cvsignore b/util/.cvsignore
index b3271edb52..f3c7a7c5da 100644
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -1,2 +1 @@
 Makefile
-conf.sh
diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index ac38092ae0..30dae5574e 100644
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: check-instincludes.sh,v 1.2 2000/06/22 22:00:33 tale Exp $
+# $Id: check-instincludes.sh,v 1.3 2000/06/27 00:00:46 gson Exp $
 
 #
 # Check the installed bind9 header files to make sure that no header
@@ -23,14 +23,20 @@
 # they all compile as C++.
 #
 
+case $# in 
+  1) ;;
+  *) echo "usage: sh util/check-instincludes.sh <prefix>" >&2;
+     exit 1;
+     ;;
+esac
+
+prefix=$1
+
 test -f ./util/conf.sh || {
     echo "$0: run from top of bind9 source tree" >&2;
     exit 1;
 }
 
-# set $prefix
-. ./util/conf.sh
-
 tmp=/tmp/thdr$$.tmp
 
 status=0
@@ -52,7 +58,8 @@ EOF
 
     # Compile the test program.
     if 
-       gcc  -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings  -I/usr/pkg/pthreads/include -I$prefix/include -c test.cc 2>&1
+       gcc  -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \
+           -I/usr/pkg/pthreads/include -I$prefix/include -c test.cc 2>&1
     then
        :
     else
diff --git a/util/conf.sh.in b/util/conf.sh.in
deleted file mode 100644
index 52caea150b..0000000000
--- a/util/conf.sh.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2000  Internet Software Consortium.
-# 
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
-# ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
-# CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-# SOFTWARE.
-
-# $Id: conf.sh.in,v 1.3 2000/06/22 22:00:36 tale Exp $
-
-prefix=@prefix@
diff --git a/util/copyrights b/util/copyrights
index 487e05e372..180052a20e 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1067,7 +1067,6 @@
 ./util/check-includes.pl			PERL	2000
 ./util/check-instincludes.sh			SH	2000
 ./util/check-sources.pl				PERL	2000
-./util/conf.sh.in				SH	2000
 ./util/copyrights				X	1999,2000
 ./util/make-snapshot.sh				SH	2000
 ./util/memleak.pl				PERL	1999,2000