1536 lines
46 KiB
Plaintext
1536 lines
46 KiB
Plaintext
--- configure.orig Sun Jun 23 17:59:45 1996
|
|
+++ configure Tue Sep 9 11:20:59 1997
|
|
@@ -1,7 +1,7 @@
|
|
#! /bin/sh
|
|
|
|
# Guess values for system-dependent variables and create Makefiles.
|
|
-# Generated automatically using autoconf version 2.10
|
|
+# Generated automatically using autoconf version 2.12
|
|
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
|
|
#
|
|
# This configure script is free software; the Free Software Foundation
|
|
@@ -61,6 +61,8 @@
|
|
# Initialize some other variables.
|
|
subdirs=
|
|
MFLAGS= MAKEFLAGS=
|
|
+# Maximum number of lines to put in a shell here document.
|
|
+ac_max_here_lines=12
|
|
|
|
ac_prev=
|
|
for ac_option
|
|
@@ -342,7 +344,7 @@
|
|
verbose=yes ;;
|
|
|
|
-version | --version | --versio | --versi | --vers)
|
|
- echo "configure generated by autoconf version 2.10"
|
|
+ echo "configure generated by autoconf version 2.12"
|
|
exit 0 ;;
|
|
|
|
-with-* | --with-*)
|
|
@@ -444,11 +446,14 @@
|
|
done
|
|
|
|
# NLS nuisances.
|
|
-# Only set LANG and LC_ALL to C if already set.
|
|
-# These must not be set unconditionally because not all systems understand
|
|
-# e.g. LANG=C (notably SCO).
|
|
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
|
|
+# Only set these to C if already set. These must not be set unconditionally
|
|
+# because not all systems understand e.g. LANG=C (notably SCO).
|
|
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
|
|
+# Non-C LC_CTYPE values break the ctype check.
|
|
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
|
|
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
|
|
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
|
|
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
|
|
|
|
# confdefs.h avoids OS command line length limits that DEFS can exceed.
|
|
rm -rf conftest* confdefs.h
|
|
@@ -510,6 +515,7 @@
|
|
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'
|
|
+cross_compiling=$ac_cv_prog_cc_cross
|
|
|
|
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
|
|
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
|
|
@@ -577,6 +583,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
|
+echo "configure:587: checking host system type" >&5
|
|
|
|
host_alias=$host
|
|
case "$host_alias" in
|
|
@@ -591,12 +598,13 @@
|
|
esac
|
|
|
|
host=`$ac_config_sub $host_alias`
|
|
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
|
|
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
|
|
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
|
|
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
echo "$ac_t""$host" 1>&6
|
|
|
|
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
|
+echo "configure:608: checking target system type" >&5
|
|
|
|
target_alias=$target
|
|
case "$target_alias" in
|
|
@@ -608,12 +616,13 @@
|
|
esac
|
|
|
|
target=`$ac_config_sub $target_alias`
|
|
-target_cpu=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
|
|
-target_vendor=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
|
|
-target_os=`echo $target | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
|
|
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
echo "$ac_t""$target" 1>&6
|
|
|
|
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
|
+echo "configure:626: checking build system type" >&5
|
|
|
|
build_alias=$build
|
|
case "$build_alias" in
|
|
@@ -625,9 +634,9 @@
|
|
esac
|
|
|
|
build=`$ac_config_sub $build_alias`
|
|
-build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
|
|
-build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
|
|
-build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
|
|
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
|
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
|
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|
echo "$ac_t""$build" 1>&6
|
|
|
|
test "$host_alias" != "$target_alias" &&
|
|
@@ -639,6 +648,7 @@
|
|
# Extract the first word of "gcc", so it can be a program name with args.
|
|
set dummy gcc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
+echo "configure:652: 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
|
|
@@ -667,6 +677,7 @@
|
|
# Extract the first word of "cc", so it can be a program name with args.
|
|
set dummy cc; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
+echo "configure:681: 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
|
|
@@ -713,7 +724,47 @@
|
|
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
|
fi
|
|
|
|
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
+echo "configure:729: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
|
+
|
|
+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'
|
|
+cross_compiling=$ac_cv_prog_cc_cross
|
|
+
|
|
+cat > conftest.$ac_ext <<EOF
|
|
+#line 739 "configure"
|
|
+#include "confdefs.h"
|
|
+main(){return(0);}
|
|
+EOF
|
|
+if { (eval echo configure:743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
+ ac_cv_prog_cc_cross=no
|
|
+ else
|
|
+ ac_cv_prog_cc_cross=yes
|
|
+ fi
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ ac_cv_prog_cc_works=no
|
|
+fi
|
|
+rm -fr conftest*
|
|
+
|
|
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
|
|
+if test $ac_cv_prog_cc_works = no; then
|
|
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
|
+fi
|
|
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
+echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
|
+cross_compiling=$ac_cv_prog_cc_cross
|
|
+
|
|
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
|
+echo "configure:768: checking whether we are using GNU C" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -722,7 +773,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gcc=yes
|
|
else
|
|
ac_cv_prog_gcc=no
|
|
@@ -730,40 +781,46 @@
|
|
fi
|
|
|
|
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
|
+
|
|
if test $ac_cv_prog_gcc = yes; then
|
|
GCC=yes
|
|
- if test "${CFLAGS+set}" != set; then
|
|
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
|
|
+ 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:792: 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
|
|
echo 'void f(){}' > conftest.c
|
|
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
|
- ac_cv_prog_gcc_g=yes
|
|
+ ac_cv_prog_cc_g=yes
|
|
else
|
|
- ac_cv_prog_gcc_g=no
|
|
+ ac_cv_prog_cc_g=no
|
|
fi
|
|
rm -f conftest*
|
|
|
|
fi
|
|
|
|
-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
|
|
- if test $ac_cv_prog_gcc_g = yes; then
|
|
- CFLAGS="-g -O"
|
|
- else
|
|
- CFLAGS="-O"
|
|
- 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
|
|
+ CFLAGS="-g -O2"
|
|
+ else
|
|
+ CFLAGS="-O2"
|
|
fi
|
|
else
|
|
GCC=
|
|
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
|
fi
|
|
|
|
-for ac_prog in $CCC c++ g++ gcc CC cxx
|
|
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++
|
|
do
|
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
set dummy $ac_prog; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
+echo "configure:824: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -793,7 +850,53 @@
|
|
test -n "$CXX" || CXX="gcc"
|
|
|
|
|
|
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
|
+echo "configure:855: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
|
|
+
|
|
+ac_ext=C
|
|
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
|
+ac_cpp='$CXXCPP $CPPFLAGS'
|
|
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
|
|
+ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
+cross_compiling=$ac_cv_prog_cxx_cross
|
|
+
|
|
+cat > conftest.$ac_ext <<EOF
|
|
+#line 865 "configure"
|
|
+#include "confdefs.h"
|
|
+main(){return(0);}
|
|
+EOF
|
|
+if { (eval echo configure:869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
|
+ ac_cv_prog_cxx_works=yes
|
|
+ # If we can't run a trivial program, we are probably using a cross compiler.
|
|
+ if (./conftest; exit) 2>/dev/null; then
|
|
+ ac_cv_prog_cxx_cross=no
|
|
+ else
|
|
+ ac_cv_prog_cxx_cross=yes
|
|
+ fi
|
|
+else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ ac_cv_prog_cxx_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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
|
+cross_compiling=$ac_cv_prog_cc_cross
|
|
+
|
|
+echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
|
|
+if test $ac_cv_prog_cxx_works = no; then
|
|
+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
|
|
+fi
|
|
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
|
+echo "configure:895: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
|
|
+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
|
|
+cross_compiling=$ac_cv_prog_cxx_cross
|
|
+
|
|
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
|
|
+echo "configure:900: checking whether we are using GNU C++" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -802,7 +905,7 @@
|
|
yes;
|
|
#endif
|
|
EOF
|
|
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
ac_cv_prog_gxx=yes
|
|
else
|
|
ac_cv_prog_gxx=no
|
|
@@ -810,29 +913,34 @@
|
|
fi
|
|
|
|
echo "$ac_t""$ac_cv_prog_gxx" 1>&6
|
|
+
|
|
if test $ac_cv_prog_gxx = yes; then
|
|
GXX=yes
|
|
- if test "${CXXFLAGS+set}" != set; then
|
|
- echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_prog_gxx_g'+set}'`\" = set"; then
|
|
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
+ ac_save_CXXFLAGS="$CXXFLAGS"
|
|
+ CXXFLAGS=
|
|
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
|
|
+echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5
|
|
+if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
echo 'void f(){}' > conftest.cc
|
|
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
|
|
- ac_cv_prog_gxx_g=yes
|
|
+ ac_cv_prog_cxx_g=yes
|
|
else
|
|
- ac_cv_prog_gxx_g=no
|
|
+ ac_cv_prog_cxx_g=no
|
|
fi
|
|
rm -f conftest*
|
|
|
|
fi
|
|
|
|
-echo "$ac_t""$ac_cv_prog_gxx_g" 1>&6
|
|
- if test $ac_cv_prog_gxx_g = yes; then
|
|
- CXXFLAGS="-g -O"
|
|
- else
|
|
- CXXFLAGS="-O"
|
|
- fi
|
|
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
|
|
+ if test "$ac_test_CXXFLAGS" = set; then
|
|
+ CXXFLAGS="$ac_save_CXXFLAGS"
|
|
+ elif test $ac_cv_prog_cxx_g = yes; then
|
|
+ CXXFLAGS="-g -O2"
|
|
+ else
|
|
+ CXXFLAGS="-O2"
|
|
fi
|
|
else
|
|
GXX=
|
|
@@ -840,6 +948,7 @@
|
|
fi
|
|
|
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
|
+echo "configure:952: checking how to run the C preprocessor" >&5
|
|
# On Suns, sometimes $CPP names a directory.
|
|
if test -n "$CPP" && test -d "$CPP"; then
|
|
CPP=
|
|
@@ -854,33 +963,37 @@
|
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
|
# not just through cpp.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 858 "configure"
|
|
+#line 967 "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:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
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} -E -traditional-cpp"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 873 "configure"
|
|
+#line 984 "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:879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
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=/lib/cpp
|
|
fi
|
|
@@ -895,38 +1008,13 @@
|
|
fi
|
|
echo "$ac_t""$CPP" 1>&6
|
|
|
|
-# If we cannot run a trivial program, we must be cross compiling.
|
|
-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
|
|
-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
|
|
- echo $ac_n "(cached) $ac_c" 1>&6
|
|
-else
|
|
- if test "$cross_compiling" = yes; then
|
|
- ac_cv_c_cross=yes
|
|
-else
|
|
-cat > conftest.$ac_ext <<EOF
|
|
-#line 908 "configure"
|
|
-#include "confdefs.h"
|
|
-main(){return(0);}
|
|
-EOF
|
|
-{ (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
|
|
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
|
|
- ac_cv_c_cross=no
|
|
-else
|
|
- ac_cv_c_cross=yes
|
|
-fi
|
|
-fi
|
|
-rm -fr conftest*
|
|
-fi
|
|
-
|
|
-echo "$ac_t""$ac_cv_c_cross" 1>&6
|
|
-cross_compiling=$ac_cv_c_cross
|
|
-
|
|
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
|
|
+echo "configure:1013: checking for ANSI C header files" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 930 "configure"
|
|
+#line 1018 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
@@ -934,13 +1022,15 @@
|
|
#include <float.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:1026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
ac_cv_header_stdc=yes
|
|
else
|
|
echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
ac_cv_header_stdc=no
|
|
fi
|
|
@@ -949,7 +1039,7 @@
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 953 "configure"
|
|
+#line 1043 "configure"
|
|
#include "confdefs.h"
|
|
#include <string.h>
|
|
EOF
|
|
@@ -967,7 +1057,7 @@
|
|
if test $ac_cv_header_stdc = yes; then
|
|
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 971 "configure"
|
|
+#line 1061 "configure"
|
|
#include "confdefs.h"
|
|
#include <stdlib.h>
|
|
EOF
|
|
@@ -987,8 +1077,8 @@
|
|
if test "$cross_compiling" = yes; then
|
|
:
|
|
else
|
|
-cat > conftest.$ac_ext <<EOF
|
|
-#line 992 "configure"
|
|
+ cat > conftest.$ac_ext <<EOF
|
|
+#line 1082 "configure"
|
|
#include "confdefs.h"
|
|
#include <ctype.h>
|
|
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
|
|
@@ -999,15 +1089,19 @@
|
|
exit (0); }
|
|
|
|
EOF
|
|
-{ (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
|
|
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
|
|
+if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
|
+then
|
|
:
|
|
else
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
+ rm -fr conftest*
|
|
ac_cv_header_stdc=no
|
|
fi
|
|
-fi
|
|
rm -fr conftest*
|
|
fi
|
|
+
|
|
+fi
|
|
fi
|
|
|
|
echo "$ac_t""$ac_cv_header_stdc" 1>&6
|
|
@@ -1020,24 +1114,27 @@
|
|
|
|
for ac_hdr in string.h
|
|
do
|
|
-ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
|
|
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
+echo "configure:1120: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1030 "configure"
|
|
+#line 1125 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=yes"
|
|
else
|
|
echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
eval "ac_cv_header_$ac_safe=no"
|
|
fi
|
|
@@ -1045,7 +1142,7 @@
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
|
|
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
|
cat >> confdefs.h <<EOF
|
|
#define $ac_tr_hdr 1
|
|
EOF
|
|
@@ -1066,26 +1163,28 @@
|
|
V_TARCMD="tar cfh"
|
|
V_SIGRET="void"
|
|
|
|
-echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo Xbsd'_'main | tr './+\055' '__p_'`
|
|
+echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
|
|
+echo "configure:1168: checking for main in -lXbsd" >&5
|
|
+ac_lib_var=`echo Xbsd'_'main | 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="-lXbsd $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1078 "configure"
|
|
+#line 1176 "configure"
|
|
#include "confdefs.h"
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1100,30 +1199,32 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
-echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo socket'_'poll | tr './+\055' '__p_'`
|
|
+echo $ac_n "checking for poll in -lsocket""... $ac_c" 1>&6
|
|
+echo "configure:1204: checking for poll in -lsocket" >&5
|
|
+ac_lib_var=`echo socket'_'poll | 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="-lsocket $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1112 "configure"
|
|
+#line 1212 "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 poll();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
poll()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1138,30 +1239,32 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
-echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo nsl'_'gethostbyname | tr './+\055' '__p_'`
|
|
+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
|
+echo "configure:1244: checking for gethostbyname in -lnsl" >&5
|
|
+ac_lib_var=`echo nsl'_'gethostbyname | 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="-lnsl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1150 "configure"
|
|
+#line 1252 "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 gethostbyname();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
gethostbyname()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1176,30 +1279,32 @@
|
|
echo "$ac_t""no" 1>&6
|
|
fi
|
|
|
|
-echo $ac_n "checking for -ldnet_stub""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo dnet_stub'_'getnodebyname | tr './+\055' '__p_'`
|
|
+echo $ac_n "checking for getnodebyname in -ldnet_stub""... $ac_c" 1>&6
|
|
+echo "configure:1284: checking for getnodebyname in -ldnet_stub" >&5
|
|
+ac_lib_var=`echo dnet_stub'_'getnodebyname | 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="-ldnet_stub $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1188 "configure"
|
|
+#line 1292 "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 getnodebyname();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
getnodebyname()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1304,18 +1409,20 @@
|
|
echo "checking for X11 header files"
|
|
if test "$x_includes" = NONE ; then
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1308 "configure"
|
|
+#line 1413 "configure"
|
|
#include "confdefs.h"
|
|
#include <X11/Intrinsic.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:1418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
x_includes=""
|
|
else
|
|
echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
x_includes=NONE
|
|
fi
|
|
@@ -1340,30 +1447,32 @@
|
|
|
|
echo "checking for X11 library archive"
|
|
if test "$x_libraries" = NONE ; then
|
|
- echo $ac_n "checking for -lX11""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo X11'_'XOpenDisplay | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
|
|
+echo "configure:1452: checking for XOpenDisplay in -lX11" >&5
|
|
+ac_lib_var=`echo X11'_'XOpenDisplay | 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="-lX11 $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1352 "configure"
|
|
+#line 1460 "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 XOpenDisplay();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
XOpenDisplay()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1397,30 +1506,32 @@
|
|
|
|
if test -n "$V_SHM" ; then
|
|
if test -z "$x_libraries" ; then
|
|
- echo $ac_n "checking for -lXext""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo Xext'_'XShmAttach | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
|
|
+echo "configure:1511: checking for XShmAttach in -lXext" >&5
|
|
+ac_lib_var=`echo Xext'_'XShmAttach | 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="-lXext -lX11 $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1409 "configure"
|
|
+#line 1519 "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 XShmAttach();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
XShmAttach()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1478,8 +1589,8 @@
|
|
echo "can't find tcl.h in $d/include"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/libtcl7.5.so \
|
|
- $d/lib/libtcl7.5.a \
|
|
+ places="$d/lib/libtcl8.0.so \
|
|
+ $d/lib/libtcl8.0.a \
|
|
$d/lib/libtcl.so \
|
|
$d/lib/libtcl.a"
|
|
V_LIB_TCL=FAIL
|
|
@@ -1493,7 +1604,7 @@
|
|
echo "can't find libtcl.a in $d/lib"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/tcl7.5 \
|
|
+ places="$d/lib/tcl8.0 \
|
|
$d/lib/tcl"
|
|
V_LIBRARY_TCL=FAIL
|
|
for dir in $places; do
|
|
@@ -1508,31 +1619,34 @@
|
|
fi
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1512 "configure"
|
|
+#line 1623 "configure"
|
|
#include "confdefs.h"
|
|
#include <tcl.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:1628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
V_INCLUDE_TCL=""
|
|
else
|
|
echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
V_INCLUDE_TCL=FAIL
|
|
fi
|
|
rm -f conftest*
|
|
if test "$V_INCLUDE_TCL" = FAIL; then
|
|
echo "checking for tcl.h"
|
|
- places="$PWD/../tcl7.5 \
|
|
- /usr/src/local/tcl7.5 \
|
|
- /import/tcl/include/tcl7.5 \
|
|
+ places="$PWD/../tcl8.0 \
|
|
+ /usr/src/local/tcl8.0 \
|
|
+ /import/tcl/include/tcl8.0 \
|
|
$prefix/include \
|
|
$x_includes/tk \
|
|
$x_includes \
|
|
/usr/local/include \
|
|
+ /usr/local/include/tcl8.0 \
|
|
/usr/contrib/include \
|
|
/usr/include"
|
|
for dir in $places; do
|
|
@@ -1546,26 +1660,28 @@
|
|
exit 1
|
|
fi
|
|
fi
|
|
- echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo tcl7.5'_'main | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for main in -ltcl8.0""... $ac_c" 1>&6
|
|
+echo "configure:1665: checking for main in -ltcl8.0" >&5
|
|
+ac_lib_var=`echo tcl8.0'_'main | 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="-ltcl7.5 $LIBS"
|
|
+LIBS="-ltcl8.0 $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1558 "configure"
|
|
+#line 1673 "configure"
|
|
#include "confdefs.h"
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1575,7 +1691,7 @@
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- V_LIB_TCL="-ltcl7.5"
|
|
+ V_LIB_TCL="-ltcl8.0"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
V_LIB_TCL="FAIL"
|
|
@@ -1589,13 +1705,13 @@
|
|
/usr/contrib/lib \
|
|
/usr/local/lib \
|
|
/usr/lib \
|
|
- $PWD/../tcl7.5 \
|
|
- /usr/src/local/tcl7.5 \
|
|
- /import/tcl/lib/tcl7.5 \
|
|
+ $PWD/../tcl8.0 \
|
|
+ /usr/src/local/tcl8.0 \
|
|
+ /import/tcl/lib/tcl8.0 \
|
|
"
|
|
for dir in $places; do
|
|
- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
|
|
- V_LIB_TCL="-L$dir -ltcl7.5"
|
|
+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
|
|
+ V_LIB_TCL="-L$dir -ltcl80"
|
|
break
|
|
fi
|
|
if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
|
|
@@ -1614,13 +1730,13 @@
|
|
fi
|
|
echo "checking for tcl/init.tcl"
|
|
V_LIBRARY_TCL=FAIL
|
|
- places="/usr/local/lib/tcl7.5 \
|
|
- /usr/contrib/lib/tcl7.5 \
|
|
- /usr/lib/tcl7.5 \
|
|
- /usr/lib/tk/tcl7.5 \
|
|
- /import/tcl/lib/tcl7.5 \
|
|
- $prefix/lib/tcl7.5 \
|
|
- $x_libraries/tcl7.5 \
|
|
+ places="/usr/local/lib/tcl8.0 \
|
|
+ /usr/contrib/lib/tcl8.0 \
|
|
+ /usr/lib/tcl8.0 \
|
|
+ /usr/lib/tk/tcl8.0 \
|
|
+ /import/tcl/lib/tcl8.0 \
|
|
+ $prefix/lib/tcl8.0 \
|
|
+ $x_libraries/tcl8.0 \
|
|
/usr/local/lib/tcl \
|
|
/usr/lib/tcl \
|
|
/usr/lib/tk/tcl \
|
|
@@ -1661,8 +1777,8 @@
|
|
echo "can't find tk.h in $d/include"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/libtk4.1.so \
|
|
- $d/lib/libtk4.1.a \
|
|
+ places="$d/lib/libtk8.0.so \
|
|
+ $d/lib/libtk8.0.a \
|
|
$d/lib/libtk.so \
|
|
$d/lib/libtk.a"
|
|
V_LIB_TK=FAIL
|
|
@@ -1676,7 +1792,7 @@
|
|
echo "can't find libtk.a in $d/lib"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/tk4.1 \
|
|
+ places="$d/lib/tk8.0 \
|
|
$d/lib/tk"
|
|
V_LIBRARY_TK=FAIL
|
|
for dir in $places; do
|
|
@@ -1691,36 +1807,39 @@
|
|
fi
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1695 "configure"
|
|
+#line 1811 "configure"
|
|
#include "confdefs.h"
|
|
#include <tk.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:1816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
V_INCLUDE_TK=""
|
|
else
|
|
echo "$ac_err" >&5
|
|
+ echo "configure: failed program was:" >&5
|
|
+ cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
V_INCLUDE_TK=FAIL
|
|
fi
|
|
rm -f conftest*
|
|
if test "$V_INCLUDE_TK" = FAIL; then
|
|
echo "checking for tk.h"
|
|
- V_INCLUDE_TK=""
|
|
+ V_INCLUDE_TK="FAIL"
|
|
places="\
|
|
$prefix/include \
|
|
/usr/local/include \
|
|
+ /usr/local/include/tk8.0 \
|
|
/usr/contrib/include \
|
|
/usr/include/tcl \
|
|
/usr/include\
|
|
$x_includes/tk \
|
|
$x_includes \
|
|
- $PWD/../tk4.1 \
|
|
- /usr/src/local/tk4.1 \
|
|
- /import/tcl/include/tk4.1 \
|
|
+ $PWD/../tk8.0 \
|
|
+ /usr/src/local/tk8.0 \
|
|
+ /import/tcl/include/tk8.0 \
|
|
"
|
|
for dir in $places; do
|
|
if test -r $dir/tk.h ; then
|
|
@@ -1733,26 +1852,28 @@
|
|
exit 1
|
|
fi
|
|
fi
|
|
- echo $ac_n "checking for -ltk4.1""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo tk4.1'_'main | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for main in -ltk8.0""... $ac_c" 1>&6
|
|
+echo "configure:1857: checking for main in -ltk8.0" >&5
|
|
+ac_lib_var=`echo tk8.0'_'main | 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="-ltk4.1 $LIBS"
|
|
+LIBS="-ltk8.0 $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 1745 "configure"
|
|
+#line 1865 "configure"
|
|
#include "confdefs.h"
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -1762,7 +1883,7 @@
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- V_LIB_TK="-ltk4.1"
|
|
+ V_LIB_TK="-ltk8.0"
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
V_LIB_TK="FAIL"
|
|
@@ -1775,13 +1896,13 @@
|
|
/usr/lib \
|
|
/usr/lib/tk \
|
|
/import/tcl/lib \
|
|
- $PWD/../tk4.1 \
|
|
- /usr/src/local/tk4.1 \
|
|
+ $PWD/../tk8.0 \
|
|
+ /usr/src/local/tk8.0 \
|
|
$prefix/lib \
|
|
$x_libraries"
|
|
for dir in $places; do
|
|
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
|
|
- V_LIB_TK="-L$dir -ltk4.1"
|
|
+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
|
|
+ V_LIB_TK="-L$dir -ltk80"
|
|
break
|
|
fi
|
|
if test -r $dir/libtk.so -o -r $dir/libtk.a; then
|
|
@@ -1800,15 +1921,15 @@
|
|
fi
|
|
echo "checking for tk/tk.tcl"
|
|
V_LIBRARY_TK=FAIL
|
|
- places="/usr/local/lib/tk4.1 \
|
|
- /usr/contrib/lib/tk4.1 \
|
|
- /usr/lib/tk4.1 \
|
|
- /usr/lib/tk/tk4.1 \
|
|
- /import/tcl/lib/tk4.1 \
|
|
- $prefix/lib/tk4.1 \
|
|
- $x_libraries/tk4.1 \
|
|
- $PWD/../tk4.1/library \
|
|
- /usr/src/local/tk4.1/library \
|
|
+ places="/usr/local/lib/tk8.0 \
|
|
+ /usr/contrib/lib/tk8.0 \
|
|
+ /usr/lib/tk8.0 \
|
|
+ /usr/lib/tk/tk8.0 \
|
|
+ /import/tcl/lib/tk8.0 \
|
|
+ $prefix/lib/tk8.0 \
|
|
+ $x_libraries/tk8.0 \
|
|
+ $PWD/../tk8.0/library \
|
|
+ /usr/src/local/tk8.0/library \
|
|
/usr/local/lib/tk \
|
|
/usr/lib/tk \
|
|
/usr/lib/tk/tk \
|
|
@@ -2074,6 +2195,9 @@
|
|
V_TARCMD="tar -h -c -f"
|
|
V_LIB="$V_LIB -L/usr/local/lib"
|
|
;;
|
|
+*-*-freebsd*)
|
|
+ V_STATIC=""
|
|
+ ;;
|
|
*-*-hpux*)
|
|
V_CCOPT="-O"
|
|
;;
|
|
@@ -2131,30 +2255,32 @@
|
|
V_LIB_DL="dld"
|
|
;;
|
|
*-*-linux*)
|
|
- echo $ac_n "checking for -ldl""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
|
+echo "configure:2260: checking for dlopen in -ldl" >&5
|
|
+ac_lib_var=`echo dl'_'dlopen | 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="-ldl $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2143 "configure"
|
|
+#line 2268 "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 dlopen();
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
dlopen()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -2176,26 +2302,28 @@
|
|
;;
|
|
esac
|
|
if test ! -z "$V_LIB_DL" ; then
|
|
- echo $ac_n "checking for -l$V_LIB_DL""... $ac_c" 1>&6
|
|
-ac_lib_var=`echo $V_LIB_DL'_'main | tr './+\055' '__p_'`
|
|
+ echo $ac_n "checking for main in -l$V_LIB_DL""... $ac_c" 1>&6
|
|
+echo "configure:2307: checking for main in -l$V_LIB_DL" >&5
|
|
+ac_lib_var=`echo $V_LIB_DL'_'main | 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="-l$V_LIB_DL $V_STATIC $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 2188 "configure"
|
|
+#line 2315 "configure"
|
|
#include "confdefs.h"
|
|
|
|
-int main() { return 0; }
|
|
-int t() {
|
|
+int main() {
|
|
main()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
|
+if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
|
|
@@ -2205,7 +2333,8 @@
|
|
fi
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
echo "$ac_t""yes" 1>&6
|
|
- ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
+ ac_tr_lib=HAVE_LIB`echo $V_LIB_DL | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
|
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
|
cat >> confdefs.h <<EOF
|
|
#define $ac_tr_lib 1
|
|
EOF
|
|
@@ -2279,11 +2408,25 @@
|
|
# --recheck option to rerun configure.
|
|
#
|
|
EOF
|
|
+# The following way of writing the cache mishandles newlines in values,
|
|
+# but we know of no workaround that is simple, portable, and efficient.
|
|
+# So, don't put newlines in cache variables' values.
|
|
# 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 |
|
|
- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
|
|
- >> confcache
|
|
+ case `(ac_space=' '; set) 2>&1` in
|
|
+ *ac_space=\ *)
|
|
+ # `set' does not quote correctly, so add quotes (double-quote substitution
|
|
+ # turns \\\\ into \\, and sed turns \\ into \).
|
|
+ sed -n \
|
|
+ -e "s/'/'\\\\''/g" \
|
|
+ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
|
|
+ ;;
|
|
+ *)
|
|
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
|
|
+ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
|
|
+ ;;
|
|
+ esac >> confcache
|
|
if cmp -s $cache_file confcache; then
|
|
:
|
|
else
|
|
@@ -2350,7 +2493,7 @@
|
|
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.10"
|
|
+ echo "$CONFIG_STATUS generated by autoconf version 2.12"
|
|
exit 0 ;;
|
|
-help | --help | --hel | --he | --h)
|
|
echo "\$ac_cs_usage"; exit 0 ;;
|
|
@@ -2439,20 +2582,56 @@
|
|
|
|
CEOF
|
|
EOF
|
|
+
|
|
+cat >> $CONFIG_STATUS <<\EOF
|
|
+
|
|
+# Split the substitutions into bite-sized pieces for seds with
|
|
+# small command number limits, like on Digital OSF/1 and HP-UX.
|
|
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
|
|
+ac_file=1 # Number of current file.
|
|
+ac_beg=1 # First line for current file.
|
|
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
|
|
+ac_more_lines=:
|
|
+ac_sed_cmds=""
|
|
+while $ac_more_lines; do
|
|
+ if test $ac_beg -gt 1; then
|
|
+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
|
|
+ else
|
|
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
|
|
+ fi
|
|
+ if test ! -s conftest.s$ac_file; then
|
|
+ ac_more_lines=false
|
|
+ rm -f conftest.s$ac_file
|
|
+ else
|
|
+ if test -z "$ac_sed_cmds"; then
|
|
+ ac_sed_cmds="sed -f conftest.s$ac_file"
|
|
+ else
|
|
+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
|
|
+ fi
|
|
+ ac_file=`expr $ac_file + 1`
|
|
+ ac_beg=$ac_end
|
|
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
|
|
+ fi
|
|
+done
|
|
+if test -z "$ac_sed_cmds"; then
|
|
+ ac_sed_cmds=cat
|
|
+fi
|
|
+EOF
|
|
+
|
|
cat >> $CONFIG_STATUS <<EOF
|
|
|
|
CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
|
|
EOF
|
|
cat >> $CONFIG_STATUS <<\EOF
|
|
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
|
|
- # Support "outfile[:infile]", defaulting infile="outfile.in".
|
|
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|
|
case "$ac_file" in
|
|
- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
|
|
+ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
|
|
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
*) ac_file_in="${ac_file}.in" ;;
|
|
esac
|
|
|
|
- # Adjust relative srcdir, etc. for subdirectories.
|
|
+ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
|
|
|
|
# Remove last slash and all that follows it. Not all systems have dirname.
|
|
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
|
|
@@ -2476,6 +2655,7 @@
|
|
top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
esac
|
|
|
|
+
|
|
echo creating "$ac_file"
|
|
rm -f "$ac_file"
|
|
configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
|
|
@@ -2484,15 +2664,21 @@
|
|
# $configure_input" ;;
|
|
*) ac_comsub= ;;
|
|
esac
|
|
+
|
|
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
|
|
sed -e "$ac_comsub
|
|
s%@configure_input@%$configure_input%g
|
|
s%@srcdir@%$srcdir%g
|
|
s%@top_srcdir@%$top_srcdir%g
|
|
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
|
|
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
|
|
fi; done
|
|
-rm -f conftest.subs
|
|
+rm -f conftest.s*
|
|
|
|
+EOF
|
|
+cat >> $CONFIG_STATUS <<EOF
|
|
|
|
+EOF
|
|
+cat >> $CONFIG_STATUS <<\EOF
|
|
|
|
exit 0
|
|
EOF
|
|
--- configure.in.orig Thu Jun 20 23:36:47 1996
|
|
+++ configure.in Tue Sep 9 11:20:32 1997
|
|
@@ -228,6 +228,9 @@
|
|
V_TARCMD="tar -h -c -f"
|
|
V_LIB="$V_LIB -L/usr/local/lib"
|
|
;;
|
|
+*-*-freebsd*)
|
|
+ V_STATIC=""
|
|
+ ;;
|
|
*-*-hpux*)
|
|
V_CCOPT="-O"
|
|
;;
|
|
--- configure.in.tk.orig Thu May 16 01:06:05 1996
|
|
+++ configure.in.tk Tue Sep 9 11:01:36 1997
|
|
@@ -12,8 +12,8 @@
|
|
echo "can't find tcl.h in $d/include"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/libtcl7.5.so \
|
|
- $d/lib/libtcl7.5.a \
|
|
+ places="$d/lib/libtcl8.0.so \
|
|
+ $d/lib/libtcl8.0.a \
|
|
$d/lib/libtcl.so \
|
|
$d/lib/libtcl.a"
|
|
V_LIB_TCL=FAIL
|
|
@@ -27,7 +27,7 @@
|
|
echo "can't find libtcl.a in $d/lib"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/tcl7.5 \
|
|
+ places="$d/lib/tcl8.0 \
|
|
$d/lib/tcl"
|
|
V_LIBRARY_TCL=FAIL
|
|
for dir in $places; do
|
|
@@ -44,13 +44,14 @@
|
|
AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
|
|
if test "$V_INCLUDE_TCL" = FAIL; then
|
|
echo "checking for tcl.h"
|
|
- places="$PWD/../tcl7.5 \
|
|
- /usr/src/local/tcl7.5 \
|
|
- /import/tcl/include/tcl7.5 \
|
|
+ places="$PWD/../tcl8.0 \
|
|
+ /usr/src/local/tcl8.0 \
|
|
+ /import/tcl/include/tcl8.0 \
|
|
$prefix/include \
|
|
$x_includes/tk \
|
|
$x_includes \
|
|
/usr/local/include \
|
|
+ /usr/local/include/tcl8.0 \
|
|
/usr/contrib/include \
|
|
/usr/include"
|
|
for dir in $places; do
|
|
@@ -64,7 +65,7 @@
|
|
exit 1
|
|
fi
|
|
fi
|
|
- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
|
|
+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
|
|
if test "$V_LIB_TCL" = FAIL; then
|
|
echo "checking for libtcl.a"
|
|
places="\
|
|
@@ -73,13 +74,13 @@
|
|
/usr/contrib/lib \
|
|
/usr/local/lib \
|
|
/usr/lib \
|
|
- $PWD/../tcl7.5 \
|
|
- /usr/src/local/tcl7.5 \
|
|
- /import/tcl/lib/tcl7.5 \
|
|
+ $PWD/../tcl8.0 \
|
|
+ /usr/src/local/tcl8.0 \
|
|
+ /import/tcl/lib/tcl8.0 \
|
|
"
|
|
for dir in $places; do
|
|
- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
|
|
- V_LIB_TCL="-L$dir -ltcl7.5"
|
|
+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
|
|
+ V_LIB_TCL="-L$dir -ltcl80"
|
|
break
|
|
fi
|
|
if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
|
|
@@ -98,13 +99,13 @@
|
|
fi
|
|
echo "checking for tcl/init.tcl"
|
|
V_LIBRARY_TCL=FAIL
|
|
- places="/usr/local/lib/tcl7.5 \
|
|
- /usr/contrib/lib/tcl7.5 \
|
|
- /usr/lib/tcl7.5 \
|
|
- /usr/lib/tk/tcl7.5 \
|
|
- /import/tcl/lib/tcl7.5 \
|
|
- $prefix/lib/tcl7.5 \
|
|
- $x_libraries/tcl7.5 \
|
|
+ places="/usr/local/lib/tcl8.0 \
|
|
+ /usr/contrib/lib/tcl8.0 \
|
|
+ /usr/lib/tcl8.0 \
|
|
+ /usr/lib/tk/tcl8.0 \
|
|
+ /import/tcl/lib/tcl8.0 \
|
|
+ $prefix/lib/tcl8.0 \
|
|
+ $x_libraries/tcl8.0 \
|
|
/usr/local/lib/tcl \
|
|
/usr/lib/tcl \
|
|
/usr/lib/tk/tcl \
|
|
@@ -138,8 +139,8 @@
|
|
echo "can't find tk.h in $d/include"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/libtk4.1.so \
|
|
- $d/lib/libtk4.1.a \
|
|
+ places="$d/lib/libtk8.0.so \
|
|
+ $d/lib/libtk8.0.a \
|
|
$d/lib/libtk.so \
|
|
$d/lib/libtk.a"
|
|
V_LIB_TK=FAIL
|
|
@@ -153,7 +154,7 @@
|
|
echo "can't find libtk.a in $d/lib"
|
|
exit 1
|
|
fi
|
|
- places="$d/lib/tk4.1 \
|
|
+ places="$d/lib/tk8.0 \
|
|
$d/lib/tk"
|
|
V_LIBRARY_TK=FAIL
|
|
for dir in $places; do
|
|
@@ -170,18 +171,19 @@
|
|
AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL)
|
|
if test "$V_INCLUDE_TK" = FAIL; then
|
|
echo "checking for tk.h"
|
|
- V_INCLUDE_TK=""
|
|
+ V_INCLUDE_TK="FAIL"
|
|
places="\
|
|
$prefix/include \
|
|
/usr/local/include \
|
|
+ /usr/local/include/tk8.0 \
|
|
/usr/contrib/include \
|
|
/usr/include/tcl \
|
|
/usr/include\
|
|
$x_includes/tk \
|
|
$x_includes \
|
|
- $PWD/../tk4.1 \
|
|
- /usr/src/local/tk4.1 \
|
|
- /import/tcl/include/tk4.1 \
|
|
+ $PWD/../tk8.0 \
|
|
+ /usr/src/local/tk8.0 \
|
|
+ /import/tcl/include/tk8.0 \
|
|
"
|
|
for dir in $places; do
|
|
if test -r $dir/tk.h ; then
|
|
@@ -194,7 +196,7 @@
|
|
exit 1
|
|
fi
|
|
fi
|
|
- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
|
|
+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL")
|
|
if test "$V_LIB_TK" = FAIL; then
|
|
echo "checking for libtk.a"
|
|
places="/usr/local/lib \
|
|
@@ -202,13 +204,13 @@
|
|
/usr/lib \
|
|
/usr/lib/tk \
|
|
/import/tcl/lib \
|
|
- $PWD/../tk4.1 \
|
|
- /usr/src/local/tk4.1 \
|
|
+ $PWD/../tk8.0 \
|
|
+ /usr/src/local/tk8.0 \
|
|
$prefix/lib \
|
|
$x_libraries"
|
|
for dir in $places; do
|
|
- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
|
|
- V_LIB_TK="-L$dir -ltk4.1"
|
|
+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
|
|
+ V_LIB_TK="-L$dir -ltk80"
|
|
break
|
|
fi
|
|
if test -r $dir/libtk.so -o -r $dir/libtk.a; then
|
|
@@ -227,15 +229,15 @@
|
|
fi
|
|
echo "checking for tk/tk.tcl"
|
|
V_LIBRARY_TK=FAIL
|
|
- places="/usr/local/lib/tk4.1 \
|
|
- /usr/contrib/lib/tk4.1 \
|
|
- /usr/lib/tk4.1 \
|
|
- /usr/lib/tk/tk4.1 \
|
|
- /import/tcl/lib/tk4.1 \
|
|
- $prefix/lib/tk4.1 \
|
|
- $x_libraries/tk4.1 \
|
|
- $PWD/../tk4.1/library \
|
|
- /usr/src/local/tk4.1/library \
|
|
+ places="/usr/local/lib/tk8.0 \
|
|
+ /usr/contrib/lib/tk8.0 \
|
|
+ /usr/lib/tk8.0 \
|
|
+ /usr/lib/tk/tk8.0 \
|
|
+ /import/tcl/lib/tk8.0 \
|
|
+ $prefix/lib/tk8.0 \
|
|
+ $x_libraries/tk8.0 \
|
|
+ $PWD/../tk8.0/library \
|
|
+ /usr/src/local/tk8.0/library \
|
|
/usr/local/lib/tk \
|
|
/usr/lib/tk \
|
|
/usr/lib/tk/tk \
|
|
--- Makefile.in.orig Mon Jul 22 09:32:53 1996
|
|
+++ Makefile.in Tue Sep 9 11:01:36 1997
|
|
@@ -303,7 +303,7 @@
|
|
chown bin @prefix@/bin/vic
|
|
chgrp bin @prefix@/bin/vic
|
|
chmod 555 @prefix@/bin/vic
|
|
- cp vic.1 @prefix@/man/vic.1
|
|
+ cp vic.1 @prefix@/man/man1/vic.1
|
|
cp histtolut @prefix@/bin/histtolut
|
|
chown bin @prefix@/bin/histtolut
|
|
chgrp bin @prefix@/bin/histtolut
|