Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit fbcda7b

Browse files
committed
autoconf
1 parent e33a23f commit fbcda7b

File tree

1 file changed

+20
-14
lines changed

1 file changed

+20
-14
lines changed

src/configure

+20-14
Original file line numberDiff line numberDiff line change
@@ -6061,6 +6061,7 @@ fi
60616061
echo "configure: warning: tcl support disabled; tcl.h missing" 1>&2
60626062
USE_TCL=
60636063
fi
6064+
60646065
fi
60656066

60666067
if test "$USE_TCL" = "true"; then
@@ -6069,22 +6070,22 @@ if test "$USE_TCL" = "true"; then
60696070
for tcl_lib in $tcl_libs; do
60706071
if test -z "$TCL_LIB"; then
60716072
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
60736074
ac_lib_var=`echo $tcl_lib'_'main | sed 'y%./+-%__p_%'`
60746075
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60756076
echo $ac_n "(cached) $ac_c" 1>&6
60766077
else
60776078
ac_save_LIBS="$LIBS"
60786079
LIBS="-l$tcl_lib $LIBS"
60796080
cat > conftest.$ac_ext <<EOF
6080-
#line 6081 "configure"
6081+
#line 6082 "configure"
60816082
#include "confdefs.h"
60826083
60836084
int main() {
60846085
main()
60856086
; return 0; }
60866087
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
60886089
rm -rf conftest*
60896090
eval "ac_cv_lib_$ac_lib_var=yes"
60906091
else
@@ -6111,12 +6112,13 @@ fi
61116112
USE_TCL=
61126113
else
61136114
TCL_LIB=-l$TCL_LIB
6115+
61146116
fi
61156117
fi
61166118

61176119
if test "$USE_TCL"; then
61186120
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
61206122
library_dirs="$LIBRARY_DIRS /usr/lib"
61216123
TCL_CONFIG_SH=
61226124
for dir in $library_dirs; do
@@ -6156,17 +6158,17 @@ then
61566158
TK_INCDIR=no
61576159
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
61586160
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
61606162
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
61616163
echo $ac_n "(cached) $ac_c" 1>&6
61626164
else
61636165
cat > conftest.$ac_ext <<EOF
6164-
#line 6165 "configure"
6166+
#line 6167 "configure"
61656167
#include "confdefs.h"
61666168
#include <tk.h>
61676169
EOF
61686170
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; }
61706172
ac_err=`grep -v '^ *+' conftest.out`
61716173
if test -z "$ac_err"; then
61726174
rm -rf conftest*
@@ -6215,22 +6217,22 @@ then
62156217
for tk_lib in $tk_libs; do
62166218
if test -z "$TK_LIB"; then
62176219
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
62196221
ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'`
62206222
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62216223
echo $ac_n "(cached) $ac_c" 1>&6
62226224
else
62236225
ac_save_LIBS="$LIBS"
62246226
LIBS="-l$tk_lib $LIBS"
62256227
cat > conftest.$ac_ext <<EOF
6226-
#line 6227 "configure"
6228+
#line 6229 "configure"
62276229
#include "confdefs.h"
62286230
62296231
int main() {
62306232
main()
62316233
; return 0; }
62326234
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
62346236
rm -rf conftest*
62356237
eval "ac_cv_lib_$ac_lib_var=yes"
62366238
else
@@ -6257,6 +6259,7 @@ fi
62576259
USE_TCL=
62586260
else
62596261
TK_LIB=-l$TK_LIB
6262+
62606263
fi
62616264

62626265
LIBS="$ice_save_LIBS"
@@ -6267,7 +6270,7 @@ fi
62676270

62686271
if test "$USE_TCL"; then
62696272
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
62716274
library_dirs="$LIBRARY_DIRS /usr/lib"
62726275
TK_CONFIG_SH=
62736276
for dir in $library_dirs; do
@@ -6303,17 +6306,17 @@ then
63036306
PWD_INCDIR=no
63046307
ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
63056308
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
63076310
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63086311
echo $ac_n "(cached) $ac_c" 1>&6
63096312
else
63106313
cat > conftest.$ac_ext <<EOF
6311-
#line 6312 "configure"
6314+
#line 6315 "configure"
63126315
#include "confdefs.h"
63136316
#include <pwd.h>
63146317
EOF
63156318
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; }
63176320
ac_err=`grep -v '^ *+' conftest.out`
63186321
if test -z "$ac_err"; then
63196322
rm -rf conftest*
@@ -6557,7 +6560,10 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
65576560
s%@X_LIBS@%$X_LIBS%g
65586561
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
65596562
s%@X11_LIBS@%$X11_LIBS%g
6563+
s%@TCL_INCDIR@%$TCL_INCDIR%g
6564+
s%@TCL_LIB@%$TCL_LIB%g
65606565
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
6566+
s%@TK_LIB@%$TK_LIB%g
65616567
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
65626568
65636569
CEOF

0 commit comments

Comments
 (0)