Commit 32b2edb3 authored by Andreas Gustafsson's avatar Andreas Gustafsson
Browse files

don't generate util/conf.sh from configure, as the util directory

does not exist in the released version
parent 1f29b6b7
......@@ -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
......
......@@ -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
......@@ -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
......
# 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@
......@@ -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
......
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