Skip to content

P
Postgres FD Implementation
Commit 7cc0d6ae authored by Tom Lane's avatar Tom Lane
Browse files
Options

Fix tab-complete so it works with old versions of readline that don't 

have the rl_completion_append_character variable.  The tab completion
behavior doesn't seem to be quite perfect in that situation, but it's
better than failing to build at all...
parent e33f550b
Show whitespace changes
Inline Side-by-side
Showing with 136 additions and 93 deletions
src/bin/psql/tab-complete.c
View file @ 7cc0d6ae
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Team * Copyright 2000 by PostgreSQL Global Development Team
* *
* $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.7 2000/01/18 23:30:24 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.8 2000/01/21 23:32:36 tgl Exp $
*/ */
/*----------- /*-----------
...@@ -532,7 +532,9 @@ char ** psql_completion(char *text, int start, int end) ...@@ -532,7 +532,9 @@ char ** psql_completion(char *text, int start, int end)
attempts filename completion, and that's usually no good. */ attempts filename completion, and that's usually no good. */
if (matches == NULL) { if (matches == NULL) {
COMPLETE_WITH_CONST(""); COMPLETE_WITH_CONST("");
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rl_completion_append_character = '\0'; rl_completion_append_character = '\0';
#endif
} }
......
src/configure
View file @ 7cc0d6ae
...@@ -6129,16 +6129,49 @@ fi ...@@ -6129,16 +6129,49 @@ fi
fi fi
cat > conftest.$ac_ext <<EOF
#line 6134 "configure"
#include "confdefs.h"
#include <readline.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "rl_completion_append_character" >/dev/null 2>&1; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
#line 6148 "configure"
#include "confdefs.h"
#include <readline/readline.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "rl_completion_append_character" >/dev/null 2>&1; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
EOF
fi
rm -f conftest*
fi
rm -f conftest*
for ac_func in getopt_long for ac_func in getopt_long
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:6137: checking for $ac_func" >&5 echo "configure:6170: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6142 "configure" #line 6175 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -6161,7 +6194,7 @@ $ac_func(); ...@@ -6161,7 +6194,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -6186,18 +6219,17 @@ fi ...@@ -6186,18 +6219,17 @@ fi
done done
echo $ac_n "checking for finite() macro or function""... $ac_c" 1>&6 echo $ac_n "checking for finite() macro or function""... $ac_c" 1>&6
echo "configure:6192: checking for finite() macro or function" >&5 echo "configure:6224: checking for finite() macro or function" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6194 "configure" #line 6226 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
int dummy=finite(1.0); int dummy=finite(1.0);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_FINITE 1 #define HAVE_FINITE 1
...@@ -6214,12 +6246,12 @@ rm -f conftest* ...@@ -6214,12 +6246,12 @@ rm -f conftest*
HAVE_LONG_INT_64=0 HAVE_LONG_INT_64=0
echo $ac_n "checking whether 'long int' is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether 'long int' is 64 bits""... $ac_c" 1>&6
echo "configure:6218: checking whether 'long int' is 64 bits" >&5 echo "configure:6250: checking whether 'long int' is 64 bits" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6223 "configure" #line 6255 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long int int64; typedef long int int64;
...@@ -6247,7 +6279,7 @@ main() { ...@@ -6247,7 +6279,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:6251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
HAVE_LONG_INT_64=1 HAVE_LONG_INT_64=1
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
...@@ -6268,12 +6300,12 @@ fi ...@@ -6268,12 +6300,12 @@ fi
HAVE_LONG_LONG_INT_64=0 HAVE_LONG_LONG_INT_64=0
if [ $HAVE_LONG_INT_64 -eq 0 ] ; then if [ $HAVE_LONG_INT_64 -eq 0 ] ; then
echo $ac_n "checking whether 'long long int' is 64 bits""... $ac_c" 1>&6 echo $ac_n "checking whether 'long long int' is 64 bits""... $ac_c" 1>&6
echo "configure:6272: checking whether 'long long int' is 64 bits" >&5 echo "configure:6304: checking whether 'long long int' is 64 bits" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6277 "configure" #line 6309 "configure"
#include "confdefs.h" #include "confdefs.h"
typedef long long int int64; typedef long long int int64;
...@@ -6301,7 +6333,7 @@ main() { ...@@ -6301,7 +6333,7 @@ main() {
exit(! does_int64_work()); exit(! does_int64_work());
} }
EOF EOF
if { (eval echo configure:6305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
HAVE_LONG_LONG_INT_64=1 HAVE_LONG_LONG_INT_64=1
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
...@@ -6324,7 +6356,7 @@ fi ...@@ -6324,7 +6356,7 @@ fi
if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then
if [ x$SNPRINTF = x ] ; then if [ x$SNPRINTF = x ] ; then
echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
echo "configure:6328: checking whether snprintf handles 'long long int' as %lld" >&5 echo "configure:6360: checking whether snprintf handles 'long long int' as %lld" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -6333,7 +6365,7 @@ echo "configure:6328: checking whether snprintf handles 'long long int' as %lld" ...@@ -6333,7 +6365,7 @@ echo "configure:6328: checking whether snprintf handles 'long long int' as %lld"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6337 "configure" #line 6369 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -6360,7 +6392,7 @@ main() { ...@@ -6360,7 +6392,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:6364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
...@@ -6371,7 +6403,7 @@ else ...@@ -6371,7 +6403,7 @@ else
rm -fr conftest* rm -fr conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
echo "configure:6375: checking whether snprintf handles 'long long int' as %qd" >&5 echo "configure:6407: checking whether snprintf handles 'long long int' as %qd" >&5
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
echo "$ac_t""assuming not on target machine" 1>&6 echo "$ac_t""assuming not on target machine" 1>&6
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
...@@ -6380,7 +6412,7 @@ echo "configure:6375: checking whether snprintf handles 'long long int' as %qd" ...@@ -6380,7 +6412,7 @@ echo "configure:6375: checking whether snprintf handles 'long long int' as %qd"
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6384 "configure" #line 6416 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -6407,7 +6439,7 @@ main() { ...@@ -6407,7 +6439,7 @@ main() {
exit(! does_int64_snprintf_work()); exit(! does_int64_snprintf_work());
} }
EOF EOF
if { (eval echo configure:6411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
INT64_FORMAT='"%qd"' INT64_FORMAT='"%qd"'
...@@ -6449,7 +6481,7 @@ EOF ...@@ -6449,7 +6481,7 @@ EOF
echo $ac_n "checking alignment of short""... $ac_c" 1>&6 echo $ac_n "checking alignment of short""... $ac_c" 1>&6
echo "configure:6453: checking alignment of short" >&5 echo "configure:6485: checking alignment of short" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_short'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_alignof_short'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6457,7 +6489,7 @@ else ...@@ -6457,7 +6489,7 @@ else
ac_cv_alignof_short='sizeof(short)' ac_cv_alignof_short='sizeof(short)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6461 "configure" #line 6493 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; short field; } mystruct; struct { char filler; short field; } mystruct;
...@@ -6469,7 +6501,7 @@ main() ...@@ -6469,7 +6501,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:6473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_alignof_short=`cat conftestval` ac_cv_alignof_short=`cat conftestval`
else else
...@@ -6489,7 +6521,7 @@ EOF ...@@ -6489,7 +6521,7 @@ EOF
echo $ac_n "checking alignment of int""... $ac_c" 1>&6 echo $ac_n "checking alignment of int""... $ac_c" 1>&6
echo "configure:6493: checking alignment of int" >&5 echo "configure:6525: checking alignment of int" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_alignof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6497,7 +6529,7 @@ else ...@@ -6497,7 +6529,7 @@ else
ac_cv_alignof_int='sizeof(int)' ac_cv_alignof_int='sizeof(int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6501 "configure" #line 6533 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; int field; } mystruct; struct { char filler; int field; } mystruct;
...@@ -6509,7 +6541,7 @@ main() ...@@ -6509,7 +6541,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_alignof_int=`cat conftestval` ac_cv_alignof_int=`cat conftestval`
else else
...@@ -6529,7 +6561,7 @@ EOF ...@@ -6529,7 +6561,7 @@ EOF
echo $ac_n "checking alignment of long""... $ac_c" 1>&6 echo $ac_n "checking alignment of long""... $ac_c" 1>&6
echo "configure:6533: checking alignment of long" >&5 echo "configure:6565: checking alignment of long" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_long'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_alignof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6537,7 +6569,7 @@ else ...@@ -6537,7 +6569,7 @@ else
ac_cv_alignof_long='sizeof(long)' ac_cv_alignof_long='sizeof(long)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6541 "configure" #line 6573 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long field; } mystruct; struct { char filler; long field; } mystruct;
...@@ -6549,7 +6581,7 @@ main() ...@@ -6549,7 +6581,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:6553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_alignof_long=`cat conftestval` ac_cv_alignof_long=`cat conftestval`
else else
...@@ -6570,7 +6602,7 @@ EOF ...@@ -6570,7 +6602,7 @@ EOF
if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then if [ $HAVE_LONG_LONG_INT_64 -eq 1 ] ; then
echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
echo "configure:6574: checking alignment of long long int" >&5 echo "configure:6606: checking alignment of long long int" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_long_long_int'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_alignof_long_long_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6578,7 +6610,7 @@ else ...@@ -6578,7 +6610,7 @@ else
ac_cv_alignof_long_long_int='sizeof(long long int)' ac_cv_alignof_long_long_int='sizeof(long long int)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6582 "configure" #line 6614 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; long long int field; } mystruct; struct { char filler; long long int field; } mystruct;
...@@ -6590,7 +6622,7 @@ main() ...@@ -6590,7 +6622,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:6594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_alignof_long_long_int=`cat conftestval` ac_cv_alignof_long_long_int=`cat conftestval`
else else
...@@ -6611,7 +6643,7 @@ EOF ...@@ -6611,7 +6643,7 @@ EOF
fi fi
echo $ac_n "checking alignment of double""... $ac_c" 1>&6 echo $ac_n "checking alignment of double""... $ac_c" 1>&6
echo "configure:6615: checking alignment of double" >&5 echo "configure:6647: checking alignment of double" >&5
if eval "test \"`echo '$''{'ac_cv_alignof_double'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_alignof_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6619,7 +6651,7 @@ else ...@@ -6619,7 +6651,7 @@ else
ac_cv_alignof_double='sizeof(double)' ac_cv_alignof_double='sizeof(double)'
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6623 "configure" #line 6655 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
struct { char filler; double field; } mystruct; struct { char filler; double field; } mystruct;
...@@ -6631,7 +6663,7 @@ main() ...@@ -6631,7 +6663,7 @@ main()
exit(0); exit(0);
} }
EOF EOF
if { (eval echo configure:6635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:6667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_alignof_double=`cat conftestval` ac_cv_alignof_double=`cat conftestval`
else else
...@@ -6673,9 +6705,9 @@ EOF ...@@ -6673,9 +6705,9 @@ EOF
echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
echo "configure:6677: checking for POSIX signal interface" >&5 echo "configure:6709: checking for POSIX signal interface" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6679 "configure" #line 6711 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <signal.h> #include <signal.h>
int main() { int main() {
...@@ -6685,7 +6717,7 @@ act.sa_flags = SA_RESTART; ...@@ -6685,7 +6717,7 @@ act.sa_flags = SA_RESTART;
sigaction(0, &act, &oact); sigaction(0, &act, &oact);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define USE_POSIX_SIGNALS 1 #define USE_POSIX_SIGNALS 1
...@@ -6709,7 +6741,7 @@ then ...@@ -6709,7 +6741,7 @@ then
# Extract the first word of "tclsh", so it can be a program name with args. # Extract the first word of "tclsh", so it can be a program name with args.
set dummy tclsh; ac_word=$2 set dummy tclsh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6713: checking for $ac_word" >&5 echo "configure:6745: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6746,7 +6778,7 @@ fi ...@@ -6746,7 +6778,7 @@ fi
# Extract the first word of "tcl", so it can be a program name with args. # Extract the first word of "tcl", so it can be a program name with args.
set dummy tcl; ac_word=$2 set dummy tcl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6750: checking for $ac_word" >&5 echo "configure:6782: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6789,7 +6821,7 @@ fi ...@@ -6789,7 +6821,7 @@ fi
if test "$USE_TCL" = true if test "$USE_TCL" = true
then then
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
echo "configure:6793: checking for tclConfig.sh" >&5 echo "configure:6825: checking for tclConfig.sh" >&5
TCL_CONFIG_SH= TCL_CONFIG_SH=
library_dirs= library_dirs=
if test -z "$TCL_DIRS" if test -z "$TCL_DIRS"
...@@ -6818,7 +6850,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK ...@@ -6818,7 +6850,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK
if test "$USE_TK" = true if test "$USE_TK" = true
then then
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
echo "configure:6822: checking for tkConfig.sh" >&5 echo "configure:6854: checking for tkConfig.sh" >&5
TK_CONFIG_SH= TK_CONFIG_SH=
# library_dirs are set in the check for TCL # library_dirs are set in the check for TCL
for dir in $library_dirs for dir in $library_dirs
...@@ -6840,7 +6872,7 @@ echo "configure:6822: checking for tkConfig.sh" >&5 ...@@ -6840,7 +6872,7 @@ echo "configure:6822: checking for tkConfig.sh" >&5
# Extract the first word of "wish", so it can be a program name with args. # Extract the first word of "wish", so it can be a program name with args.
set dummy wish; ac_word=$2 set dummy wish; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6844: checking for $ac_word" >&5 echo "configure:6876: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -6890,7 +6922,7 @@ if test "$USE_X" = true; then ...@@ -6890,7 +6922,7 @@ if test "$USE_X" = true; then
# Uses ac_ vars as temps to allow command line to override cache and checks. # Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache. # --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6 echo $ac_n "checking for X""... $ac_c" 1>&6
echo "configure:6894: checking for X" >&5 echo "configure:6926: checking for X" >&5
# Check whether --with-x or --without-x was given. # Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then if test "${with_x+set}" = set; then
...@@ -6952,12 +6984,12 @@ if test "$ac_x_includes" = NO; then ...@@ -6952,12 +6984,12 @@ if test "$ac_x_includes" = NO; then
# First, try using that file with no special directory specified. # First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 6956 "configure" #line 6988 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$x_direct_test_include> #include <$x_direct_test_include>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:6993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -7026,14 +7058,14 @@ if test "$ac_x_libraries" = NO; then ...@@ -7026,14 +7058,14 @@ if test "$ac_x_libraries" = NO; then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS" LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7030 "configure" #line 7062 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
${x_direct_test_function}() ${x_direct_test_function}()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
# We can link X programs with no special library path. # We can link X programs with no special library path.
...@@ -7139,17 +7171,17 @@ else ...@@ -7139,17 +7171,17 @@ else
case "`(uname -sr) 2>/dev/null`" in case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*) "SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
echo "configure:7143: checking whether -R must be followed by a space" >&5 echo "configure:7175: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7146 "configure" #line 7178 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_R_nospace=yes ac_R_nospace=yes
else else
...@@ -7165,14 +7197,14 @@ rm -f conftest* ...@@ -7165,14 +7197,14 @@ rm -f conftest*
else else
LIBS="$ac_xsave_LIBS -R $x_libraries" LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7169 "configure" #line 7201 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_R_space=yes ac_R_space=yes
else else
...@@ -7204,7 +7236,7 @@ rm -f conftest* ...@@ -7204,7 +7236,7 @@ rm -f conftest*
# libraries were built with DECnet support. And karl@cs.umb.edu says # libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist). # the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
echo "configure:7208: checking for dnet_ntoa in -ldnet" >&5 echo "configure:7240: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7212,7 +7244,7 @@ else ...@@ -7212,7 +7244,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS" LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7216 "configure" #line 7248 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7223,7 +7255,7 @@ int main() { ...@@ -7223,7 +7255,7 @@ int main() {
dnet_ntoa() dnet_ntoa()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7245,7 +7277,7 @@ fi ...@@ -7245,7 +7277,7 @@ fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
echo "configure:7249: checking for dnet_ntoa in -ldnet_stub" >&5 echo "configure:7281: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7253,7 +7285,7 @@ else ...@@ -7253,7 +7285,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS" LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7257 "configure" #line 7289 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7264,7 +7296,7 @@ int main() { ...@@ -7264,7 +7296,7 @@ int main() {
dnet_ntoa() dnet_ntoa()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7293,12 +7325,12 @@ fi ...@@ -7293,12 +7325,12 @@ fi
# The nsl library prevents programs from opening the X display # The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net. # on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
echo "configure:7297: checking for gethostbyname" >&5 echo "configure:7329: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7302 "configure" #line 7334 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */ which can conflict with char gethostbyname(); below. */
...@@ -7321,7 +7353,7 @@ gethostbyname(); ...@@ -7321,7 +7353,7 @@ gethostbyname();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes" eval "ac_cv_func_gethostbyname=yes"
else else
...@@ -7342,7 +7374,7 @@ fi ...@@ -7342,7 +7374,7 @@ fi
if test $ac_cv_func_gethostbyname = no; then if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
echo "configure:7346: checking for gethostbyname in -lnsl" >&5 echo "configure:7378: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7350,7 +7382,7 @@ else ...@@ -7350,7 +7382,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS" LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7354 "configure" #line 7386 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7361,7 +7393,7 @@ int main() { ...@@ -7361,7 +7393,7 @@ int main() {
gethostbyname() gethostbyname()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7391,12 +7423,12 @@ fi ...@@ -7391,12 +7423,12 @@ fi
# -lsocket must be given before -lnsl if both are needed. # -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname. # We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6 echo $ac_n "checking for connect""... $ac_c" 1>&6
echo "configure:7395: checking for connect" >&5 echo "configure:7427: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7400 "configure" #line 7432 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */ which can conflict with char connect(); below. */
...@@ -7419,7 +7451,7 @@ connect(); ...@@ -7419,7 +7451,7 @@ connect();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_connect=yes" eval "ac_cv_func_connect=yes"
else else
...@@ -7440,7 +7472,7 @@ fi ...@@ -7440,7 +7472,7 @@ fi
if test $ac_cv_func_connect = no; then if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
echo "configure:7444: checking for connect in -lsocket" >&5 echo "configure:7476: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7448,7 +7480,7 @@ else ...@@ -7448,7 +7480,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7452 "configure" #line 7484 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7459,7 +7491,7 @@ int main() { ...@@ -7459,7 +7491,7 @@ int main() {
connect() connect()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7483,12 +7515,12 @@ fi ...@@ -7483,12 +7515,12 @@ fi
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6 echo $ac_n "checking for remove""... $ac_c" 1>&6
echo "configure:7487: checking for remove" >&5 echo "configure:7519: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7492 "configure" #line 7524 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */ which can conflict with char remove(); below. */
...@@ -7511,7 +7543,7 @@ remove(); ...@@ -7511,7 +7543,7 @@ remove();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_remove=yes" eval "ac_cv_func_remove=yes"
else else
...@@ -7532,7 +7564,7 @@ fi ...@@ -7532,7 +7564,7 @@ fi
if test $ac_cv_func_remove = no; then if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
echo "configure:7536: checking for remove in -lposix" >&5 echo "configure:7568: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7540,7 +7572,7 @@ else ...@@ -7540,7 +7572,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS" LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7544 "configure" #line 7576 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7551,7 +7583,7 @@ int main() { ...@@ -7551,7 +7583,7 @@ int main() {
remove() remove()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7575,12 +7607,12 @@ fi ...@@ -7575,12 +7607,12 @@ fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6 echo $ac_n "checking for shmat""... $ac_c" 1>&6
echo "configure:7579: checking for shmat" >&5 echo "configure:7611: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7584 "configure" #line 7616 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */ which can conflict with char shmat(); below. */
...@@ -7603,7 +7635,7 @@ shmat(); ...@@ -7603,7 +7635,7 @@ shmat();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_shmat=yes" eval "ac_cv_func_shmat=yes"
else else
...@@ -7624,7 +7656,7 @@ fi ...@@ -7624,7 +7656,7 @@ fi
if test $ac_cv_func_shmat = no; then if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
echo "configure:7628: checking for shmat in -lipc" >&5 echo "configure:7660: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7632,7 +7664,7 @@ else ...@@ -7632,7 +7664,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS" LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7636 "configure" #line 7668 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7643,7 +7675,7 @@ int main() { ...@@ -7643,7 +7675,7 @@ int main() {
shmat() shmat()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7676,7 +7708,7 @@ fi ...@@ -7676,7 +7708,7 @@ fi
# libraries we check for below, so use a different variable. # libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
echo "configure:7680: checking for IceConnectionNumber in -lICE" >&5 echo "configure:7712: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7684,7 +7716,7 @@ else ...@@ -7684,7 +7716,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7688 "configure" #line 7720 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7695,7 +7727,7 @@ int main() { ...@@ -7695,7 +7727,7 @@ int main() {
IceConnectionNumber() IceConnectionNumber()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7728,7 +7760,7 @@ fi ...@@ -7728,7 +7760,7 @@ fi
X11_LIBS="" X11_LIBS=""
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
echo "configure:7732: checking for XOpenDisplay in -lX11" >&5 echo "configure:7764: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -7736,7 +7768,7 @@ else ...@@ -7736,7 +7768,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lX11 ${X_PRE_LIBS} $LIBS" LIBS="-lX11 ${X_PRE_LIBS} $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7740 "configure" #line 7772 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -7747,7 +7779,7 @@ int main() { ...@@ -7747,7 +7779,7 @@ int main() {
XOpenDisplay() XOpenDisplay()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:7783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -7794,17 +7826,17 @@ then ...@@ -7794,17 +7826,17 @@ then
PWD_INCDIR=no PWD_INCDIR=no
ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pwd.h""... $ac_c" 1>&6 echo $ac_n "checking for pwd.h""... $ac_c" 1>&6
echo "configure:7798: checking for pwd.h" >&5 echo "configure:7830: checking for pwd.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7803 "configure" #line 7835 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <pwd.h> #include <pwd.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:7840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -8066,6 +8098,7 @@ s%@STRTOL@%$STRTOL%g ...@@ -8066,6 +8098,7 @@ s%@STRTOL@%$STRTOL%g
s%@STRTOUL@%$STRTOUL%g s%@STRTOUL@%$STRTOUL%g
s%@STRCASECMP@%$STRCASECMP%g s%@STRCASECMP@%$STRCASECMP%g
s%@HPUXMATHLIB@%$HPUXMATHLIB%g s%@HPUXMATHLIB@%$HPUXMATHLIB%g
s%@HAVE_RL_COMPLETION_APPEND_CHARACTER@%$HAVE_RL_COMPLETION_APPEND_CHARACTER%g
s%@HAVE_POSIX_SIGNALS@%$HAVE_POSIX_SIGNALS%g s%@HAVE_POSIX_SIGNALS@%$HAVE_POSIX_SIGNALS%g
s%@TCLSH@%$TCLSH%g s%@TCLSH@%$TCLSH%g
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
......
src/configure.in
View file @ 7cc0d6ae
...@@ -840,11 +840,16 @@ AC_CHECK_FUNC(rint, ...@@ -840,11 +840,16 @@ AC_CHECK_FUNC(rint,
AC_DEFINE(HAVE_RINT), AC_DEFINE(HAVE_RINT),
AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT), , $HPUXMATHLIB)) AC_CHECK_LIB(m, rint, AC_DEFINE(HAVE_RINT), , $HPUXMATHLIB))
dnl Some old versions of libreadline don't have rl_completion_append_character
AC_EGREP_HEADER(rl_completion_append_character, readline.h,
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER),
[AC_EGREP_HEADER(rl_completion_append_character, readline/readline.h,
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER))])
AC_SUBST(HAVE_RL_COMPLETION_APPEND_CHARACTER)
dnl Check for GNU style long options support (getopt_long) dnl Check for GNU style long options support (getopt_long)
AC_CHECK_FUNCS(getopt_long) AC_CHECK_FUNCS(getopt_long)
AC_MSG_CHECKING(for finite() macro or function) AC_MSG_CHECKING(for finite() macro or function)
AC_TRY_LINK([#include <math.h>], AC_TRY_LINK([#include <math.h>],
[int dummy=finite(1.0);], [int dummy=finite(1.0);],
......
src/include/config.h.in
View file @ 7cc0d6ae
...@@ -454,6 +454,9 @@ extern void srandom(unsigned int seed); ...@@ -454,6 +454,9 @@ extern void srandom(unsigned int seed);
/* Set to 1 if you have libhistory.a */ /* Set to 1 if you have libhistory.a */
#undef HAVE_LIBHISTORY #undef HAVE_LIBHISTORY
/* Set to 1 if your libreadline defines rl_completion_append_character */
#undef HAVE_RL_COMPLETION_APPEND_CHARACTER
/* Set to 1 if you have getopt_long() (GNU long options) */ /* Set to 1 if you have getopt_long() (GNU long options) */
#undef HAVE_GETOPT_LONG #undef HAVE_GETOPT_LONG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment