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

Commit 8c586b2

Browse files
bmomjianbmomjian
committed
auytoconf
1 parent ecf145f commit 8c586b2

File tree

1 file changed

+5
-227
lines changed

1 file changed

+5
-227
lines changed

‎src/configure

+5-227
Original file line numberDiff line numberDiff line change
@@ -6020,105 +6020,9 @@ fi
60206020
LDFLAGS="$ice_save_LDFLAGS"
60216021
fi
60226022

6023-
6024-
if test "$USE_TCL" = "true"
6025-
then
6026-
TCL_INCDIR=no
6027-
ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
6028-
echo $ac_n "checking for tcl.h""... $ac_c" 1>&6
6029-
echo "configure:6030: checking for tcl.h" >&5
6030-
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
6031-
echo $ac_n "(cached) $ac_c" 1>&6
6032-
else
6033-
cat > conftest.$ac_ext <<EOF
6034-
#line 6035 "configure"
6035-
#include "confdefs.h"
6036-
#include <tcl.h>
6037-
EOF
6038-
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6039-
{ (eval echo configure:6040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6040-
ac_err=`grep -v '^ *+' conftest.out`
6041-
if test -z "$ac_err"; then
6042-
rm -rf conftest*
6043-
eval "ac_cv_header_$ac_safe=yes"
6044-
else
6045-
echo "$ac_err" >&5
6046-
echo "configure: failed program was:" >&5
6047-
cat conftest.$ac_ext >&5
6048-
rm -rf conftest*
6049-
eval "ac_cv_header_$ac_safe=no"
6050-
fi
6051-
rm -f conftest*
6052-
fi
6053-
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
6054-
echo "$ac_t""yes" 1>&6
6055-
TCL_INCDIR=yes
6056-
else
6057-
echo "$ac_t""no" 1>&6
6058-
fi
6059-
6060-
if test "$TCL_INCDIR" = "no"; then
6061-
echo "configure: warning: tcl support disabled; tcl.h missing" 1>&2
6062-
USE_TCL=
6063-
fi
6064-
6065-
fi
6066-
6067-
if test "$USE_TCL" = "true"; then
6068-
TCL_LIB=
6069-
tcl_libs="tcl8.0 tcl80 tcl7.6 tcl76 tcl"
6070-
for tcl_lib in $tcl_libs; do
6071-
if test -z "$TCL_LIB"; then
6072-
echo $ac_n "checking for main in -l$tcl_lib""... $ac_c" 1>&6
6073-
echo "configure:6074: checking for main in -l$tcl_lib" >&5
6074-
ac_lib_var=`echo $tcl_lib'_'main | sed 'y%./+-%__p_%'`
6075-
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6076-
echo $ac_n "(cached) $ac_c" 1>&6
6077-
else
6078-
ac_save_LIBS="$LIBS"
6079-
LIBS="-l$tcl_lib $LIBS"
6080-
cat > conftest.$ac_ext <<EOF
6081-
#line 6082 "configure"
6082-
#include "confdefs.h"
6083-
6084-
int main() {
6085-
main()
6086-
; return 0; }
6087-
EOF
6088-
if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
6089-
rm -rf conftest*
6090-
eval "ac_cv_lib_$ac_lib_var=yes"
6091-
else
6092-
echo "configure: failed program was:" >&5
6093-
cat conftest.$ac_ext >&5
6094-
rm -rf conftest*
6095-
eval "ac_cv_lib_$ac_lib_var=no"
6096-
fi
6097-
rm -f conftest*
6098-
LIBS="$ac_save_LIBS"
6099-
6100-
fi
6101-
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6102-
echo "$ac_t""yes" 1>&6
6103-
TCL_LIB=$tcl_lib
6104-
else
6105-
echo "$ac_t""no" 1>&6
6106-
fi
6107-
6108-
fi
6109-
done
6110-
if test -z "$TCL_LIB"; then
6111-
echo "configure: warning: tcl support disabled; Tcl library missing" 1>&2
6112-
USE_TCL=
6113-
else
6114-
TCL_LIB=-l$TCL_LIB
6115-
6116-
fi
6117-
fi
6118-
61196023
if test "$USE_TCL"; then
61206024
echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
6121-
echo "configure:6122: checking for tclConfig.sh" >&5
6025+
echo "configure:6026: checking for tclConfig.sh" >&5
61226026
library_dirs="$LIBRARY_DIRS /usr/lib"
61236027
TCL_CONFIG_SH=
61246028
for dir in $library_dirs; do
@@ -6145,132 +6049,9 @@ echo "configure:6122: checking for tclConfig.sh" >&5
61456049
fi
61466050
fi
61476051

6148-
6149-
if test "$USE_TCL" = "true"
6150-
then
6151-
ice_save_LIBS="$LIBS"
6152-
ice_save_CFLAGS="$CFLAGS"
6153-
ice_save_CPPFLAGS="$CPPFLAGS"
6154-
ice_save_LDFLAGS="$LDFLAGS"
6155-
6156-
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
6157-
6158-
TK_INCDIR=no
6159-
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
6160-
echo $ac_n "checking for tk.h""... $ac_c" 1>&6
6161-
echo "configure:6162: checking for tk.h" >&5
6162-
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
6163-
echo $ac_n "(cached) $ac_c" 1>&6
6164-
else
6165-
cat > conftest.$ac_ext <<EOF
6166-
#line 6167 "configure"
6167-
#include "confdefs.h"
6168-
#include <tk.h>
6169-
EOF
6170-
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6171-
{ (eval echo configure:6172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6172-
ac_err=`grep -v '^ *+' conftest.out`
6173-
if test -z "$ac_err"; then
6174-
rm -rf conftest*
6175-
eval "ac_cv_header_$ac_safe=yes"
6176-
else
6177-
echo "$ac_err" >&5
6178-
echo "configure: failed program was:" >&5
6179-
cat conftest.$ac_ext >&5
6180-
rm -rf conftest*
6181-
eval "ac_cv_header_$ac_safe=no"
6182-
fi
6183-
rm -f conftest*
6184-
fi
6185-
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
6186-
echo "$ac_t""yes" 1>&6
6187-
TK_INCDIR=yes
6188-
else
6189-
echo "$ac_t""no" 1>&6
6190-
fi
6191-
6192-
if test "$TK_INCDIR" = "no"; then
6193-
echo "configure: warning: tcl support disabled; tk.h missing" 1>&2
6194-
USE_TCL=
6195-
fi
6196-
6197-
LIBS="$ice_save_LIBS"
6198-
CFLAGS="$ice_save_CFLAGS"
6199-
CPPFLAGS="$ice_save_CPPFLAGS"
6200-
LDFLAGS="$ice_save_LDFLAGS"
6201-
fi
6202-
6203-
if test "$USE_TCL" = "true"
6204-
then
6205-
ice_save_LIBS="$LIBS"
6206-
ice_save_CFLAGS="$CFLAGS"
6207-
ice_save_CPPFLAGS="$CPPFLAGS"
6208-
ice_save_LDFLAGS="$LDFLAGS"
6209-
6210-
LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS"
6211-
CFLAGS="$CFLAGS $X_CFLAGS"
6212-
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
6213-
LDFLAGS="$LDFLAGS $X_LIBS"
6214-
6215-
TK_LIB=
6216-
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
6217-
for tk_lib in $tk_libs; do
6218-
if test -z "$TK_LIB"; then
6219-
echo $ac_n "checking for main in -l$tk_lib""... $ac_c" 1>&6
6220-
echo "configure:6221: checking for main in -l$tk_lib" >&5
6221-
ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'`
6222-
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6223-
echo $ac_n "(cached) $ac_c" 1>&6
6224-
else
6225-
ac_save_LIBS="$LIBS"
6226-
LIBS="-l$tk_lib $LIBS"
6227-
cat > conftest.$ac_ext <<EOF
6228-
#line 6229 "configure"
6229-
#include "confdefs.h"
6230-
6231-
int main() {
6232-
main()
6233-
; return 0; }
6234-
EOF
6235-
if { (eval echo configure:6236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
6236-
rm -rf conftest*
6237-
eval "ac_cv_lib_$ac_lib_var=yes"
6238-
else
6239-
echo "configure: failed program was:" >&5
6240-
cat conftest.$ac_ext >&5
6241-
rm -rf conftest*
6242-
eval "ac_cv_lib_$ac_lib_var=no"
6243-
fi
6244-
rm -f conftest*
6245-
LIBS="$ac_save_LIBS"
6246-
6247-
fi
6248-
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6249-
echo "$ac_t""yes" 1>&6
6250-
TK_LIB=$tk_lib
6251-
else
6252-
echo "$ac_t""no" 1>&6
6253-
fi
6254-
6255-
fi
6256-
done
6257-
if test -z "$TK_LIB"; then
6258-
echo "configure: warning: tk support disabled; Tk library missing" 1>&2
6259-
USE_TCL=
6260-
else
6261-
TK_LIB=-l$TK_LIB
6262-
6263-
fi
6264-
6265-
LIBS="$ice_save_LIBS"
6266-
CFLAGS="$ice_save_CFLAGS"
6267-
CPPFLAGS="$ice_save_CPPFLAGS"
6268-
LDFLAGS="$ice_save_LDFLAGS"
6269-
fi
6270-
62716052
if test "$USE_TCL"; then
62726053
echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
6273-
echo "configure:6274: checking for tkConfig.sh" >&5
6054+
echo "configure:6055: checking for tkConfig.sh" >&5
62746055
library_dirs="$LIBRARY_DIRS /usr/lib"
62756056
TK_CONFIG_SH=
62766057
for dir in $library_dirs; do
@@ -6306,17 +6087,17 @@ then
63066087
PWD_INCDIR=no
63076088
ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
63086089
echo $ac_n "checking for pwd.h""... $ac_c" 1>&6
6309-
echo "configure:6310: checking for pwd.h" >&5
6090+
echo "configure:6091: checking for pwd.h" >&5
63106091
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63116092
echo $ac_n "(cached) $ac_c" 1>&6
63126093
else
63136094
cat > conftest.$ac_ext <<EOF
6314-
#line 6315 "configure"
6095+
#line 6096 "configure"
63156096
#include "confdefs.h"
63166097
#include <pwd.h>
63176098
EOF
63186099
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6319-
{ (eval echo configure:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6100+
{ (eval echo configure:6101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
63206101
ac_err=`grep -v '^ *+' conftest.out`
63216102
if test -z "$ac_err"; then
63226103
rm -rf conftest*
@@ -6560,10 +6341,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
65606341
s%@X_LIBS@%$X_LIBS%g
65616342
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
65626343
s%@X11_LIBS@%$X11_LIBS%g
6563-
s%@TCL_INCDIR@%$TCL_INCDIR%g
6564-
s%@TCL_LIB@%$TCL_LIB%g
65656344
s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
6566-
s%@TK_LIB@%$TK_LIB%g
65676345
s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
65686346
65696347
CEOF

0 commit comments

Comments
 (0)