auytoconf

diff --git a/src/configure b/src/configure
index e7c5607..a134735 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -6020,105 +6020,9 @@ fi
        LDFLAGS="$ice_save_LDFLAGS"
 fi
 
-
-if test "$USE_TCL" = "true"
-then
-       TCL_INCDIR=no
-       ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tcl.h""... $ac_c" 1>&6
-echo "configure:6030: checking for tcl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6035 "configure"
-#include "confdefs.h"
-#include <tcl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  TCL_INCDIR=yes
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-       if test "$TCL_INCDIR" = "no"; then
-               echo "configure: warning: tcl support disabled; tcl.h missing" 1>&2
-               USE_TCL=
-       fi
-       
-fi
-
-if test "$USE_TCL" = "true"; then
-       TCL_LIB=
-       tcl_libs="tcl8.0 tcl80 tcl7.6 tcl76 tcl"
-       for tcl_lib in $tcl_libs; do
-               if test -z "$TCL_LIB"; then
-                       echo $ac_n "checking for main in -l$tcl_lib""... $ac_c" 1>&6
-echo "configure:6074: checking for main in -l$tcl_lib" >&5
-ac_lib_var=`echo $tcl_lib'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$tcl_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6082 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  TCL_LIB=$tcl_lib
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-               fi
-       done
-       if test -z "$TCL_LIB"; then
-               echo "configure: warning: tcl support disabled; Tcl library missing" 1>&2
-               USE_TCL=
-       else
-               TCL_LIB=-l$TCL_LIB
-               
-       fi
-fi
-
 if test "$USE_TCL"; then
        echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
-echo "configure:6122: checking for tclConfig.sh" >&5
+echo "configure:6026: checking for tclConfig.sh" >&5
        library_dirs="$LIBRARY_DIRS /usr/lib"
        TCL_CONFIG_SH=
        for dir in $library_dirs; do
@@ -6145,132 +6049,9 @@ echo "configure:6122: checking for tclConfig.sh" >&5
        fi
 fi
 
-
-if test "$USE_TCL" = "true"
-then
-       ice_save_LIBS="$LIBS"
-       ice_save_CFLAGS="$CFLAGS"
-       ice_save_CPPFLAGS="$CPPFLAGS"
-       ice_save_LDFLAGS="$LDFLAGS"
-
-       CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-       TK_INCDIR=no
-       ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tk.h""... $ac_c" 1>&6
-echo "configure:6162: checking for tk.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6167 "configure"
-#include "confdefs.h"
-#include <tk.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  TK_INCDIR=yes
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-       if test "$TK_INCDIR" = "no"; then
-               echo "configure: warning: tcl support disabled; tk.h missing" 1>&2
-               USE_TCL=
-       fi
-
-       LIBS="$ice_save_LIBS"
-       CFLAGS="$ice_save_CFLAGS"
-       CPPFLAGS="$ice_save_CPPFLAGS"
-       LDFLAGS="$ice_save_LDFLAGS"
-fi
-
-if test "$USE_TCL" = "true"
-then
-       ice_save_LIBS="$LIBS"
-       ice_save_CFLAGS="$CFLAGS"
-       ice_save_CPPFLAGS="$CPPFLAGS"
-       ice_save_LDFLAGS="$LDFLAGS"
-
-       LIBS="$TCL_LIB $X_PRE_LIBS $X11_LIBS $X_EXTRA_LIBS $LIBS"
-       CFLAGS="$CFLAGS $X_CFLAGS"
-       CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-       LDFLAGS="$LDFLAGS $X_LIBS"
-
-       TK_LIB=
-       tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
-       for tk_lib in $tk_libs; do
-               if test -z "$TK_LIB"; then
-                       echo $ac_n "checking for main in -l$tk_lib""... $ac_c" 1>&6
-echo "configure:6221: checking for main in -l$tk_lib" >&5
-ac_lib_var=`echo $tk_lib'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$tk_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6229 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:6236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  TK_LIB=$tk_lib
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-               fi
-       done
-       if test -z "$TK_LIB"; then
-               echo "configure: warning: tk support disabled; Tk library missing" 1>&2
-               USE_TCL=
-       else
-               TK_LIB=-l$TK_LIB
-               
-       fi
-
-       LIBS="$ice_save_LIBS"
-       CFLAGS="$ice_save_CFLAGS"
-       CPPFLAGS="$ice_save_CPPFLAGS"
-       LDFLAGS="$ice_save_LDFLAGS"
-fi
-
 if test "$USE_TCL"; then
        echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
-echo "configure:6274: checking for tkConfig.sh" >&5
+echo "configure:6055: checking for tkConfig.sh" >&5
        library_dirs="$LIBRARY_DIRS /usr/lib"
        TK_CONFIG_SH=
        for dir in $library_dirs; do
@@ -6306,17 +6087,17 @@ then
        PWD_INCDIR=no
        ac_safe=`echo "pwd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pwd.h""... $ac_c" 1>&6
-echo "configure:6310: checking for pwd.h" >&5
+echo "configure:6091: checking for pwd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6315 "configure"
+#line 6096 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6560,10 +6341,7 @@ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
 s%@X11_LIBS@%$X11_LIBS%g
-s%@TCL_INCDIR@%$TCL_INCDIR%g
-s%@TCL_LIB@%$TCL_LIB%g
 s%@TCL_CONFIG_SH@%$TCL_CONFIG_SH%g
-s%@TK_LIB@%$TK_LIB%g
 s%@TK_CONFIG_SH@%$TK_CONFIG_SH%g
 
 CEOF