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

Commit 51fd8dd

Browse files
committed
autoconf
1 parent eb3e640 commit 51fd8dd

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

src/configure

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6112,12 +6112,11 @@ fi
61126112
else
61136113
TCL_LIB=-l$TCL_LIB
61146114
fi
6115-
61166115
fi
61176116

61186117
if test "$USE_TCL"; then
61196118
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
61216120
library_dirs="$LIBRARY_DIRS /usr/lib"
61226121
TCL_CONFIG_SH=
61236122
for dir in $library_dirs; do
@@ -6157,17 +6156,17 @@ then
61576156
TK_INCDIR=no
61586157
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
61596158
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
61616160
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
61626161
echo $ac_n "(cached) $ac_c" 1>&6
61636162
else
61646163
cat > conftest.$ac_ext <<EOF
6165-
#line 6166 "configure"
6164+
#line 6165 "configure"
61666165
#include "confdefs.h"
61676166
#include <tk.h>
61686167
EOF
61696168
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; }
61716170
ac_err=`grep -v '^ *+' conftest.out`
61726171
if test -z "$ac_err"; then
61736172
rm -rf conftest*
@@ -6216,22 +6215,22 @@ then
62166215
for tk_lib in $tk_libs; do
62176216
if test -z "$TK_LIB"; then
62186217
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
62206219
ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'`
62216220
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
62226221
echo $ac_n "(cached) $ac_c" 1>&6
62236222
else
62246223
ac_save_LIBS="$LIBS"
62256224
LIBS="-l$tk_lib $LIBS"
62266225
cat > conftest.$ac_ext <<EOF
6227-
#line 6228 "configure"
6226+
#line 6227 "configure"
62286227
#include "confdefs.h"
62296228
62306229
int main() {
62316230
main()
62326231
; return 0; }
62336232
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
62356234
rm -rf conftest*
62366235
eval "ac_cv_lib_$ac_lib_var=yes"
62376236
else
@@ -6260,8 +6259,6 @@ fi
62606259
TK_LIB=-l$TK_LIB
62616260
fi
62626261

6263-
6264-
62656262
LIBS="$ice_save_LIBS"
62666263
CFLAGS="$ice_save_CFLAGS"
62676264
CPPFLAGS="$ice_save_CPPFLAGS"
@@ -6270,7 +6267,7 @@ fi
62706267

62716268
if test "$USE_TCL"; then
62726269
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
62746271
library_dirs="$LIBRARY_DIRS /usr/lib"
62756272
TK_CONFIG_SH=
62766273
for dir in $library_dirs; do
@@ -6297,7 +6294,6 @@ echo "configure:6121: checking for tkConfig.sh" >&5
62976294
fi
62986295
fi
62996296

6300-
63016297
#if test "X$USE_ODBC" = "Xtrue"
63026298
#then
63036299
# AC_CONFIG_SUBDIRS(interfaces/odbc)
@@ -6307,17 +6303,17 @@ then
63076303
PWD_INCDIR=no
63086304
ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
63096305
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
63116307
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63126308
echo $ac_n "(cached) $ac_c" 1>&6
63136309
else
63146310
cat > conftest.$ac_ext <<EOF
6315-
#line 6286 "configure"
6311+
#line 6312 "configure"
63166312
#include "confdefs.h"
63176313
#include <pwd.h>
63186314
EOF
63196315
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; }
63216317
ac_err=`grep -v '^ *+' conftest.out`
63226318
if test -z "$ac_err"; then
63236319
rm -rf conftest*
@@ -6561,9 +6557,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
65616557
s%@X_LIBS@%$X_LIBS%g
65626558
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
65636559
s%@X11_LIBS@%$X11_LIBS%g
6564-
s%@TCL_LIB@%$TCL_LIB%g
65656560
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
6566-
s%@TK_LIB@%$TK_LIB%g
65676561
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
65686562
65696563
CEOF

0 commit comments

Comments
 (0)