6061
6061
echo " configure: warning: tcl support disabled; tcl.h missing" 1>&2
6062
6062
USE_TCL=
6063
6063
fi
6064
+
6064
6065
fi
6065
6066
6066
6067
if test " $USE_TCL " = " true" ; then
@@ -6069,22 +6070,22 @@ if test "$USE_TCL" = "true"; then
6069
6070
for tcl_lib in $tcl_libs ; do
6070
6071
if test -z " $TCL_LIB " ; then
6071
6072
echo $ac_n " checking for main in -l$tcl_lib " " ... $ac_c " 1>&6
6072
- echo " configure:6073 : checking for main in -l$tcl_lib " >&5
6073
+ echo " configure:6074 : checking for main in -l$tcl_lib " >&5
6073
6074
ac_lib_var=` echo $tcl_lib ' _' main | sed ' y%./+-%__p_%' `
6074
6075
if eval " test \" ` echo ' $' ' {' ac_cv_lib_$ac_lib_var ' +set}' ` \" = set" ; then
6075
6076
echo $ac_n " (cached) $ac_c " 1>&6
6076
6077
else
6077
6078
ac_save_LIBS=" $LIBS "
6078
6079
LIBS=" -l$tcl_lib $LIBS "
6079
6080
cat > conftest.$ac_ext << EOF
6080
- #line 6081 "configure"
6081
+ #line 6082 "configure"
6081
6082
#include "confdefs.h"
6082
6083
6083
6084
int main() {
6084
6085
main()
6085
6086
; return 0; }
6086
6087
EOF
6087
- if { (eval echo configure:6088 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6088
+ if { (eval echo configure:6089 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6088
6089
rm -rf conftest*
6089
6090
eval " ac_cv_lib_$ac_lib_var =yes"
6090
6091
else
@@ -6111,12 +6112,13 @@ fi
6111
6112
USE_TCL=
6112
6113
else
6113
6114
TCL_LIB=-l$TCL_LIB
6115
+
6114
6116
fi
6115
6117
fi
6116
6118
6117
6119
if test " $USE_TCL " ; then
6118
6120
echo $ac_n " checking for tclConfig.sh" " ... $ac_c " 1>&6
6119
- echo " configure:6120 : checking for tclConfig.sh" >&5
6121
+ echo " configure:6122 : checking for tclConfig.sh" >&5
6120
6122
library_dirs=" $LIBRARY_DIRS /usr/lib"
6121
6123
TCL_CONFIG_SH=
6122
6124
for dir in $library_dirs ; do
@@ -6156,17 +6158,17 @@ then
6156
6158
TK_INCDIR=no
6157
6159
ac_safe=` echo " tk.h" | sed ' y%./+-%__p_%' `
6158
6160
echo $ac_n " checking for tk.h" " ... $ac_c " 1>&6
6159
- echo " configure:6160 : checking for tk.h" >&5
6161
+ echo " configure:6162 : checking for tk.h" >&5
6160
6162
if eval " test \" ` echo ' $' ' {' ac_cv_header_$ac_safe ' +set}' ` \" = set" ; then
6161
6163
echo $ac_n " (cached) $ac_c " 1>&6
6162
6164
else
6163
6165
cat > conftest.$ac_ext << EOF
6164
- #line 6165 "configure"
6166
+ #line 6167 "configure"
6165
6167
#include "confdefs.h"
6166
6168
#include <tk.h>
6167
6169
EOF
6168
6170
ac_try=" $ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6169
- { (eval echo configure:6170 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6171
+ { (eval echo configure:6172 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6170
6172
ac_err=` grep -v ' ^ *+' conftest.out`
6171
6173
if test -z " $ac_err " ; then
6172
6174
rm -rf conftest*
@@ -6215,22 +6217,22 @@ then
6215
6217
for tk_lib in $tk_libs ; do
6216
6218
if test -z " $TK_LIB " ; then
6217
6219
echo $ac_n " checking for main in -l$tk_lib " " ... $ac_c " 1>&6
6218
- echo " configure:6219 : checking for main in -l$tk_lib " >&5
6220
+ echo " configure:6221 : checking for main in -l$tk_lib " >&5
6219
6221
ac_lib_var=` echo $tk_lib ' _' main | sed ' y%./+-%__p_%' `
6220
6222
if eval " test \" ` echo ' $' ' {' ac_cv_lib_$ac_lib_var ' +set}' ` \" = set" ; then
6221
6223
echo $ac_n " (cached) $ac_c " 1>&6
6222
6224
else
6223
6225
ac_save_LIBS=" $LIBS "
6224
6226
LIBS=" -l$tk_lib $LIBS "
6225
6227
cat > conftest.$ac_ext << EOF
6226
- #line 6227 "configure"
6228
+ #line 6229 "configure"
6227
6229
#include "confdefs.h"
6228
6230
6229
6231
int main() {
6230
6232
main()
6231
6233
; return 0; }
6232
6234
EOF
6233
- if { (eval echo configure:6234 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6235
+ if { (eval echo configure:6236 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6234
6236
rm -rf conftest*
6235
6237
eval " ac_cv_lib_$ac_lib_var =yes"
6236
6238
else
6257
6259
USE_TCL=
6258
6260
else
6259
6261
TK_LIB=-l$TK_LIB
6262
+
6260
6263
fi
6261
6264
6262
6265
LIBS=" $ice_save_LIBS "
6267
6270
6268
6271
if test " $USE_TCL " ; then
6269
6272
echo $ac_n " checking for tkConfig.sh" " ... $ac_c " 1>&6
6270
- echo " configure:6271 : checking for tkConfig.sh" >&5
6273
+ echo " configure:6274 : checking for tkConfig.sh" >&5
6271
6274
library_dirs=" $LIBRARY_DIRS /usr/lib"
6272
6275
TK_CONFIG_SH=
6273
6276
for dir in $library_dirs ; do
@@ -6303,17 +6306,17 @@ then
6303
6306
PWD_INCDIR=no
6304
6307
ac_safe=` echo " pwd.h" | sed ' y%./+-%__p_%' `
6305
6308
echo $ac_n " checking for pwd.h" " ... $ac_c " 1>&6
6306
- echo " configure:6307 : checking for pwd.h" >&5
6309
+ echo " configure:6310 : checking for pwd.h" >&5
6307
6310
if eval " test \" ` echo ' $' ' {' ac_cv_header_$ac_safe ' +set}' ` \" = set" ; then
6308
6311
echo $ac_n " (cached) $ac_c " 1>&6
6309
6312
else
6310
6313
cat > conftest.$ac_ext << EOF
6311
- #line 6312 "configure"
6314
+ #line 6315 "configure"
6312
6315
#include "confdefs.h"
6313
6316
#include <pwd.h>
6314
6317
EOF
6315
6318
ac_try=" $ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6316
- { (eval echo configure:6317 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6319
+ { (eval echo configure:6320 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6317
6320
ac_err=` grep -v ' ^ *+' conftest.out`
6318
6321
if test -z " $ac_err " ; then
6319
6322
rm -rf conftest*
@@ -6557,7 +6560,10 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
6557
6560
s%@X_LIBS@%$X_LIBS %g
6558
6561
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS %g
6559
6562
s%@X11_LIBS@%$X11_LIBS %g
6563
+ s%@TCL_INCDIR@%$TCL_INCDIR %g
6564
+ s%@TCL_LIB@%$TCL_LIB %g
6560
6565
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH %g
6566
+ s%@TK_LIB@%$TK_LIB %g
6561
6567
s%@TK_CONFIG_SH@%$TK_CONFIG_SH %g
6562
6568
6563
6569
CEOF
0 commit comments