head	1.5;
access;
symbols
	pkgsrc-2026Q1:1.5.0.64
	pkgsrc-2026Q1-base:1.5
	pkgsrc-2025Q4:1.5.0.62
	pkgsrc-2025Q4-base:1.5
	pkgsrc-2025Q3:1.5.0.60
	pkgsrc-2025Q3-base:1.5
	pkgsrc-2025Q2:1.5.0.58
	pkgsrc-2025Q2-base:1.5
	pkgsrc-2025Q1:1.5.0.56
	pkgsrc-2025Q1-base:1.5
	pkgsrc-2024Q4:1.5.0.54
	pkgsrc-2024Q4-base:1.5
	pkgsrc-2024Q3:1.5.0.52
	pkgsrc-2024Q3-base:1.5
	pkgsrc-2024Q2:1.5.0.50
	pkgsrc-2024Q2-base:1.5
	pkgsrc-2024Q1:1.5.0.48
	pkgsrc-2024Q1-base:1.5
	pkgsrc-2023Q4:1.5.0.46
	pkgsrc-2023Q4-base:1.5
	pkgsrc-2023Q3:1.5.0.44
	pkgsrc-2023Q3-base:1.5
	pkgsrc-2023Q2:1.5.0.42
	pkgsrc-2023Q2-base:1.5
	pkgsrc-2023Q1:1.5.0.40
	pkgsrc-2023Q1-base:1.5
	pkgsrc-2022Q4:1.5.0.38
	pkgsrc-2022Q4-base:1.5
	pkgsrc-2022Q3:1.5.0.36
	pkgsrc-2022Q3-base:1.5
	pkgsrc-2022Q2:1.5.0.34
	pkgsrc-2022Q2-base:1.5
	pkgsrc-2022Q1:1.5.0.32
	pkgsrc-2022Q1-base:1.5
	pkgsrc-2021Q4:1.5.0.30
	pkgsrc-2021Q4-base:1.5
	pkgsrc-2021Q3:1.5.0.28
	pkgsrc-2021Q3-base:1.5
	pkgsrc-2021Q2:1.5.0.26
	pkgsrc-2021Q2-base:1.5
	pkgsrc-2021Q1:1.5.0.24
	pkgsrc-2021Q1-base:1.5
	pkgsrc-2020Q4:1.5.0.22
	pkgsrc-2020Q4-base:1.5
	pkgsrc-2020Q3:1.5.0.20
	pkgsrc-2020Q3-base:1.5
	pkgsrc-2020Q2:1.5.0.18
	pkgsrc-2020Q2-base:1.5
	pkgsrc-2020Q1:1.5.0.14
	pkgsrc-2020Q1-base:1.5
	pkgsrc-2019Q4:1.5.0.16
	pkgsrc-2019Q4-base:1.5
	pkgsrc-2019Q3:1.5.0.12
	pkgsrc-2019Q3-base:1.5
	pkgsrc-2019Q2:1.5.0.10
	pkgsrc-2019Q2-base:1.5
	pkgsrc-2019Q1:1.5.0.8
	pkgsrc-2019Q1-base:1.5
	pkgsrc-2018Q4:1.5.0.6
	pkgsrc-2018Q4-base:1.5
	pkgsrc-2018Q3:1.5.0.4
	pkgsrc-2018Q3-base:1.5
	pkgsrc-2018Q2:1.5.0.2
	pkgsrc-2018Q2-base:1.5
	pkgsrc-2018Q1:1.1.0.36
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.34
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.32
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.28
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.26
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.24
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.22
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.20
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.18
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.16
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.14
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.12
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.10
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.8
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.6
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.4
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.2
	pkgsrc-2014Q1-base:1.1;
locks; strict;
comment	@# @;


1.5
date	2018.05.30.09.39.13;	author he;	state Exp;
branches;
next	1.4;
commitid	c1SUc3ls70S5SiEA;

1.4
date	2018.05.29.12.56.55;	author he;	state Exp;
branches;
next	1.3;
commitid	Ec4gYB7FLuTCZbEA;

1.3
date	2018.05.28.14.14.02;	author he;	state Exp;
branches;
next	1.2;
commitid	xBCrjMZBH3gqs4EA;

1.2
date	2018.04.13.19.10.50;	author he;	state Exp;
branches;
next	1.1;
commitid	aKxFyYLsxZTHxjyA;

1.1
date	2014.03.05.13.52.29;	author he;	state Exp;
branches;
next	;
commitid	GtpXQGzW7Hj8Xvrx;


desc
@@


1.5
log
@I'm sorry, the configure patch was mangled.  Here's a correction.
Riding on the previous version bump since this is a build fix.
@
text
@$NetBSD: patch-unix_configure,v 1.4 2018/05/29 12:56:55 he Exp $

Regen after unix/configure.in patching.

--- unix/configure.orig	1998-11-03 15:16:50.000000000 +0000
+++ unix/configure
@@@@ -1,7 +1,7 @@@@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@@@ -67,6 +67,7 @@@@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@@@ -350,7 +351,7 @@@@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@@@ -520,9 +521,11 @@@@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@@@ -564,8 +567,9 @@@@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@@@ -593,9 +597,10 @@@@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@@@ -630,6 +635,40 @@@@ else
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:645: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
@@@@ -640,15 +679,17 @@@@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 648 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 688 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@@@ -662,6 +703,12 @@@@ else
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
@@@@ -693,11 +740,15 @@@@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:701: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:752: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@@@ -712,16 +763,20 @@@@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-O2"
+    CFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
 
 else
@@@@ -750,8 +805,8 @@@@ else
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@@@ -761,14 +816,31 @@@@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 765 "configure"
+#line 820 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 837 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@@@ -781,6 +853,8 @@@@ fi
 rm -f conftest*
 fi
 rm -f conftest*
+fi
+rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
   CPP="$ac_cv_prog_CPP"
@@@@ -799,8 +873,9 @@@@ else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_LEX="flex"
@@@@ -878,8 +953,9 @@@@ else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YACC="$ac_prog"
@@@@ -926,6 +1002,7 @@@@ ac_configure=$ac_aux_dir/configure # Thi
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
@@@@ -935,19 +1012,20 @@@@ if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@@@ -977,6 +1055,8 @@@@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
@@@@ -994,9 +1074,13 @@@@ else
   /*)
   ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_SCOTTY="$ac_dir/$ac_word"
@@@@ -1033,9 +1117,13 @@@@ else
   /*)
   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH="$ac_dir/$ac_word"
@@@@ -1059,7 +1147,10 @@@@ fi
 fi
 
 fi
+if  x"$TARGET" = x 
+then
 TARGET="scotty tkined"
+fi
 
 #--------------------------------------------------------------------
 #       Check for various system specific things.
@@@@ -1210,8 +1301,9 @@@@ else
   if test -n "$RPCGEN"; then
   ac_cv_prog_RPCGEN="$RPCGEN" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RPCGEN="rpcgen"
@@@@ -1341,9 +1433,13 @@@@ else
   /*)
   ac_cv_path_tclsh="$tclsh" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_tclsh="$tclsh" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_tclsh="$ac_dir/$ac_word"
@@@@ -1400,7 +1496,7 @@@@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
 DL_LIBS=$TCL_DL_LIBS
 LD_FLAGS=$TCL_LD_FLAGS
 LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
-TCL_INCLUDES=-I$TCL_PREFIX/include
+TCL_INCLUDES=${TCL_INCLUDE_SPEC:-"-I$TCL_PREFIX/include"}
 
 if test -z "$SHLIB_LD" ; then
     { echo "configure: error: no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh" 1>&2; exit 1; }
@@@@ -1431,9 +1527,13 @@@@ else
   /*)
   ac_cv_path_wish="$wish" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_wish="$wish" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_wish="$ac_dir/$ac_word"
@@@@ -1480,9 +1580,8 @@@@ echo "configure:1472: checking for tkCon
 done
 
 if test "$found" -eq 0 ; then
-    { echo "configure: error: "tkConfig.sh not found - use the --with-tk-config option"" 1>&2; exit 1; }
-fi
-
+    echo "$ac_t"""tkConfig.sh not found - use the --with-tk-config option"" 1>&6
+else
 . $tnm_cv_path_tk_config/tkConfig.sh
 TK_INCLUDES=-I$TK_PREFIX/include
 if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
@@@@ -1498,6 +1597,7 @@@@ fi
 if test 4 -eq $TK_MAJOR_VERSION -a 1 -gt $TK_MINOR_VERSION; then
     { echo "configure: error: "tk 4.1 or later needed"" 1>&2; exit 1; }
 fi
+fi
 
 #----------------------------------------------------------------------------
 #	Check for the existence of various libraries.
@@@@ -1940,6 +2040,174 @@@@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
   LIBS="$LIBS -lresolv"
 else
   echo "$ac_t""no" 1>&6
+echo $ac_n "checking for __res_mkquery in -lresolv""... $ac_c" 1>&6
+echo "configure:2045: checking for __res_mkquery in -lresolv" >&5
+ac_lib_var=`echo resolv'_'__res_mkquery | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2053 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __res_mkquery();
+
+int main() {
+__res_mkquery()
+; return 0; }
+EOF
+if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lresolv"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+fi
+
+echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
+echo "configure:2089: checking for dn_expand" >&5
+if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2094 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dn_expand(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_dn_expand) || defined (__stub___dn_expand)
+choke me
+#else
+dn_expand();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_dn_expand=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dn_expand=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
+echo "configure:2135: checking for dn_expand in -lresolv" >&5
+ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2143 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dn_expand();
+
+int main() {
+dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lresolv"
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
+echo "configure:2173: checking for __dn_expand in -lresolv" >&5
+ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2181 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+__dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lresolv"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 fi
 
 fi
@@@@ -1963,8 +2231,8 @@@@ else
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@@@ -2318,6 +2586,8 @@@@ fi
 rm -f conftest*
 fi
 
+LIBS="$LIBS $TCL_LIBS"
+
 #----------------------------------------------------------------------------
 #       Some more libraries for OSes that want your attention.
 #----------------------------------------------------------------------------
@@@@ -2547,7 +2817,7 @@@@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@@@ -2614,7 +2884,7 @@@@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@@@ -2634,9 +2904,11 @@@@ sed 's/%@@/@@@@/; s/@@%/@@@@/; s/%g\$/@@g/; /@@g
  s/@@@@/%@@/; s/@@@@/@@%/; s/@@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@@SHELL@@%$SHELL%g
 s%@@CFLAGS@@%$CFLAGS%g
 s%@@CPPFLAGS@@%$CPPFLAGS%g
 s%@@CXXFLAGS@@%$CXXFLAGS%g
+s%@@FFLAGS@@%$FFLAGS%g
 s%@@DEFS@@%$DEFS%g
 s%@@LDFLAGS@@%$LDFLAGS%g
 s%@@LIBS@@%$LIBS%g
@@@@ -2661,6 +2933,7 @@@@ s%@@LEX@@%$LEX%g
 s%@@LEXLIB@@%$LEXLIB%g
 s%@@YACC@@%$YACC%g
 s%@@INSTALL_PROGRAM@@%$INSTALL_PROGRAM%g
+s%@@INSTALL_SCRIPT@@%$INSTALL_SCRIPT%g
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@SCOTTY@@%$SCOTTY%g
 s%@@TCLSH@@%$TCLSH%g
@


1.4
log
@Add checking for both res_mkquery and __res_mkquery, and same for
dn_expand.  I could not find a way to express "you need to include
<resolv.h> before checking this function in this library" with the
older autoconf this uses.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-unix_configure,v 1.3 2018/05/28 14:14:02 he Exp $
d7 343
a349 3
@@@@ -29,7 +29,10 @@@@ AC_PREFIX_PROGRAM(scotty)
 if test "$prefix" = "NONE" ; then
     AC_PREFIX_PROGRAM(tclsh)
d351 1
a351 1
+if [ x"$TARGET" = x ]
d358 29
a386 1
@@@@ -151,7 +154,7 @@@@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
d394 18
a411 2
     AC_MSG_ERROR([no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh])
@@@@ -196,9 +199,8 @@@@ for f in $dirs ; do
d415 1
a415 1
-    AC_MSG_ERROR("tkConfig.sh not found - use the --with-tk-config option")
d418 1
a418 1
+    AC_MSG_RESULT("tkConfig.sh not found - use the --with-tk-config option")
d423 1
a423 1
@@@@ -213,6 +215,7 @@@@ fi
d425 1
a425 1
     AC_MSG_ERROR("tk 4.1 or later needed")
d431 173
a603 10
@@@@ -252,7 +255,11 @@@@ AC_CHECK_LIB(ieee, main, [LIBS="$LIBS -l
 AC_CHECK_LIB(rpc, main, [LIBS="$LIBS -lrpc"])
 AC_CHECK_LIB(rpcsvc, main, [LIBS="$LIBS -lrpcsvc"])
 AC_CHECK_FUNC(res_mkquery, ,
-	AC_CHECK_LIB(resolv, res_mkquery, [LIBS="$LIBS -lresolv"]))
+	AC_CHECK_LIB(resolv, res_mkquery, [LIBS="$LIBS -lresolv"],
+	    AC_CHECK_LIB(resolv, __res_mkquery, [LIBS="$LIBS -lresolv"])))
+AC_CHECK_FUNC(dn_expand, ,
+	AC_CHECK_LIB(resolv, dn_expand, [LIBS="$LIBS -lresolv"],
+	    AC_CHECK_LIB(resolv, __dn_expand, [LIBS="$LIBS -lresolv"])))
d605 14
a618 4
 #----------------------------------------------------------------------------
 #	Checks for various include files missing on some machines.
@@@@ -295,6 +302,8 @@@@ if test "$mcast_ok" = "yes"; then
     AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MULTICAST), AC_MSG_RESULT(no))
d626 38
@


1.3
log
@Respect TCL_INCLUDE_SPEC from tclConfig.sh if specified.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-unix_configure,v 1.2 2018/04/13 19:10:50 he Exp $
d7 3
a9 343
@@@@ -1,7 +1,7 @@@@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@@@ -67,6 +67,7 @@@@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@@@ -350,7 +351,7 @@@@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.13"
     exit 0 ;;
 
   -with-* | --with-*)
@@@@ -520,9 +521,11 @@@@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@@@ -564,8 +567,9 @@@@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@@@ -593,9 +597,10 @@@@ else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
-  for ac_dir in $PATH; do
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@@@ -630,6 +635,40 @@@@ else
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:645: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
@@@@ -640,15 +679,17 @@@@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-cat > conftest.$ac_ext <<EOF
-#line 648 "configure"
+cat > conftest.$ac_ext << EOF
+
+#line 688 "configure"
 #include "confdefs.h"
+
 main(){return(0);}
 EOF
-if { (eval echo configure:652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@@@ -662,6 +703,12 @@@@ else
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
@@@@ -693,11 +740,15 @@@@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:701: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:752: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@@@ -712,16 +763,20 @@@@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-O2"
+    CFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
 fi
 
 else
@@@@ -750,8 +805,8 @@@@ else
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@@@ -761,14 +816,31 @@@@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 765 "configure"
+#line 820 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 837 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@@@ -781,6 +853,8 @@@@ fi
 rm -f conftest*
 fi
 rm -f conftest*
+fi
+rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
   CPP="$ac_cv_prog_CPP"
@@@@ -799,8 +873,9 @@@@ else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_LEX="flex"
@@@@ -878,8 +953,9 @@@@ else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YACC="$ac_prog"
@@@@ -926,6 +1002,7 @@@@ ac_configure=$ac_aux_dir/configure # Thi
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
@@@@ -935,19 +1012,20 @@@@ if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@@@ -977,6 +1055,8 @@@@ echo "$ac_t""$INSTALL" 1>&6
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
@@@@ -994,9 +1074,13 @@@@ else
   /*)
   ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_SCOTTY="$SCOTTY" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_SCOTTY="$ac_dir/$ac_word"
@@@@ -1033,9 +1117,13 @@@@ else
   /*)
   ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_TCLSH="$ac_dir/$ac_word"
@@@@ -1059,7 +1147,10 @@@@ fi
 fi
 
d11 1
a11 1
+if  x"$TARGET" = x 
d18 1
a18 29
@@@@ -1210,8 +1301,9 @@@@ else
   if test -n "$RPCGEN"; then
   ac_cv_prog_RPCGEN="$RPCGEN" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RPCGEN="rpcgen"
@@@@ -1341,9 +1433,13 @@@@ else
   /*)
   ac_cv_path_tclsh="$tclsh" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_tclsh="$tclsh" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_tclsh="$ac_dir/$ac_word"
@@@@ -1400,7 +1496,7 @@@@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
d26 2
a27 18
     { echo "configure: error: no shared linker definition (TCL_SHLIB_LD) in tclConfig.sh" 1>&2; exit 1; }
@@@@ -1431,9 +1527,13 @@@@ else
   /*)
   ac_cv_path_wish="$wish" # Let the user override the test with a path.
   ;;
+  ?:/*)			 
+  ac_cv_path_wish="$wish" # Let the user override the test with a dos path.
+  ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_path_wish="$ac_dir/$ac_word"
@@@@ -1480,9 +1580,8 @@@@ echo "configure:1472: checking for tkCon
d31 1
a31 1
-    { echo "configure: error: "tkConfig.sh not found - use the --with-tk-config option"" 1>&2; exit 1; }
d34 1
a34 1
+    echo "$ac_t"""tkConfig.sh not found - use the --with-tk-config option"" 1>&6
d39 1
a39 1
@@@@ -1498,6 +1597,7 @@@@ fi
d41 1
a41 1
     { echo "configure: error: "tk 4.1 or later needed"" 1>&2; exit 1; }
d47 15
a61 110
@@@@ -1922,7 +2022,95 @@@@ int main() {
 res_mkquery()
 ; return 0; }
 EOF
-if { (eval echo configure:1926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lresolv"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
+echo "configure:2049: checking for __dn_expand" >&5
+if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2054 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char __dn_expand(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub___dn_expand) || defined (__stub_____dn_expand)
+choke me
+#else
+__dn_expand();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func___dn_expand=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func___dn_expand=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
+echo "configure:2095: checking for __dn_expand in -lresolv" >&5
+ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2103 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char __dn_expand();
+
+int main() {
+__dn_expand()
+; return 0; }
+EOF
+if { (eval echo configure:2114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@@@ -1963,8 +2151,8 @@@@ else
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:2155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@@@ -2318,6 +2506,8 @@@@ fi
 rm -f conftest*
a68 38
@@@@ -2547,7 +2737,7 @@@@ EOF
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  case `(ac_space=' '; set) 2>&1` in
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).
@@@@ -2614,7 +2804,7 @@@@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@@@ -2634,9 +2824,11 @@@@ sed 's/%@@/@@@@/; s/@@%/@@@@/; s/%g\$/@@g/; /@@g
  s/@@@@/%@@/; s/@@@@/@@%/; s/@@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@@SHELL@@%$SHELL%g
 s%@@CFLAGS@@%$CFLAGS%g
 s%@@CPPFLAGS@@%$CPPFLAGS%g
 s%@@CXXFLAGS@@%$CXXFLAGS%g
+s%@@FFLAGS@@%$FFLAGS%g
 s%@@DEFS@@%$DEFS%g
 s%@@LDFLAGS@@%$LDFLAGS%g
 s%@@LIBS@@%$LIBS%g
@@@@ -2661,6 +2853,7 @@@@ s%@@LEX@@%$LEX%g
 s%@@LEXLIB@@%$LEXLIB%g
 s%@@YACC@@%$YACC%g
 s%@@INSTALL_PROGRAM@@%$INSTALL_PROGRAM%g
+s%@@INSTALL_SCRIPT@@%$INSTALL_SCRIPT%g
 s%@@INSTALL_DATA@@%$INSTALL_DATA%g
 s%@@SCOTTY@@%$SCOTTY%g
 s%@@TCLSH@@%$TCLSH%g
@


1.2
log
@Move to patching unix/configure.in, and regen unix/configure.
Add a patch to search for __dn_expand in -lresolv if it's not in libc,
as is the case on Linux Debian.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-unix_configure,v 1.1 2014/03/05 13:52:29 he Exp $
d386 9
@


1.1
log
@Make tcl-scotty build with minimal warnings and install again.

This change is the result of a large sweep triggered by the new
Tcl which has const'ified many interfaces -- this follows suit with
many corresponding changes internally in scotty => lots of new
patches.

Also, change so as to not access interp->errorLine and
interp->result directly, use the accessor functions instead,
and turn off the corresponding compatibility defines.

The old patch files have been renamed and expanded, the new
scheme for naming patch files is used.

Only minimal functionality testing is done, but what has been
done shows that it basically works again.

PKGREVISION bumped.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.3 2011/09/02 08:06:55 he Exp $
d3 1
a3 2
Default target to build & install scotty & tkined.
Append TCL_LIBS to library setting, so that tcl library is picked up.
d5 1
a5 1
--- unix/configure.orig	1998-11-03 16:16:50.000000000 +0100
d7 66
a72 1
@@@@ -1059,7 +1059,11 @@@@ fi
d75 35
d111 15
d127 225
a351 1
+if [ x"$TARGET" = x ]
d358 45
a402 1
@@@@ -1480,9 +1484,8 @@@@ echo "configure:1472: checking for tkCon
d409 1
a409 1
+    { echo "configure: error: tkConfig.sh not found" 1>&2; }
d414 2
a415 1
@@@@ -1499,6 +1502,8 @@@@ if test 4 -eq $TK_MAJOR_VERSION -a 1 -gt
d418 1
d420 15
d436 28
d465 67
a531 5
 #----------------------------------------------------------------------------
 #	Check for the existence of various libraries.
 #----------------------------------------------------------------------------
@@@@ -2443,6 +2448,8 @@@@ fi
 
d536 41
a576 3
 echo $ac_n "checking for getmntent""... $ac_c" 1>&6
 echo "configure:2448: checking for getmntent" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
@