@@ -6112,12 +6112,11 @@ fi
6112
6112
else
6113
6113
TCL_LIB=-l$TCL_LIB
6114
6114
fi
6115
-
6116
6115
fi
6117
6116
6118
6117
if test " $USE_TCL " ; then
6119
6118
echo $ac_n " checking for tclConfig.sh" " ... $ac_c " 1>&6
6120
- echo " configure:6121 : checking for tclConfig.sh" >&5
6119
+ echo " configure:6120 : checking for tclConfig.sh" >&5
6121
6120
library_dirs=" $LIBRARY_DIRS /usr/lib"
6122
6121
TCL_CONFIG_SH=
6123
6122
for dir in $library_dirs ; do
@@ -6157,17 +6156,17 @@ then
6157
6156
TK_INCDIR=no
6158
6157
ac_safe=` echo " tk.h" | sed ' y%./+-%__p_%' `
6159
6158
echo $ac_n " checking for tk.h" " ... $ac_c " 1>&6
6160
- echo " configure:6161 : checking for tk.h" >&5
6159
+ echo " configure:6160 : checking for tk.h" >&5
6161
6160
if eval " test \" ` echo ' $' ' {' ac_cv_header_$ac_safe ' +set}' ` \" = set" ; then
6162
6161
echo $ac_n " (cached) $ac_c " 1>&6
6163
6162
else
6164
6163
cat > conftest.$ac_ext << EOF
6165
- #line 6166 "configure"
6164
+ #line 6165 "configure"
6166
6165
#include "confdefs.h"
6167
6166
#include <tk.h>
6168
6167
EOF
6169
6168
ac_try=" $ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6170
- { (eval echo configure:6171 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6169
+ { (eval echo configure:6170 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6171
6170
ac_err=` grep -v ' ^ *+' conftest.out`
6172
6171
if test -z " $ac_err " ; then
6173
6172
rm -rf conftest*
@@ -6216,22 +6215,22 @@ then
6216
6215
for tk_lib in $tk_libs ; do
6217
6216
if test -z " $TK_LIB " ; then
6218
6217
echo $ac_n " checking for main in -l$tk_lib " " ... $ac_c " 1>&6
6219
- echo " configure:6220 : checking for main in -l$tk_lib " >&5
6218
+ echo " configure:6219 : checking for main in -l$tk_lib " >&5
6220
6219
ac_lib_var=` echo $tk_lib ' _' main | sed ' y%./+-%__p_%' `
6221
6220
if eval " test \" ` echo ' $' ' {' ac_cv_lib_$ac_lib_var ' +set}' ` \" = set" ; then
6222
6221
echo $ac_n " (cached) $ac_c " 1>&6
6223
6222
else
6224
6223
ac_save_LIBS=" $LIBS "
6225
6224
LIBS=" -l$tk_lib $LIBS "
6226
6225
cat > conftest.$ac_ext << EOF
6227
- #line 6228 "configure"
6226
+ #line 6227 "configure"
6228
6227
#include "confdefs.h"
6229
6228
6230
6229
int main() {
6231
6230
main()
6232
6231
; return 0; }
6233
6232
EOF
6234
- if { (eval echo configure:6235 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6233
+ if { (eval echo configure:6234 : \" $ac_link \" ) 1>&5 ; (eval $ac_link ) 2>&5 ; } && test -s conftest; then
6235
6234
rm -rf conftest*
6236
6235
eval " ac_cv_lib_$ac_lib_var =yes"
6237
6236
else
6260
6259
TK_LIB=-l$TK_LIB
6261
6260
fi
6262
6261
6263
-
6264
-
6265
6262
LIBS=" $ice_save_LIBS "
6266
6263
CFLAGS=" $ice_save_CFLAGS "
6267
6264
CPPFLAGS=" $ice_save_CPPFLAGS "
6270
6267
6271
6268
if test " $USE_TCL " ; then
6272
6269
echo $ac_n " checking for tkConfig.sh" " ... $ac_c " 1>&6
6273
- echo " configure:6121 : checking for tkConfig.sh" >&5
6270
+ echo " configure:6271 : checking for tkConfig.sh" >&5
6274
6271
library_dirs=" $LIBRARY_DIRS /usr/lib"
6275
6272
TK_CONFIG_SH=
6276
6273
for dir in $library_dirs ; do
@@ -6297,7 +6294,6 @@ echo "configure:6121: checking for tkConfig.sh" >&5
6297
6294
fi
6298
6295
fi
6299
6296
6300
-
6301
6297
# if test "X$USE_ODBC" = "Xtrue"
6302
6298
# then
6303
6299
# AC_CONFIG_SUBDIRS(interfaces/odbc)
@@ -6307,17 +6303,17 @@ then
6307
6303
PWD_INCDIR=no
6308
6304
ac_safe=` echo " pwd.h" | sed ' y%./+-%__p_%' `
6309
6305
echo $ac_n " checking for pwd.h" " ... $ac_c " 1>&6
6310
- echo " configure:6281 : checking for pwd.h" >&5
6306
+ echo " configure:6307 : checking for pwd.h" >&5
6311
6307
if eval " test \" ` echo ' $' ' {' ac_cv_header_$ac_safe ' +set}' ` \" = set" ; then
6312
6308
echo $ac_n " (cached) $ac_c " 1>&6
6313
6309
else
6314
6310
cat > conftest.$ac_ext << EOF
6315
- #line 6286 "configure"
6311
+ #line 6312 "configure"
6316
6312
#include "confdefs.h"
6317
6313
#include <pwd.h>
6318
6314
EOF
6319
6315
ac_try=" $ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6320
- { (eval echo configure:6291 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6316
+ { (eval echo configure:6317 : \" $ac_try \" ) 1>&5 ; (eval $ac_try ) 2>&5 ; }
6321
6317
ac_err=` grep -v ' ^ *+' conftest.out`
6322
6318
if test -z " $ac_err " ; then
6323
6319
rm -rf conftest*
@@ -6561,9 +6557,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
6561
6557
s%@X_LIBS@%$X_LIBS %g
6562
6558
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS %g
6563
6559
s%@X11_LIBS@%$X11_LIBS %g
6564
- s%@TCL_LIB@%$TCL_LIB %g
6565
6560
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH %g
6566
- s%@TK_LIB@%$TK_LIB %g
6567
6561
s%@TK_CONFIG_SH@%$TK_CONFIG_SH %g
6568
6562
6569
6563
CEOF
0 commit comments