--- tkdesk-2.0.orig/ChangeLog +++ tkdesk-2.0/ChangeLog @@ -1,6 +1,39 @@ TkDesk Change Log for Version 2.x: - + + 2004-04-20 J. Chris Coppick + + * tkdesk.main, tcldesk/Common.tcl, tcldesk/Desktop.tcl, + tcldesk/DiskUsage.tcl, tcldesk/Editor.tcl, tcldesk/FileInfo.tcl, + tcldesk/FileListbox.tcl, tcldesk/Frame.tcl, tcldesk/HistEntry.tcl, + tcldesk/List.tcl, tcldesk/Periodic.tcl, tcldesk/Toplevel.tcl, + tcldesk/Viewer.tcl, tcldesk/action.tcl, tcldesk/appbar-dialup.tcl, + tcldesk/appbar.tcl, tcldesk/config.tcl, tcldesk/copy.tcl, + tcldesk/cpanels.tcl, tcldesk/delete.tcl, tcldesk/dsk_Listbox.tcl, + tcldesk/file_ops.tcl, tcldesk/find.tcl, tcldesk/history.tcl, + tcldesk/itcl_reload.tcl, tcldesk/popup.tcl, tcldesk/update.tcl, + tcldesk/util.tcl, tcldesk/cb_tools/help.tcl, + tcldesk/cb_tools/itcl_reload.tcl, tcldesk/cb_tools/tools.tcl: + + + For Itcl 3.3 compatibility, removed obsolete Itcl syntax: + + Use itcl::class instead of deprecated itcl_class + Fixed deprecated "class :: method" syntax (removed spaces) + Use "itcl::delete object $obj" instead of deprecated + "$obj delete" + Use "itcl::delete class $class" instead of "rename $class {}" + Use direct method calls instead of deprecated "virtual" command + Use "eval configure $args" in place of deprecated magic + "config" arg + Use correct protection declaration syntax: + "public variable $var" instead of "public $var" + "protected variable $var" instead of "protected $var" + etc. + Use itcl::find instead of deprecated itcl_info + Use "$obj info variable ..." instead of "$obj info public ..." + + 2004-04-15 J. Chris Coppick Released version 2.0 (Lazarus): --- tkdesk-2.0.orig/Makefile.in +++ tkdesk-2.0/Makefile.in @@ -34,13 +34,19 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY) # Directory where tkdesksh will look for its library scripts: -SCRIPT_SEARCH_DIR = $(SCRIPT_INSTALL_DIR) +SCRIPT_SEARCH_DIR = $(TKDESK_LIBRARY) + +# Directory in which to install the tkdesksh binary: +TKDESKSH_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY) + +# Directory where tkdesk will look for the tkdesksh binary: +TKDESKSH_SEARCH_DIR = $(TKDESK_LIBRARY) # Directory in which to install the program tkdesksh: BIN_INSTALL_DIR = $(INSTALL_ROOT)@bindir@ # Directory where tkdesksh will look for the tkdesk script: -BIN_SEARCH_DIR = $(BIN_INSTALL_DIR) +BIN_SEARCH_DIR = @bindir@ # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)@mandir@ @@ -50,7 +56,8 @@ # To change the compiler switches, for example to change from -O # to -g, change the following line: -CC_OPTS = -O -DUSE_OLD_IMAGE -DUSE_NON_CONST +CC_EXTRA_OPTS = -O +CC_OPTS = $(CC_EXTRA_OPTS) -DUSE_OLD_IMAGE -DUSE_NON_CONST # To change the linker switches, for example to add -s, # change the following line: @@ -71,11 +78,8 @@ # modify any of this stuff by hand. #---------------------------------------------------------------- -# Location of Tcl header files: -TCL_INCLUDE_DIR = @TCL_INCLUDE_PATH@ - -# Location of Tk header files: -TK_INCLUDE_DIR = @TK_INCLUDE_PATH@ +# Location of Tcl/Tk header files: +TCL_INCLUDE_FLAG = @TCL_INCLUDE_SPEC@ # Location of X11 header files: X_INCLUDE_FLAG = @TK_XINCLUDES@ @@ -117,7 +121,7 @@ # either. #---------------------------------------------------------------- -CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I. -I${TCL_INCLUDE_DIR} -I${TK_INCLUDE_DIR} ${X_INCLUDE_FLAG} +CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I. ${TCL_INCLUDE_FLAG} ${X_INCLUDE_FLAG} LDFLAGS = ${LD_OPTS} PKGNAME = tkdesk @@ -162,7 +166,7 @@ @echo '#!/bin/sh' >tkdesk @echo '#-*- tcl -*- \' >>tkdesk @echo "PATH=$(BIN_SEARCH_DIR):"'$$PATH ;#\' >>tkdesk - @echo "exec tkdesksh \"\$$0\" \"\$$@\"" >>tkdesk + @echo "exec $(TKDESKSH_SEARCH_DIR)/tkdesksh \"\$$0\" \"\$$@\"" >>tkdesk @echo "" >>tkdesk @echo "set tkdesk(library) \"$(SCRIPT_SEARCH_DIR)\"" >>tkdesk @echo "set tkdesk(in_development) 0" >>tkdesk @@ -176,7 +180,12 @@ install: tkdesksh client rm_tkdesk_script tkdesk_script dirs @chmod +x install-sh @echo "=== Installing the executables..." - @for f in tkdesksh tkdesk tkdeskclient/tkdeskclient tools/pauseme tools/ed-tkdesk tools/cd-tkdesk tools/od-tkdesk tools/op-tkdesk tools/pop-tkdesk; do \ + @for f in tkdesksh; do \ + echo "installing $$f" ;\ + rm -f $(TKDESKSH_INSTALL_DIR)/`basename $$f` ;\ + $(INSTALL_PROGRAM) $$f $(TKDESKSH_INSTALL_DIR) ;\ + done + @for f in tkdesk tkdeskclient/tkdeskclient tools/pauseme tools/ed-tkdesk tools/cd-tkdesk tools/od-tkdesk tools/op-tkdesk tools/pop-tkdesk; do \ echo "installing $$f" ;\ rm -f $(BIN_INSTALL_DIR)/`basename $$f` ;\ $(INSTALL_PROGRAM) $$f $(BIN_INSTALL_DIR) ;\ @@ -189,7 +198,7 @@ find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \; find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \; @echo "=== Creating index..." - cd $(SCRIPT_INSTALL_DIR); $(BIN_INSTALL_DIR)/tkdesksh mkindex + cd $(SCRIPT_INSTALL_DIR); DISPLAY=fake $(TKDESKSH_INSTALL_DIR)/tkdesksh mkindex @echo "=== Installing the manual pages..." @for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \ echo "installing $$f" ;\ @@ -202,7 +211,7 @@ @echo "=== Uninstalling TkDesk's library..." -rm -r $(SCRIPT_INSTALL_DIR) @echo "=== Uninstalling TkDesk's executables..." - -rm $(BIN_INSTALL_DIR)/tkdesksh $(BIN_INSTALL_DIR)/tkdesk $(BIN_INSTALL_DIR)/pauseme $(BIN_INSTALL_DIR)/ed-tkdesk $(BIN_INSTALL_DIR)/cd-tkdesk $(BIN_INSTALL_DIR)/od-tkdesk $(BIN_INSTALL_DIR)/op-tkdesk $(BIN_INSTALL_DIR)/pop-tkdesk $(BIN_INSTALL_DIR)/tkdeskclient + -rm $(TKDESKSH_INSTALL_DIR)/tkdesksh $(BIN_INSTALL_DIR)/tkdesk $(BIN_INSTALL_DIR)/pauseme $(BIN_INSTALL_DIR)/ed-tkdesk $(BIN_INSTALL_DIR)/cd-tkdesk $(BIN_INSTALL_DIR)/od-tkdesk $(BIN_INSTALL_DIR)/op-tkdesk $(BIN_INSTALL_DIR)/pop-tkdesk $(BIN_INSTALL_DIR)/tkdeskclient @echo "=== Done." dirs: --- tkdesk-2.0.orig/blt/Makefile.in +++ tkdesk-2.0/blt/Makefile.in @@ -8,11 +8,8 @@ # the configuration script). #---------------------------------------------------------------- -# Location of Tcl header files: -TCL_INCLUDE_DIR = @TCL_INCLUDE_PATH@ - -# Location of Tk header files: -TK_INCLUDE_DIR = @TK_INCLUDE_PATH@ +# Location of Tcl/Tk header files: +TCL_INCLUDE_FLAG = @TCL_INCLUDE_SPEC@ # Location of X11 header files: X_INCLUDE_FLAG = @TK_XINCLUDES@ @@ -32,7 +29,7 @@ # either. #---------------------------------------------------------------- -CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. -I. -I${TCL_INCLUDE_DIR} -I${TK_INCLUDE_DIR} ${X_INCLUDE_FLAG} +CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. -I. ${TCL_INCLUDE_FLAG} ${X_INCLUDE_FLAG} BLT_LIBRARY = $(LIB_DIR) libname = libBLT.a --- tkdesk-2.0.orig/configure +++ tkdesk-2.0/configure @@ -1,37 +1,101 @@ #! /bin/sh -# From configure.in Revision: 1.3 . +# From configure.in 1.4. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for TkDesk ver-2-0. +# Generated by GNU Autoconf 2.61 for TkDesk ver-2-0. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -42,21 +106,22 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -64,206 +129,447 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. fi +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH +exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME='TkDesk' PACKAGE_TARNAME='tkdesk' @@ -275,42 +581,123 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TCL_LD_SEARCH_FLAGS TCL_EXEC_PREFIX TK_EXEC_PREFIX TCL_INCLUDE_PATH TK_INCLUDE_PATH TK_XINCLUDES TCL_LIB_SPEC TK_LIB_SPEC TK_LIBS TCL_LIB_STATIC TK_LIB_STATIC ITCL_LIB_SPEC ITCL_LIB_STATIC NEED_BLT_LIB BLT_LIB_SPEC BLT_LIB_STATIC TKDESK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +TCL_LD_SEARCH_FLAGS +TCL_EXEC_PREFIX +TK_EXEC_PREFIX +TCL_INCLUDE_SPEC +TK_XINCLUDES +TCL_LIB_SPEC +TK_LIB_SPEC +TK_LIBS +TCL_LIB_STATIC +TK_LIB_STATIC +ITCL_LIB_SPEC +ITCL_LIB_STATIC +NEED_BLT_LIB +BLT_LIB_SPEC +BLT_LIB_STATIC +TKDESK +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +LN_S +SET_MAKE +RANLIB +XMKMF +CPP +GREP +EGREP +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +XMKMF +CPP' + # Initialize some variables set by options. ac_init_help= @@ -337,34 +724,48 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -386,33 +787,45 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -439,6 +852,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -463,13 +882,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -534,6 +956,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -586,24 +1018,20 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -634,8 +1062,7 @@ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -655,27 +1082,19 @@ { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -702,74 +1121,76 @@ test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -798,14 +1219,11 @@ -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -818,15 +1236,22 @@ --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/tkdesk] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -856,6 +1281,9 @@ --with-tcl=DIR read Tcl configuration from DIR --with-tk=DIR read Tk configuration from DIR --with-itcl=DIR read itcl configuration from DIR + --with-itcl-lib=DIR link to itcl library using the given flags + --with-itcl-version=VERSION + itcl version number --with-tclconfig=FILE use specific tcl config file [tclConfig.sh] --with-tkconfig=FILE use specific tk config file [tkConfig.sh] --with-itclconfig=FILE use specific itcl config file [itclConfig.sh] @@ -867,96 +1295,96 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + XMKMF Path to xmkmf, Makefile generator for X Window System CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF TkDesk configure ver-2-0 -generated by GNU Autoconf 2.57 +generated by GNU Autoconf 2.61 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by TkDesk $as_me ver-2-0, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -975,7 +1403,7 @@ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -989,6 +1417,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1010,7 +1439,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1021,7 +1449,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1029,23 +1457,21 @@ 2) ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1056,8 +1482,8 @@ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1070,20 +1496,34 @@ _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1094,22 +1534,28 @@ echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1121,26 +1567,24 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1171,14 +1615,17 @@ # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1194,8 +1641,8 @@ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1207,12 +1654,11 @@ # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1225,20 +1671,19 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1255,12 +1700,6 @@ { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1285,92 +1724,111 @@ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" -# Check whether --with-tcl or --without-tcl was given. +# Check whether --with-tcl was given. if test "${with_tcl+set}" = set; then - withval="$with_tcl" - TCLCONF_PATH=$withval -fi; + withval=$with_tcl; TCLCONF_PATH=$withval +fi -# Check whether --with-tk or --without-tk was given. + +# Check whether --with-tk was given. if test "${with_tk+set}" = set; then - withval="$with_tk" - TKCONF_PATH=$withval -fi; + withval=$with_tk; TKCONF_PATH=$withval +fi -# Check whether --with-itcl or --without-itcl was given. + +# Check whether --with-itcl was given. if test "${with_itcl+set}" = set; then - withval="$with_itcl" - ITCLCONF_PATH=$withval -fi; + withval=$with_itcl; ITCLCONF_PATH=$withval +fi + + + +# Check whether --with-itcl-lib was given. +if test "${with_itcl_lib+set}" = set; then + withval=$with_itcl_lib; ITCL_LIB_SPEC=$withval +fi + + + +# Check whether --with-itcl-version was given. +if test "${with_itcl_version+set}" = set; then + withval=$with_itcl_version; ITCL_VERSION=$withval +fi -# Check whether --with-tclconfig or --without-tclconfig was given. + +# Check whether --with-tclconfig was given. if test "${with_tclconfig+set}" = set; then - withval="$with_tclconfig" - TCLCONF_FILE=$withval + withval=$with_tclconfig; TCLCONF_FILE=$withval else TCLCONF_FILE=tclConfig.sh -fi; +fi -# Check whether --with-tkconfig or --without-tkconfig was given. + +# Check whether --with-tkconfig was given. if test "${with_tkconfig+set}" = set; then - withval="$with_tkconfig" - TKCONF_FILE=$withval + withval=$with_tkconfig; TKCONF_FILE=$withval else TKCONF_FILE=tkConfig.sh -fi; +fi -# Check whether --with-itclconfig or --without-itclconfig was given. + +# Check whether --with-itclconfig was given. if test "${with_itclconfig+set}" = set; then - withval="$with_itclconfig" - ITCLCONF_FILE=$withval + withval=$with_itclconfig; ITCLCONF_FILE=$withval else ITCLCONF_FILE=itclConfig.sh -fi; +fi -# Check whether --with-blt or --without-blt was given. + +# Check whether --with-blt was given. if test "${with_blt+set}" = set; then - withval="$with_blt" - BLT_LIB_PATH=$withval -fi; + withval=$with_blt; BLT_LIB_PATH=$withval +fi -# Check whether --enable-tkstep or --disable-tkstep was given. + +# Check whether --enable-tkstep was given. if test "${enable_tkstep+set}" = set; then - enableval="$enable_tkstep" - ENABLE_TKSTEP=yes + enableval=$enable_tkstep; ENABLE_TKSTEP=yes else ENABLE_TKSTEP=no -fi; +fi -# Check whether --enable-unsupported or --disable-unsupported was given. + +# Check whether --enable-unsupported was given. if test "${enable_unsupported+set}" = set; then - enableval="$enable_unsupported" - ENABLE_UNSUPPORTED=yes + enableval=$enable_unsupported; ENABLE_UNSUPPORTED=yes else ENABLE_UNSUPPORTED=no -fi; +fi + # # Read tclConfig.sh and tkConfig.sh: # -echo "$as_me:$LINENO: checking for $TCLCONF_FILE" >&5 -echo $ECHO_N "checking for $TCLCONF_FILE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $TCLCONF_FILE" >&5 +echo $ECHO_N "checking for $TCLCONF_FILE... $ECHO_C" >&6; } if test -z "$TCLCONF_PATH" ; then TCLCONF_PATH="$HOME/lib /usr/local/lib /usr/lib /usr/X11/lib /usr/share/lib" fi @@ -1383,19 +1841,19 @@ fi done if test $success = 1 ; then - echo "$as_me:$LINENO: result: $TCLCONF_PATH/$TCLCONF_FILE" >&5 -echo "${ECHO_T}$TCLCONF_PATH/$TCLCONF_FILE" >&6 + { echo "$as_me:$LINENO: result: $TCLCONF_PATH/$TCLCONF_FILE" >&5 +echo "${ECHO_T}$TCLCONF_PATH/$TCLCONF_FILE" >&6; } else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } echo { { echo "$as_me:$LINENO: error: could not find $TCLCONF_FILE - Please restart configure with the argument --with-tcl=dir, where dir is the path of tclConfig.sh. You may use --with-tclconfig=file to use a specific Tcl config file name. If you cannot locate this file, maybe Tcl/Tk needs to be installed first. Note that TkDesk 2.x requires Tcl/Tk 8.x." >&5 echo "$as_me: error: could not find $TCLCONF_FILE - Please restart configure with the argument --with-tcl=dir, where dir is the path of tclConfig.sh. You may use --with-tclconfig=file to use a specific Tcl config file name. If you cannot locate this file, maybe Tcl/Tk needs to be installed first. Note that TkDesk 2.x requires Tcl/Tk 8.x." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for $TKCONF_FILE" >&5 -echo $ECHO_N "checking for $TKCONF_FILE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $TKCONF_FILE" >&5 +echo $ECHO_N "checking for $TKCONF_FILE... $ECHO_C" >&6; } if test -z "$TKCONF_PATH" ; then TKCONF_PATH="$TCLCONF_PATH $HOME/lib /usr/local/lib /usr/lib /usr/X11/lib /usr/share/lib" fi @@ -1408,11 +1866,11 @@ fi done if test $success = 1 ; then - echo "$as_me:$LINENO: result: $TKCONF_PATH/$TKCONF_FILE" >&5 -echo "${ECHO_T}$TKCONF_PATH/$TKCONF_FILE" >&6 + { echo "$as_me:$LINENO: result: $TKCONF_PATH/$TKCONF_FILE" >&5 +echo "${ECHO_T}$TKCONF_PATH/$TKCONF_FILE" >&6; } else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } echo { { echo "$as_me:$LINENO: error: could not find $TKCONF_FILE - Please restart configure with the argument --with-tk=dir, where dir is the path of tkConfig.sh. You may use --with-tkconfig=file to use a specific Tk config file name. If you cannot locate this file, maybe Tcl/Tk needs to be installed first. Note that TkDesk 2.x requires 8.x." >&5 echo "$as_me: error: could not find $TKCONF_FILE - Please restart configure with the argument --with-tk=dir, where dir is the path of tkConfig.sh. You may use --with-tkconfig=file to use a specific Tk config file name. If you cannot locate this file, maybe Tcl/Tk needs to be installed first. Note that TkDesk 2.x requires 8.x." >&2;} @@ -1440,10 +1898,10 @@ # Check version of installed Tcl/Tk libraries: # -echo "$as_me:$LINENO: checking version of Tcl" >&5 -echo $ECHO_N "checking version of Tcl... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $TCL_VERSION" >&5 -echo "${ECHO_T}$TCL_VERSION" >&6 +{ echo "$as_me:$LINENO: checking version of Tcl" >&5 +echo $ECHO_N "checking version of Tcl... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $TCL_VERSION" >&5 +echo "${ECHO_T}$TCL_VERSION" >&6; } if test "$TCL_MAJOR_VERSION" -lt 8; then echo if test "$ENABLE_UNSUPPORTED" == "yes" ; then @@ -1456,10 +1914,10 @@ fi fi -echo "$as_me:$LINENO: checking version of Tk" >&5 -echo $ECHO_N "checking version of Tk... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $TK_VERSION" >&5 -echo "${ECHO_T}$TK_VERSION" >&6 +{ echo "$as_me:$LINENO: checking version of Tk" >&5 +echo $ECHO_N "checking version of Tk... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $TK_VERSION" >&5 +echo "${ECHO_T}$TK_VERSION" >&6; } if test "$TK_MAJOR_VERSION" -lt 8; then echo if test "$ENABLE_UNSUPPORTED" == "yes" ; then @@ -1481,8 +1939,9 @@ # First look for an itclConfig.sh... -echo "$as_me:$LINENO: checking for $ITCLCONF_FILE" >&5 -echo $ECHO_N "checking for $ITCLCONF_FILE... $ECHO_C" >&6 +if test -z "$ITCL_LIB_SPEC"; then +{ echo "$as_me:$LINENO: checking for $ITCLCONF_FILE" >&5 +echo $ECHO_N "checking for $ITCLCONF_FILE... $ECHO_C" >&6; } if test -z "$ITCLCONF_PATH" ; then ITCLCONF_PATH="$TCLCONF_PATH $HOME/lib /usr/local/lib /usr/lib /usr/X11/lib /usr/share/lib" fi @@ -1495,14 +1954,14 @@ fi done if test $success = 1 ; then - echo "$as_me:$LINENO: result: $ITCLCONF_PATH/$ITCLCONF_FILE" >&5 -echo "${ECHO_T}$ITCLCONF_PATH/$ITCLCONF_FILE" >&6 + { echo "$as_me:$LINENO: result: $ITCLCONF_PATH/$ITCLCONF_FILE" >&5 +echo "${ECHO_T}$ITCLCONF_PATH/$ITCLCONF_FILE" >&6; } . $ITCLCONF_PATH/$ITCLCONF_FILE - echo "$as_me:$LINENO: checking version of Itcl" >&5 -echo $ECHO_N "checking version of Itcl... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $ITCL_VERSION" >&5 -echo "${ECHO_T}$ITCL_VERSION" >&6 + { echo "$as_me:$LINENO: checking version of Itcl" >&5 +echo $ECHO_N "checking version of Itcl... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $ITCL_VERSION" >&5 +echo "${ECHO_T}$ITCL_VERSION" >&6; } if test "$ITCL_MAJOR_VERSION" -ne 3; then echo if test "$ENABLE_UNSUPPORTED" == "yes" ; then @@ -1515,15 +1974,15 @@ fi fi else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } ITCLCONF_PATH=[N/A] ITCL_VERSION="no" ITCL_MAJOR_VERSION=0 { echo "$as_me:$LINENO: WARNING: could not find $ITCLCONF_FILE - going to keep going, but I am not making any promises." >&5 echo "$as_me: WARNING: could not find $ITCLCONF_FILE - going to keep going, but I am not making any promises." >&2;} fi - +fi if test "$ITCL_VERSION" != "no" ; then # ITCL_LIB_SPEC already set in itclConfig.sh ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a @@ -1558,14 +2017,14 @@ # # Check whether to link with installed BLT # -echo "$as_me:$LINENO: checking for BLT library" >&5 -echo $ECHO_N "checking for BLT library... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BLT library" >&5 +echo $ECHO_N "checking for BLT library... $ECHO_C" >&6; } if test -z "$BLT_LIB_PATH" ; then BLT_LIB_SPEC=blt/libBLT.a BLT_LIB_STATIC=blt/libBLT.a NEED_BLT_LIB=lib_blt - echo "$as_me:$LINENO: result: ./blt" >&5 -echo "${ECHO_T}./blt" >&6 + { echo "$as_me:$LINENO: result: ./blt" >&5 +echo "${ECHO_T}./blt" >&6; } else BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT" BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a @@ -1584,18 +2043,11 @@ BLT_LIB_PATH=$BLT_LIB_PATH/lib fi fi - echo "$as_me:$LINENO: result: $BLT_LIB_PATH" >&5 -echo "${ECHO_T}$BLT_LIB_PATH" >&6 + { echo "$as_me:$LINENO: result: $BLT_LIB_PATH" >&5 +echo "${ECHO_T}$BLT_LIB_PATH" >&6; } fi # -# Determine include directories -# - -TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include -TK_INCLUDE_PATH=$TCL_INCLUDE_PATH - -# # Perform substitutions # @@ -1617,11 +2069,10 @@ - # Extract the first word of "tkdesk", so it can be a program name with args. set dummy tkdesk; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_TKDESK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1636,27 +2087,28 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_TKDESK="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi TKDESK=$ac_cv_path_TKDESK - if test -n "$TKDESK"; then - echo "$as_me:$LINENO: result: $TKDESK" >&5 -echo "${ECHO_T}$TKDESK" >&6 + { echo "$as_me:$LINENO: result: $TKDESK" >&5 +echo "${ECHO_T}$TKDESK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1665,8 +2117,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1679,32 +2131,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1717,36 +2171,51 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1759,74 +2228,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1840,7 +2269,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -1851,6 +2280,7 @@ fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -1868,22 +2298,23 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1896,36 +2327,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1938,29 +2371,45 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -1973,27 +2422,40 @@ { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2013,47 +2475,77 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; * ) - break;; + break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2065,19 +2557,21 @@ fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2096,22 +2590,27 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2122,10 +2621,9 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; + break;; * ) break;; esac done @@ -2138,19 +2636,18 @@ fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2166,14 +2663,20 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2191,17 +2694,16 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2220,41 +2722,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2270,28 +2780,118 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -2307,15 +2907,14 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2343,6 +2942,21 @@ va_end (v); return s; } + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -2357,168 +2971,57 @@ return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2526,29 +3029,35 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2561,9 +3070,10 @@ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2577,6 +3087,7 @@ case $as_dir/ in ./ | .// | /cC/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -2584,40 +3095,41 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2627,51 +3139,52 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2684,32 +3197,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2722,27 +3237,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -2754,8 +3283,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2777,7 +3306,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2788,25 +3316,24 @@ #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -2815,12 +3342,12 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2828,23 +3355,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -2855,6 +3381,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2872,8 +3399,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -2884,7 +3411,6 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2895,25 +3421,24 @@ #else # include #endif - Syntax error + Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -2922,12 +3447,12 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2935,23 +3460,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -2962,6 +3486,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -2984,52 +3509,57 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } -# Check whether --with-x or --without-x was given. +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" + withval=$with_x; +fi -fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -3038,7 +3568,7 @@ esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi # Standard set of common directories for X headers. @@ -3079,34 +3609,32 @@ /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else @@ -3114,12 +3642,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -3128,35 +3657,40 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= @@ -3164,48 +3698,54 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi - - fi +;; #( + *) have_x=yes;; + esac eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi @@ -3216,13 +3756,12 @@ ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3241,28 +3780,35 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 @@ -3274,243 +3820,343 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in dir; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done +done +if test "${ac_cv_search_opendir+set}" = set; then + : +else + ac_cv_search_opendir=no fi +rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - echo "$as_me:$LINENO: checking for library containing opendir" >&5 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS -ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char opendir (); int main () { -opendir (); +return opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="none required" + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_opendir" = no; then - for ac_lib in x; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); -int -main () -{ -opendir (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_opendir="-l$ac_lib" -break +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break +fi +done +if test "${ac_cv_search_opendir+set}" = set; then + : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +fi + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 done +done + +done +IFS=$as_save_IFS + + fi -LIBS=$ac_func_search_save_LIBS + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 -echo "${ECHO_T}$ac_cv_search_opendir" >&6 -if test "$ac_cv_search_opendir" != no; then - test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" +else + ac_cv_path_GREP=$GREP fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3530,30 +4176,35 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3575,7 +4226,6 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3600,21 +4250,21 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3625,19 +4275,28 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + || toupper (i) != TOUPPER (i)) + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3650,12 +4309,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -3664,13 +4325,12 @@ fi -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3679,7 +4339,7 @@ #include #include #ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif #ifndef WIFEXITED # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) @@ -3696,28 +4356,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -3737,16 +4403,15 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3757,28 +4422,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -3806,20 +4478,20 @@ for ac_header in errno.h fcntl.h float.h limits.h malloc.h memory.h sys/time.h statvfs.h sys/statvfs.h unistd.h waitflags.h sys/vfs.h sys/param.h sys/mount.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3829,33 +4501,38 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3863,23 +4540,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -3887,52 +4563,46 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes ;; - no:yes ) + no:yes:* ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -3945,53 +4615,59 @@ done -echo "$as_me:$LINENO: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef mode_t ac__type_new_; int main () { -if ((mode_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (mode_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_mode_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_mode_t=no + ac_cv_type_mode_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6; } if test $ac_cv_type_mode_t = yes; then : else @@ -4002,110 +4678,122 @@ fi -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } if test $ac_cv_type_size_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define size_t unsigned +#define size_t unsigned int _ACEOF fi -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef pid_t ac__type_new_; int main () { -if ((pid_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (pid_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no + ac_cv_type_pid_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } if test $ac_cv_type_pid_t = yes; then : else @@ -4116,13 +4804,12 @@ fi -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4142,28 +4829,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -4172,13 +4865,12 @@ fi -echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4190,34 +4882,42 @@ int main () { -struct tm *tp; tp->tm_sec; +struct tm tm; + int *p = &tm.tm_sec; + return !p; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_struct_tm=sys/time.h + ac_cv_struct_tm=sys/time.h fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +echo "${ECHO_T}$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then cat >>confdefs.h <<\_ACEOF @@ -4227,13 +4927,12 @@ fi -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4241,46 +4940,44 @@ /* end confdefs.h. */ #include #include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif int main () { -int i; +return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_signal=int + ac_cv_type_signal=void fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal @@ -4297,78 +4994,88 @@ for ac_func in gethostname gettimeofday socket strdup strcasecmp statvfs statfs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif -/* Override any gcc2 internal prototype to avoid an error. */ + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -4377,60 +5084,67 @@ fi done -echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 +echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket -lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char socket (); int main () { -socket (); +return socket (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_socket_socket=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no + ac_cv_lib_socket_socket=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; } if test $ac_cv_lib_socket_socket = yes; then LIBS="-lsocket -lnsl" fi @@ -4449,13 +5163,12 @@ # Checking the usability of WIFEXITED seems to do the trick. # -echo "$as_me:$LINENO: checking whether union wait is defined correctly" >&5 -echo $ECHO_N "checking whether union wait is defined correctly... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether union wait is defined correctly" >&5 +echo $ECHO_N "checking whether union wait is defined correctly... $ECHO_C" >&6; } if test "${blt_cv_struct_wait_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4476,25 +5189,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then blt_cv_struct_wait_works="yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -blt_cv_struct_wait_works="no" + blt_cv_struct_wait_works="no" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -4505,10 +5224,10 @@ _ACEOF fi -echo "$as_me:$LINENO: result: $blt_cv_struct_wait_works" >&5 -echo "${ECHO_T}$blt_cv_struct_wait_works" >&6 +{ echo "$as_me:$LINENO: result: $blt_cv_struct_wait_works" >&5 +echo "${ECHO_T}$blt_cv_struct_wait_works" >&6; } - ac_config_files="$ac_config_files Makefile libdesk/Makefile blt/Makefile netscape-remote/Makefile tkdeskclient/Makefile" +ac_config_files="$ac_config_files Makefile libdesk/Makefile blt/Makefile netscape-remote/Makefile tkdeskclient/Makefile" cat >confcache <<\_ACEOF @@ -4529,39 +5248,58 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -4570,32 +5308,18 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -4626,27 +5350,91 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -4657,21 +5445,22 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -4679,200 +5468,166 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: else + test -d ./-p && rmdir ./-p as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. -as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# CDPATH. -$as_unset CDPATH exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by TkDesk $as_me ver-2-0, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4880,30 +5635,19 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -4911,14 +5655,14 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -4927,20 +5671,21 @@ $config_headers Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ TkDesk config.status ver-2-0 -configured by $0, generated by GNU Autoconf 2.57, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -4951,39 +5696,24 @@ do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -4993,18 +5723,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -5020,33 +5756,47 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 - - - +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "libdesk/Makefile" ) CONFIG_FILES="$CONFIG_FILES libdesk/Makefile" ;; - "blt/Makefile" ) CONFIG_FILES="$CONFIG_FILES blt/Makefile" ;; - "netscape-remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES netscape-remote/Makefile" ;; - "tkdeskclient/Makefile" ) CONFIG_FILES="$CONFIG_FILES tkdeskclient/Makefile" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "libdesk/Makefile") CONFIG_FILES="$CONFIG_FILES libdesk/Makefile" ;; + "blt/Makefile") CONFIG_FILES="$CONFIG_FILES blt/Makefile" ;; + "netscape-remote/Makefile") CONFIG_FILES="$CONFIG_FILES netscape-remote/Makefile" ;; + "tkdeskclient/Makefile") CONFIG_FILES="$CONFIG_FILES tkdeskclient/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -5057,286 +5807,386 @@ fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@TCL_LD_SEARCH_FLAGS@,$TCL_LD_SEARCH_FLAGS,;t t -s,@TCL_EXEC_PREFIX@,$TCL_EXEC_PREFIX,;t t -s,@TK_EXEC_PREFIX@,$TK_EXEC_PREFIX,;t t -s,@TCL_INCLUDE_PATH@,$TCL_INCLUDE_PATH,;t t -s,@TK_INCLUDE_PATH@,$TK_INCLUDE_PATH,;t t -s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t -s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t -s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t -s,@TK_LIBS@,$TK_LIBS,;t t -s,@TCL_LIB_STATIC@,$TCL_LIB_STATIC,;t t -s,@TK_LIB_STATIC@,$TK_LIB_STATIC,;t t -s,@ITCL_LIB_SPEC@,$ITCL_LIB_SPEC,;t t -s,@ITCL_LIB_STATIC@,$ITCL_LIB_STATIC,;t t -s,@NEED_BLT_LIB@,$NEED_BLT_LIB,;t t -s,@BLT_LIB_SPEC@,$BLT_LIB_SPEC,;t t -s,@BLT_LIB_STATIC@,$BLT_LIB_STATIC,;t t -s,@TKDESK@,$TKDESK,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@LN_S@,$LN_S,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@CPP@,$CPP,;t t -s,@EGREP@,$EGREP,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +TCL_LD_SEARCH_FLAGS!$TCL_LD_SEARCH_FLAGS$ac_delim +TCL_EXEC_PREFIX!$TCL_EXEC_PREFIX$ac_delim +TK_EXEC_PREFIX!$TK_EXEC_PREFIX$ac_delim +TCL_INCLUDE_SPEC!$TCL_INCLUDE_SPEC$ac_delim +TK_XINCLUDES!$TK_XINCLUDES$ac_delim +TCL_LIB_SPEC!$TCL_LIB_SPEC$ac_delim +TK_LIB_SPEC!$TK_LIB_SPEC$ac_delim +TK_LIBS!$TK_LIBS$ac_delim +TCL_LIB_STATIC!$TCL_LIB_STATIC$ac_delim +TK_LIB_STATIC!$TK_LIB_STATIC$ac_delim +ITCL_LIB_SPEC!$ITCL_LIB_SPEC$ac_delim +ITCL_LIB_STATIC!$ITCL_LIB_STATIC$ac_delim +NEED_BLT_LIB!$NEED_BLT_LIB$ac_delim +BLT_LIB_SPEC!$BLT_LIB_SPEC$ac_delim +BLT_LIB_STATIC!$BLT_LIB_STATIC$ac_delim +TKDESK!$TKDESK$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +LN_S!$LN_S$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +RANLIB!$RANLIB$ac_delim +XMKMF!$XMKMF$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -5344,251 +6194,137 @@ cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines -# This sed command replaces #undef with comments. This is necessary, for +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi -done -_ACEOF + rm -f "$tmp/out12" + ;; + + + esac + +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF @@ -5626,8 +6362,7 @@ eval echo Use TkStep.................... : $ENABLE_TKSTEP eval echo Tcl Config Path............... : $TCLCONF_PATH/$TCLCONF_FILE eval echo Tk Config Path................ : $TKCONF_PATH/$TKCONF_FILE -eval echo Tcl Include Path.............. : $TCL_INCLUDE_PATH -eval echo Tk Include Path............... : $TK_INCLUDE_PATH +eval echo Tcl/Tk Include Path........... : $TCL_INCLUDE_SPEC eval echo Tcl Library Spec.............. : $TCL_LIB_SPEC eval echo Tcl Static Library Spec....... : $TCL_LIB_STATIC eval echo Tk Library Spec............... : $TK_LIB_SPEC --- tkdesk-2.0.orig/configure.in +++ tkdesk-2.0/configure.in @@ -19,6 +19,14 @@ [AC_HELP_STRING([--with-itcl=DIR],[read itcl configuration from DIR])], ITCLCONF_PATH=$withval) +AC_ARG_WITH(itcl-lib, + [AC_HELP_STRING([--with-itcl-lib=DIR],[link to itcl library using the given flags])], + ITCL_LIB_SPEC=$withval) + +AC_ARG_WITH(itcl-version, + [AC_HELP_STRING([--with-itcl-version=VERSION],[itcl version number])], + ITCL_VERSION=$withval) + AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=FILE], [use specific tcl config file [tclConfig.sh]])], @@ -147,6 +155,7 @@ # First look for an itclConfig.sh... +if test -z "$ITCL_LIB_SPEC"; then AC_MSG_CHECKING(for $ITCLCONF_FILE) if test -z "$ITCLCONF_PATH" ; then ITCLCONF_PATH="$TCLCONF_PATH $HOME/lib /usr/local/lib /usr/lib /usr/X11/lib /usr/share/lib" @@ -180,7 +189,7 @@ ITCL_MAJOR_VERSION=0 AC_MSG_WARN([could not find $ITCLCONF_FILE - going to keep going, but I am not making any promises.]) fi - +fi if test "$ITCL_VERSION" != "no" ; then # ITCL_LIB_SPEC already set in itclConfig.sh ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a @@ -241,20 +250,12 @@ fi # -# Determine include directories -# - -TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include -TK_INCLUDE_PATH=$TCL_INCLUDE_PATH - -# # Perform substitutions # AC_SUBST(TCL_LD_SEARCH_FLAGS) AC_SUBST(TCL_EXEC_PREFIX) AC_SUBST(TK_EXEC_PREFIX) -AC_SUBST(TCL_INCLUDE_PATH) -AC_SUBST(TK_INCLUDE_PATH) +AC_SUBST(TCL_INCLUDE_SPEC) AC_SUBST(TK_XINCLUDES) AC_SUBST(TCL_LIB_SPEC) AC_SUBST(TK_LIB_SPEC) @@ -338,8 +339,7 @@ eval echo Use TkStep.................... : $ENABLE_TKSTEP eval echo Tcl Config Path............... : $TCLCONF_PATH/$TCLCONF_FILE eval echo Tk Config Path................ : $TKCONF_PATH/$TKCONF_FILE -eval echo Tcl Include Path.............. : $TCL_INCLUDE_PATH -eval echo Tk Include Path............... : $TK_INCLUDE_PATH +eval echo Tcl/Tk Include Path........... : $TCL_INCLUDE_SPEC eval echo Tcl Library Spec.............. : $TCL_LIB_SPEC eval echo Tcl Static Library Spec....... : $TCL_LIB_STATIC eval echo Tk Library Spec............... : $TK_LIB_SPEC --- tkdesk-2.0.orig/debian/changelog +++ tkdesk-2.0/debian/changelog @@ -0,0 +1,231 @@ +tkdesk (2.0-9.2) unstable; urgency=low + + * Non-maintainer upload. + * Switched to Tcl/Tk 8.6 to work with newer BLT (closes: #753794). + * Find the itclConfig.sh in its new multiarchified location. + * Defined USE_INTERP_RESULT macro to build with Tcl 8.6. + * Fixed link to the tkdesk documentation. + + -- Sergei Golovan Fri, 11 Jul 2014 09:15:08 +0400 + +tkdesk (2.0-9.1) unstable; urgency=low + + * Non-maintainer upload. + * Switched off components autoloading and added patch + http://tkdesk.sourceforge.net/patches/tkdesk-2.0p2.patch by upstream + to make tkdesk working with itcl3 version 3.3 or newer. + * Switched to Tcl/Tk 8.5 to match changes in itcl3 and work with newer BLT + (closes: #533061, #545590). + + -- Sergei Golovan Fri, 30 Oct 2009 11:01:18 +0300 + +tkdesk (2.0-9) unstable; urgency=low + + * Throw a TCL_ERROR to prevent recursive calls to dskC_ls. This + prevents a core dump discovered in certain situations with Ubuntu and + tkdesk 2.0-5. + + -- Daniel Martin Sun, 26 Aug 2007 14:22:54 -0400 + +tkdesk (2.0-8) unstable; urgency=low + + * Change TCL_INC_DIR usage to TCL_INCLUDE_SPEC. This is apparently the + proper way to include the Tcl/Tk headers; TCL_INC_DIR is only supposed + to be used to include non-public headers. As a side effect, this fixes + the FTBFS caused by an upload of tcl8.4 that accidentally left this + variable out. (closes: Bug#436331) + + -- Daniel Martin Tue, 07 Aug 2007 21:53:08 -0400 + +tkdesk (2.0-7) unstable; urgency=low + + * Integrate NMU patch (closes: Bug#392685) + * Update menu file for new menu structure + * Upgrade to debhelper compat level 5 + + -- Daniel Martin Thu, 12 Jul 2007 13:40:00 -0400 + +tkdesk (2.0-6.1) unstable; urgency=low + + * NMU + * Move man pages to /usr/share. Closes: #391697 + * Remove no longer correct and uselessly hardcoded path to tkdesk in menu + file. + * Fix menu file quoting. + + -- Joey Hess Thu, 12 Oct 2006 16:10:01 -0400 + +tkdesk (2.0-6) unstable; urgency=low + + * Move everything out of /usr/X11R6 (X v7 compatibility) + + -- Daniel Martin Sun, 11 Jun 2005 12:01:23 -0500 + +tkdesk (2.0-5) unstable; urgency=low + + * Fix an off-by-one error on terminating a string which causes + bizarre display errors when displaying file modes inside + file lists. Apparently the new gcc packs arrays together + more closely when using -O2. (closes: Bug#339048) + + -- Daniel Martin Tue, 15 Nov 2005 01:39:10 -0500 + +tkdesk (2.0-4) unstable; urgency=low + + * Remove an extraneous declaration that causes compile problems + on gcc 3.4. (closes: Bug#263738) + + -- Daniel Martin Wed, 2 Nov 2005 22:26:02 -0500 + +tkdesk (2.0-3) unstable; urgency=low + + * Move pauseme manpage to section 1x; fixes name collision + issue with vifm package. + + -- Daniel Martin Thu, 10 Jun 2004 12:21:31 -0400 + +tkdesk (2.0-2) unstable; urgency=low + + * Rework compile options, fix calls to malloc/free to call + ckalloc/ckfree. Fixes core dump on startup (closes: Bug#294644) + + -- Daniel Martin Wed, 19 May 2004 15:45:42 -0400 + +tkdesk (2.0-1) unstable; urgency=low + + * New upstream release + ** Uses tcl/tk 8.4 (closes: Bug#173166) + ** Mouse wheel support + * Improved .deb interaction (closes: Bug#36955) + * Moved tkdesksh to different location, wrote "pauseme" manpage + (closes: Bug#19423) + + -- Daniel Martin Sun, 18 Apr 2004 22:45:56 -0400 + +tkdesk (1.2-9) unstable; urgency=low + + * Reworked package to debhelperize it. + * Reworked package gets md5sums correct. (closes: Bug#215932) + * Package no longer needs debmake builds-depends. (closes: Bug#132468) + * User config files no longer shipped in /etc/tkdesk (closes: Bug#132821) + * Modified help browser to read gzipped help files if the + uncompressed help file is missing. + + -- Daniel Martin Sat, 15 Nov 2003 14:20:26 -0500 + +tkdesk (1.2-8) unstable; urgency=low + + * Reverted to using the included-with-the-upstream version of blt. + The effect of this is to be using an older blt version; however, + I can't keep up with the current blt without upgrading the tcl/tk + version used by tkdesk, and I can't do that without more time + hunting down what changed and why the code doesn't play nicely + with newer tcl/tk versions. (help would be appreciated) + * As a consequence, removed blt8.0-dev from build depends; tkdesk + now builds properly from source. (closes: Bug#202037) + * Updated urls in the "Internet" button to reflect current reality. + + -- Daniel Martin Sun, 3 Aug 2003 22:08:38 -0400 + +tkdesk (1.2-7) unstable; urgency=low + + * Fixed interaction with blt version 2.4y (some file names changed + upstream). The effect was that opening a file browser caused an error + message about "/usr/X11R6/lib/tkdesk/dragdrop.tcl". Also, this caused + a crash on startup if the user's saved _layout file specified a file + browser. + * Applied find.tcl fix from upstream (Drag and Drop of multiple files + from the "find" window had issues) + * Finally applied doc-base fix (closes: Bug#114883) + + -- Daniel Martin Tue, 25 Jun 2002 12:11:50 -0400 + +tkdesk (1.2-6) unstable; urgency=low + + * Added itcl3.0-dev to Build-Depends (closes: Bug#131944) + * Added tk8.0-dev to the Build-Depends just for good measure. + + -- Daniel Martin Sat, 2 Feb 2002 10:11:06 -0500 + +tkdesk (1.2-5) unstable; urgency=low + + * Added blt8.0-dev to the Build dependencies (closes: Bug#131589) + + -- Daniel Martin Thu, 31 Jan 2002 21:57:02 -0500 + +tkdesk (1.2-4) unstable; urgency=low + + * Removed /usr/doc symlink from package proper; opted instead for what's + in the policy manual (closes: Bug#91691) + * Minor fixup of changelog and copyright files (closes: Bug#127124) + * Link against libBLT from debian package rather than staticly against + libBLT packaged with tkdesk source. + + -- Daniel Martin Mon, 28 Jan 2002 20:42:18 -0500 + +tkdesk (1.2-3) unstable; urgency=low + + * Fixed preinst in case where tkdesk hadn't been previously installed - + you know, this fix wouldn't be necessary if I didn't have to do magic + in my preinst to work around the fact that dpkg can't handle replacing + a directory with a symbolic link. (closes #54259) + + -- Daniel Martin Fri, 7 Jan 2000 23:51:44 -0500 + +tkdesk (1.2-2) unstable; urgency=medium + + * Fixed the @#$! TKDESK_LIBRARY location again. I must try to talk to + the upstream author about this to see if I can't get him to accept a + patch to make tkdesk more packager-friendly. Fixes bug #54054 + + -- Daniel Martin Tue, 4 Jan 2000 22:54:07 -0500 + +tkdesk (1.2-1) unstable; urgency=low + + * New upstream version + * Now with FHS standard doc location (/usr/share/doc) + + -- Daniel Martin Sat, 1 Jan 2000 23:44:10 -0500 + +tkdesk (1.1-3) stable unstable; urgency=low + + * Fixed compile when DISPLAY unset + + -- Daniel Martin Sat, 21 Aug 1999 11:15:19 -0400 + +tkdesk (1.1-2) stable unstable; urgency=medium + + * Fixed /tmp file access to use tcl's {CREAT EXCL} - standard /tmp + exploit is fixed by this, so it should be allowed as a security update + * Added fix to allow custom trashdir locations (from upstream) + * Added fix to correct Editor "saveall" problem (from upstream) + + -- Daniel Martin Sun, 1 Aug 1999 16:48:47 -0400 + +tkdesk (1.1-1) unstable; urgency=low + + * Is now Y2K "compliant" + * new upstream version + + -- Daniel Martin Sat, 10 Oct 1998 01:03:21 -0400 + +tkdesk (1.0p1-3) unstable; urgency=low + + * Fixed tkdesk library location. + + -- Daniel Martin Thu, 7 May 1998 11:00:36 -0400 + +tkdesk (1.0p1-2) unstable; urgency=low + + * Fixed bug in the last version's "menu" file + * Incorporated changes from tkdesk 1.0b4-3 + + -- Daniel Martin Thu, 7 May 1998 09:01:22 -0400 + +tkdesk (1.0p1-1) unstable; urgency=low + + * "Local" configuration file disappeared upstream; preinst deletes unmodified /etc/tkdesk/Local, issues a warning otherwise. + * new maintainer + * New upstream release. Many changes - check the upstream changelog (/usr/doc/tkdesk/changelog.gz) + + -- Daniel Martin Wed, 6 May 1998 11:56:23 -0400 --- tkdesk-2.0.orig/debian/compat +++ tkdesk-2.0/debian/compat @@ -0,0 +1 @@ +5 --- tkdesk-2.0.orig/debian/control +++ tkdesk-2.0/debian/control @@ -0,0 +1,24 @@ +Source: tkdesk +Section: x11 +Priority: extra +Maintainer: Daniel Martin +Standards-Version: 3.6.1.0 +Build-Depends: itcl3-dev (>> 3.3), blt-dev (>= 2.5.3), tk-dev (>= 8.6.0), debhelper (>> 5.0.0) + +Package: tkdesk +Architecture: any +Section: x11 +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Tk/tcl based X11 Desktop/File manager + TkDesk is a graphical file manager for Unix (esp. Linux) and the X + Window System. + . + Compared with other file managers available, it offers the most + complete set of file operations and services, plus gives the user the + ability to configure most every aspect of TkDesk in a powerful way. + . + TkDesk has been influenced by various other systems and file managers, + such as NeXT, for laying out the file browser windows, Apple Finder, + for the idea of file annotations and, shock horror, Windows 95, for + some other inspirations. --- tkdesk-2.0.orig/debian/copyright +++ tkdesk-2.0/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by Daniel Martin fizbin@debian.org on +Mon, 13 Apr 1998 12:05:22 -0400. + +It was downloaded from + http://people.mainz.netsurf.de/~bolik/tkdesk/tkdesk-1.1.tar.gz + +Copyright: (taken from the file COPYING in the source distribution) + +This file contains information on usage and redistribution of the +individual parts of the program TkDesk. The most important point is +that there is definitely not the slightest bit of warranty!! + +Copyright Holders: +------------------ + +1.) tkAppInit.c and files in the subdirectory patches_for_TclTk: + * Copyright (c) 1993 The Regents of the University of California. + * Copyright (c) 1994 Sun Microsystems, Inc. + * + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +2.) blt/ (i.e. all files in the subdirectory blt): + * Copyright 1993-1996 by AT&T Bell Laboratories. + * Permission to use, copy, modify, and distribute this software + * and its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and warranty + * disclaimer appear in supporting documentation, and that the + * names of AT&T Bell Laboratories any of their entities not be used + * in advertising or publicity pertaining to distribution of the + * software without specific, written prior permission. + * + * AT&T disclaims all warranties with regard to this software, including + * all implied warranties of merchantability and fitness. In no event + * shall AT&T be liable for any special, indirect or consequential + * damages or any damages whatsoever resulting from loss of use, data + * or profits, whether in an action of contract, negligence or other + * tortuous action, arising out of or in connection with the use or + * performance of this software. + +3.) itcl/ (i.e. all files in the subdirectory itcl): +======================================================================== + Copyright (c) 1993 AT&T Bell Laboratories +======================================================================== +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that the copyright notice and warranty disclaimer appear in +supporting documentation, and that the names of AT&T Bell Laboratories +any of their entities not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. + +AT&T disclaims all warranties with regard to this software, including +all implied warranties of merchantability and fitness. In no event +shall AT&T be liable for any special, indirect or consequential +damages or any damages whatsoever resulting from loss of use, data or +profits, whether in an action of contract, negligence or other +tortuous action, arising out of or in connection with the use or +performance of this software. +======================================================================== + +4.) Everything else (unless otherwise stated in individual files): +Copyright (C) 1996 Christian Bolik + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License (follows hereafter) for more details. + + + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- tkdesk-2.0.orig/debian/deb.xpm +++ tkdesk-2.0/debian/deb.xpm @@ -0,0 +1,21 @@ +/* XPM */ +static char * deb_xpm[] = { +"13 16 2 1", +" c None", +". c #D70751", +" ", +" ....... ", +" ......... ", +" ... ... ", +"... .. ", +".. .. .. ", +".. . . ", +". . . ", +". . .. ", +".. .. .. ", +".. ... ", +" .. ", +" .. ", +" .. ", +" .. ", +" ... "}; --- tkdesk-2.0.orig/debian/dirs +++ tkdesk-2.0/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib +etc/tkdesk --- tkdesk-2.0.orig/debian/doc-base +++ tkdesk-2.0/debian/doc-base @@ -0,0 +1,21 @@ +Document: tkdesk-guide +Title: TkDesk User's Guide +Author: Christian Bolik +Abstract: TkDesk is a graphical, highly configurable and powerful desktop + manager for UNIX and the X Window System. This document is meant to be + a comprehensive guide to the functions, services and configuration + possibilities offered by TkDesk. +Section: XShells + +Format: HTML +Index: /usr/share/doc/tkdesk/tkdesk-doc/guide.html +Files: /usr/share/doc/tkdesk/tkdesk-doc/*.html + +Format: text +Files: /usr/share/doc/tkdesk/guide.txt.gz + +Format: linuxdoc-sgml +Files: /usr/share/doc/tkdesk/guide.sgml.gz + +Format: postscript +Files: /usr/share/doc/tkdesk/guide.ps.gz --- tkdesk-2.0.orig/debian/docs +++ tkdesk-2.0/debian/docs @@ -0,0 +1,5 @@ +README +CREDITS +license.terms +doc/guide.sgml +doc/guide.txt --- tkdesk-2.0.orig/debian/menu +++ tkdesk-2.0/debian/menu @@ -0,0 +1,7 @@ +!C menu-2 +?package(tkdesk): + needs="X11" + section="Applications/File Management" + title="TkDesk" + command="tkdesk" +; --- tkdesk-2.0.orig/debian/pauseme.1x +++ tkdesk-2.0/debian/pauseme.1x @@ -0,0 +1,25 @@ +.TH PAUSEME 1 "TkDesk 2.0, 04/15/2004" "" "" +.UC 4 +.SH NAME +pauseme \- execute a command a pause afterwards +.SH SYNOPSIS +.B pauseme +\fIcommand\fP [ \fIarg ...\fP ] +.br +.SH DESCRIPTION +.B pauseme +is a (very) simple script that simply executes the command given it +with the given arguments. After the command completes, +.B pauseme +displays a prompt to press return, and after the user presses return, exits. +.PP +It is intended to allow the user to examine output from a command that +is invoked in a separate terminal window. +.SH OPTIONS +This command takes no options +.SH "SEE ALSO" +tkdesk(1), cd-tkdesk(1), ed-tkdesk(1), od-tkdesk(1) +.SH "AUTHOR" +Christian Bolik (Christian.Bolik@mainz.netsurf.de) wrote the script, +Daniel Martin (fizbin@debian.org) wrote the manpage for the Debian +Linux distribution. --- tkdesk-2.0.orig/debian/rules +++ tkdesk-2.0/debian/rules @@ -0,0 +1,90 @@ +#!/usr/bin/make -f +# Debhelperized version + +# export DH_VERBOSE=1 + +export TKDESK_LIBRARY=/usr/lib/tkdesk + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --with-blt=/usr/lib --prefix=/usr --mandir=/usr/share/man \ + --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH) \ + --with-itcl=/usr/lib/$(DEB_HOST_MULTIARCH) + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + make CC_EXTRA_OPTS="-O2 -g -Wall -DUSE_INTERP_RESULT" TKDESK_LIBRARY=$(TKDESK_LIBRARY) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -make clean rm_tkdesk_script + -rm -f config.cache config.status config.h config.log Makefile */Makefile + -rm -f tkdeskclient/tkdeskclient + -rm -f tcldesk/configs/_* + dh_clean + +binary-indep: build install +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # Now we install into debian/tkdesk + make install INSTALL_ROOT=`pwd`/debian/tkdesk \ + TKDESK_LIBRARY=$(TKDESK_LIBRARY) + install -p -o root -g root -m 644 debian/deb.xpm \ + debian/tkdesk$(TKDESK_LIBRARY)/images/ficons16/deb.xpm + +binary-arch: build install + dh_testdir + dh_testroot + mv debian/tkdesk$(TKDESK_LIBRARY)/configs/* \ + debian/tkdesk/etc/tkdesk + rmdir debian/tkdesk$(TKDESK_LIBRARY)/configs + ln -s /etc/tkdesk debian/tkdesk$(TKDESK_LIBRARY)/configs + rm -f debian/tkdesk/etc/tkdesk/*.orig + ln -s tkdesk debian/tkdesk/usr/lib/TkDesk + dh_installdocs + mv debian/tkdesk$(TKDESK_LIBRARY)/doc \ + debian/tkdesk/usr/share/doc/tkdesk/tkdesk-doc + ln -s ../../share/doc/tkdesk/tkdesk-doc \ + debian/tkdesk$(TKDESK_LIBRARY)/doc + dh_installmenu + dh_installman debian/pauseme.1x + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- tkdesk-2.0.orig/debian/watch +++ tkdesk-2.0/debian/watch @@ -0,0 +1,7 @@ +# This is a version 2 uscan watchfile +version=2 + +# Look only at links in the /tkdesk directory on the sourceforge site. + +http://prdownloads.sourceforge.net/tkdesk/ \ + /tkdesk/tkdesk-([\d\.]*).tar.gz debian uupdate --- tkdesk-2.0.orig/libdesk/Makefile.in +++ tkdesk-2.0/libdesk/Makefile.in @@ -9,10 +9,7 @@ #---------------------------------------------------------------- # Location of Tcl header files: -TCL_INCLUDE_DIR = @TCL_INCLUDE_PATH@ - -# Location of Tk header files: -TK_INCLUDE_DIR = @TK_INCLUDE_PATH@ +TCL_INCLUDE_FLAG = @TCL_INCLUDE_SPEC@ # Location of X11 header files: X_INCLUDE_FLAG = @TK_XINCLUDES@ @@ -32,7 +29,7 @@ # either. #---------------------------------------------------------------- -CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. -I${TCL_INCLUDE_DIR} -I${TK_INCLUDE_DIR} ${X_INCLUDE_FLAG} +CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. ${TCL_INCLUDE_FLAG} ${X_INCLUDE_FLAG} libname = libdesk.a --- tkdesk-2.0.orig/libdesk/dsk_ls.c +++ tkdesk-2.0/libdesk/dsk_ls.c @@ -109,8 +109,8 @@ #define dsk_malloc(a, b) my_malloc((a), (b)) #define dsk_free(a, b) my_free((a), (b)) #else -#define dsk_malloc(a, b) malloc((a)) -#define dsk_free(a, b) free((a)) +#define dsk_malloc(a, b) ckalloc((size_t)(a)) +#define dsk_free(a, b) ckfree((char *)(a)) #endif /* === Typedefs ============================================================ */ @@ -132,7 +132,7 @@ } FILE_LIST; -void dsk_ls_init (); +int dsk_ls_init (); int process_cmdline _ANSI_ARGS_((int argc, char *argv[])); int read_file_lists (); int process_file_lists (); @@ -212,7 +212,7 @@ char **argv; char *path; { - dsk_ls_init (); + if (dsk_ls_init() != TCL_OK) return TCL_ERROR; #ifdef MEM_DEBUG { @@ -226,7 +226,7 @@ #endif strncpy (par_path, path, MAXPATHLEN); - par_path[MAXPATHLEN] = (char) NULL; + par_path[MAXPATHLEN-1] = (char) NULL; if (process_cmdline (argc, argv) != TCL_OK) return (TCL_ERROR); @@ -730,6 +730,9 @@ dsk_free (fe, "free_file_lists 3"); fe = nfe; } + fl->next = NULL; + fl->first = NULL; + fl->fe_array = NULL; if (fl != &root_of_lists) dsk_free (fl, "free_file_lists 4"); @@ -1463,8 +1466,15 @@ * Out : * ------------------------------------------------------------------------- */ -void dsk_ls_init () +int dsk_ls_init () { + if (root_of_lists.next != NULL || root_of_lists.fe_array != NULL) { + sprintf (dsk_interp->result, + "dsk_ls_init called inconsistently! (%p : %p)", + root_of_lists.next, root_of_lists.fe_array); + return TCL_ERROR; + } + par_every_dir = 0; /* read files for every dir in path? */ par_sort_type = BY_NAME; /* how to sort the file-lists */ par_sort_by_type = 0; /* sort by type? (only distincts dir/other) */ @@ -1497,6 +1507,8 @@ num_mallocs = 0; num_frees = 0; + + return TCL_OK; } /* dsk_ls_init */ @@ -1526,7 +1538,7 @@ } #endif - dsk_ls_init (); + if (dsk_ls_init() != TCL_OK) return (TCL_ERROR); if (process_cmdline (argc, argv) != TCL_OK) return (TCL_ERROR); --- tkdesk-2.0.orig/libdesk/misc.c +++ tkdesk-2.0/libdesk/misc.c @@ -149,7 +149,7 @@ } /* assume every char needs to be backslashed, for safety reasons */ - buf = (char *) malloc (strlen (argv[1]) * 2); + buf = (char *) ckalloc (strlen (argv[1]) * 2); if (buf == NULL) { fprintf (stderr, "out of memory in dsk_esc_Cmd\n"); exit (1); @@ -157,7 +157,7 @@ escape_chars (argv[1], argv[2], buf); Tcl_SetResult (interp, buf, TCL_VOLATILE); - free (buf); + ckfree (buf); return TCL_OK; } /* dsk_esc_Cmd */ @@ -181,7 +181,7 @@ } /* assume every char needs to be backslashed, for safety reasons */ - buf = (char *) malloc (strlen (argv[1]) * 2); + buf = (char *) ckalloc (strlen (argv[1]) * 2); if (buf == NULL) { fprintf (stderr, "out of memory in dsk_esc_Cmd\n"); exit (1); @@ -189,7 +189,7 @@ unescape_chars (argv[1], buf); Tcl_SetResult (interp, buf, TCL_VOLATILE); - free (buf); + ckfree (buf); return TCL_OK; } /* dsk_esc_Cmd */ --- tkdesk-2.0.orig/libdesk/o_FileListbox.c +++ tkdesk-2.0/libdesk/o_FileListbox.c @@ -69,7 +69,7 @@ /* get and split the taglist */ if (targv != NULL) - free ((char *)targv); + ckfree ((char *)targv); if (argc > 1) { if (Tcl_SplitList (interp, argv[1], &targc, &targv) == TCL_ERROR) return TCL_ERROR; @@ -81,7 +81,7 @@ /* get and split tag masks */ if (pargv != NULL) - free ((char *)pargv); + ckfree ((char *)pargv); if (argc > 2) { if (Tcl_SplitList (interp, argv[2], &pargc, &pargv) == TCL_ERROR) return TCL_ERROR; @@ -93,7 +93,7 @@ /* get and split ignore masks */ if (iargv != NULL) - free ((char *)iargv); + ckfree ((char *)iargv); if (argc > 3) { if (Tcl_SplitList (interp, argv[3], &iargc, &iargv) == TCL_ERROR) return TCL_ERROR; @@ -170,7 +170,7 @@ if (Tcl_SplitList (interp, lscmd, &lsargc, &lsargv) == TCL_ERROR) return TCL_ERROR; dsk_ls_init_and_parse_options (lsargc, lsargv, argv[1]); - free (lsargv); + ckfree ((char *)lsargv); /* now read and sort the file list */ fargc = dsk_ls_read_and_sort (iargc, (showall ? NULL : iargv), @@ -301,7 +301,7 @@ /* free memory allocated by dsk_ls */ dsk_ls_cleanup(); if (!mask_matches_all) - free (maskv); + ckfree ((char *)maskv); /* * And now the tagging: @@ -343,7 +343,7 @@ } Tcl_DStringFree (&dbigcmd); - free (mtargv); + ckfree ((char *)mtargv); } if (add_images && notmatch_set) { --- tkdesk-2.0.orig/libdesk/ot.c +++ tkdesk-2.0/libdesk/ot.c @@ -23,6 +23,7 @@ * * ========================================================================= */ +#include "libdesk.h" #include "ot.h" #ifdef OTTIMER @@ -160,7 +161,7 @@ for (i = 0; i < largc; i++) { if (!Tcl_SetVar (interp, argv[i + 2], largv[i], TCL_LEAVE_ERR_MSG)) { - free (largv); + ckfree ((char *)largv); return TCL_ERROR; } @@ -169,7 +170,7 @@ for (j = i + 1; j < largc; j++) { if (!Tcl_SetVar (interp, argv[i + 2], largv[j], TCL_LEAVE_ERR_MSG|TCL_LIST_ELEMENT|TCL_APPEND_VALUE)) { - free (largv); + ckfree ((char *)largv); return TCL_ERROR; } } @@ -177,7 +178,7 @@ } } - free (largv); + ckfree ((char *)largv); return TCL_OK; } /* ot_maplist_Cmd */ @@ -263,13 +264,13 @@ if (Tcl_GetCommandInfo (interp, argv[0], &cmdInfo) == 0) { sprintf (interp->result, "invalid command name \"%s\"", argv[0]); - free (argv); + ckfree ((char *)argv); return TCL_ERROR; } Tcl_ResetResult (interp); retval = (*cmdInfo.proc) (cmdInfo.clientData, interp, argc, argv); - free (argv); + ckfree ((char *)argv); return retval; } /* Ot_TclInvoke */ --- tkdesk-2.0.orig/libdesk/tixImgXpm.c +++ tkdesk-2.0/libdesk/tixImgXpm.c @@ -52,18 +52,14 @@ #include #include #include -#ifdef HAVE_TCL8_0_H -#include -#include -#else #include -#endif #include /*#include "tkInt.h" #include "tkPort.h"*/ /*#include */ -EXTERN void panic(); +/* This prototype causes compile errors with gcc-3.4 */ +/* EXTERN void panic(); */ /* constants used only in this file */ @@ -176,7 +172,9 @@ ImgXpmDisplay, /* displayProc */ ImgXpmFree, /* freeProc */ ImgXpmDelete, /* deleteProc */ +#if TK_MINOR_VERSION >= 3 (Tk_ImagePostscriptProc *) NULL, /* postscriptProc ?? */ +#endif (struct Tk_ImageType *) NULL /* nextPtr */ }; --- tkdesk-2.0.orig/netscape-remote/Makefile.in +++ tkdesk-2.0/netscape-remote/Makefile.in @@ -8,11 +8,8 @@ # the configuration script). #---------------------------------------------------------------- -# Location of Tcl header files: -TCL_INCLUDE_DIR = @TCL_INCLUDE_PATH@ - -# Location of Tk header files: -TK_INCLUDE_DIR = @TK_INCLUDE_PATH@ +# Location of Tcl/Tk header files: +TCL_INCLUDE_FLAG = @TCL_INCLUDE_SPEC@ # Location of X11 header files: X_INCLUDE_FLAG = @TK_XINCLUDES@ @@ -32,7 +29,7 @@ # either. #---------------------------------------------------------------- -CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. -I${TCL_INCLUDE_DIR} -I${TK_INCLUDE_DIR} ${X_INCLUDE_FLAG} +CFLAGS = ${CC_OPTS} ${AC_FLAGS} -I.. ${TCL_INCLUDE_FLAG} ${X_INCLUDE_FLAG} libname = libnetscape.a --- tkdesk-2.0.orig/netscape-remote/netscape_remote.c +++ tkdesk-2.0/netscape-remote/netscape_remote.c @@ -39,6 +39,7 @@ #endif #include #include +#include /* * Just include a prototype for XmuClientWindow here, since we bring --- tkdesk-2.0.orig/tcldesk/Common.tcl +++ tkdesk-2.0/tcldesk/Common.tcl @@ -54,8 +54,9 @@ itcl_class dsk_Common { - constructor {config} { - set topl [virtual getToplevel] + constructor {args} { + eval configure $args + set topl [$this getToplevel] } destructor { @@ -65,11 +66,12 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} {} - method configure {config} {} - + method config {args} { + eval configure $args + } + method cget {pubvar} { - return [virtual set [string trimleft $pubvar -]] + return [$this set [string trimleft $pubvar -]] } method status {str {do_update 1}} { @@ -89,7 +91,7 @@ pack propagate $topl 0 if ![winfo exists $topl.fStatus.l] return $topl.fStatus.l config -text \ - "Ready. [dsk_fs_status [_make_path_valid [virtual cget -directory]]]" + "Ready. [dsk_fs_status [_make_path_valid [$this cget -directory]]]" if $do_update { update ;# idletasks } @@ -99,11 +101,11 @@ global tkdesk if ![winfo exists $topl.fStatus.l] return - set sfl [virtual select get] + set sfl [$this select get] dsk_debug "selstatus: sfl $sfl" set l [llength $sfl] if {$l == 0} { - $this status "Ready. [dsk_fs_status [virtual cget -directory]]" + $this status "Ready. [dsk_fs_status [$this cget -directory]]" #$this status "Ready." } elseif {$l == 1} { set fi "" @@ -180,11 +182,11 @@ -command "dsk_ask_dir browser" if [$this isa dsk_FileViewer] { $m add command -label "Clone Window" -underline 2 \ - -command "dsk_FileViewer .fv\[dsk_FileViewer :: id\] \ - -dir \[$this curdir\] -num_lbs \[$this cget num_lbs\]" + -command "dsk_FileViewer .fv\[dsk_FileViewer::id\] \ + -dir \[$this curdir\] -num_lbs \[$this cget -num_lbs\]" } else { $m add command -label "Clone Window" -underline 2 \ - -command "dsk_FileList .fl\[dsk_FileList :: id\] \ + -command "dsk_FileList .fl\[dsk_FileList::id\] \ -dir \[$this curdir\]" } if [winfo exists .dsk_appbar] { @@ -303,7 +305,7 @@ bind $m.mhf " set tkdesk(file_lb,control) 1 [bind Menu ]" - $m add command -label "Close Window" -command "$this delete" + $m add command -label "Close Window" -command "itcl::delete object $this" # ---- Directories Menu menubutton $frame.mbDirs -text "Directory" -underline 0 \ @@ -329,13 +331,13 @@ $m add separator $m add command -label "Open Trash Can" -underline 0 \ - -command "dsk_FileList .dfl\[dsk_FileList :: id\] \ + -command "dsk_FileList .dfl\[dsk_FileList::id\] \ -directory $tkdesk(trashdir)" $m add command -label "Empty Trash Can" -underline 0 \ -command "dsk_empty_trash" if {[info exists tkdesk(deskdir)]} { $m add command -label "Open Desktop" -underline 0 \ - -command "dsk_FileList .dfl\[dsk_FileList :: id\] \ + -command "dsk_FileList .dfl\[dsk_FileList::id\] \ -directory $tkdesk(deskdir)" } @@ -378,7 +380,7 @@ set m $frame.mbOthers.menu #$m add command -label "Open Browser View" -underline 0 \ - -command "dsk_FileViewer .fv\[dsk_FileViewer :: id\] \ + -command "dsk_FileViewer .fv\[dsk_FileViewer::id\] \ -dir \[$this curdir\] -num_lbs \$tkdesk(num_lbs)" $m add cascade -label "TkDesk" -menu $frame.mbOthers.menu.tkdesk $m add cascade -label "Commands" -menu $frame.mbOthers.menu.cmd @@ -387,8 +389,8 @@ $m add cascade -label "Help" -menu $frame.mbOthers.menu.help $m add separator $m add command -label "Open Browser " \ - -command "dsk_FileViewer .fv\[dsk_FileViewer :: id\] \ - -directory \[$this info public directory -value\]" + -command "dsk_FileViewer .fv\[dsk_FileViewer::id\] \ + -directory \[$this info variable directory -value\]" } # ---- Commands Menu @@ -418,7 +420,7 @@ -command {eval [_expand_pc {dsk_edit %B}]} $m add cascade -label "Buffers" -menu $m.bufs menu [set tm $m.bufs] -postcommand \ - "dsk_Editor :: bufferMenu $tm" + "dsk_Editor::bufferMenu $tm" $m add separator if [info exists tkdesk(commands)] { foreach cmd $tkdesk(commands) { @@ -482,43 +484,43 @@ menu $m $m add checkbutton -label " Long Listing " -underline 1 \ -variable tkdesk(long_listing) \ - -command "dsk_FileListbox :: longlist \$tkdesk(long_listing)" + -command "dsk_FileListbox::longlist \$tkdesk(long_listing)" $m add checkbutton -label " Show All Files " -underline 1 \ -variable tkdesk(show_all_files) \ - -command "dsk_FileListbox :: showall \$tkdesk(show_all_files)" + -command "dsk_FileListbox::showall \$tkdesk(show_all_files)" $m add checkbutton -label " Add Icons " -underline 1 \ -variable tkdesk(add_icons) \ - -command "dsk_FileListbox :: addicons \$tkdesk(add_icons)" + -command "dsk_FileListbox::addicons \$tkdesk(add_icons)" $m add checkbutton -label " Folders On Top " -underline 1 \ -variable tkdesk(folders_on_top) \ - -command "dsk_FileListbox :: topfolders \$tkdesk(folders_on_top)" + -command "dsk_FileListbox::topfolders \$tkdesk(folders_on_top)" $m add checkbutton -label " Append Type Char " -underline 2 \ -variable tkdesk(append_type_char) \ - -command "dsk_FileListbox :: typechar \$tkdesk(append_type_char)" + -command "dsk_FileListbox::typechar \$tkdesk(append_type_char)" $m add checkbutton -label " Dot: Execs Regular " -underline 1 \ -variable tkdesk(dot_regular) \ - -command "dsk_FileListbox :: dotregular \$tkdesk(dot_regular)" + -command "dsk_FileListbox::dotregular \$tkdesk(dot_regular)" $m add separator $m add cascade -label "Sort by ..." -menu [set m $m.smenu] menu $m $m add radiobutton -label " Name " \ -variable tkdesk(default_sort) -value name \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" $m add radiobutton -label " Name (fold) " \ -variable tkdesk(default_sort) -value fold \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" $m add radiobutton -label " Size " \ -variable tkdesk(default_sort) -value size \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" $m add radiobutton -label " Date " \ -variable tkdesk(default_sort) -value date \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" $m add radiobutton -label " Extension " \ -variable tkdesk(default_sort) -value ext \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" $m add radiobutton -label " Don't sort " \ -variable tkdesk(default_sort) -value not \ - -command "dsk_FileListbox :: sort \$tkdesk(default_sort)" + -command "dsk_FileListbox::sort \$tkdesk(default_sort)" # "Appearance" menu $optm add cascade -label "Appearance" -menu [set m $optm.map] @@ -532,7 +534,7 @@ -variable tkdesk(at_pointer) $m add checkbutton -label " Status in List Windows " -underline 5 \ -variable tkdesk(list_statbar) \ - -command "dsk_FileList :: status_bar \$tkdesk(list_statbar)" + -command "dsk_FileList::status_bar \$tkdesk(list_statbar)" $m add checkbutton -label " Expand Dir Bookmarks " -underline 1 \ -variable tkdesk(expand_dir_bookmarks) $m add checkbutton -label " Tear-off Menus " -underline 3 \ @@ -546,7 +548,7 @@ $m add cascade -label "Number Of Listboxes" \ -menu [set m $m.numlbs] menu $m - set num_lbs [virtual cget -num_lbs] + set num_lbs [$this cget -num_lbs] set [set this](num_lbs) $num_lbs $m add radiobutton -label " 1 Listbox" \ -variable [set this](num_lbs) \ @@ -844,13 +846,13 @@ if {[string first "%d" $title] > -1} { regsub "%d" $title \ [file tail [string trimright \ - [virtual cget -directory] "/"]]/ title + [$this cget -directory] "/"]]/ title } if {[string first "%h" $title] > -1} { regsub "%h" $title [dsk_hostname] title } if {[string first "%p" $title] > -1} { - regsub "%p" $title [cb_tilde [virtual cget -directory] collapse] \ + regsub "%p" $title [cb_tilde [$this cget -directory] collapse] \ title } if {[string first "%u" $title] > -1} { @@ -877,7 +879,7 @@ [bind Menu ]" set p [cb_tilde [string trimright \ - [virtual cget -directory] "/"] collapse] + [$this cget -directory] "/"] collapse] if {$p != ""} { set op $p while {1} { @@ -937,20 +939,20 @@ global tkdesk if ![info exists tkdesk(soundcmd)] { - foreach obj [itcl_info objects -class dsk_FileList] { + foreach obj [itcl::find objects -class dsk_FileList] { set m [$obj getToplevel].fMenu.mbOthers.menu.opts $m entryconfig [$m index *Sound*] -state disabled } - foreach obj [itcl_info objects -class dsk_FileViewer] { + foreach obj [itcl::find objects -class dsk_FileViewer] { set m [$obj getToplevel].fMenu.mbOpts.menu $m entryconfig [$m index *Sound*] -state disabled } } else { - foreach obj [itcl_info objects -class dsk_FileList] { + foreach obj [itcl::find objects -class dsk_FileList] { set m [$obj getToplevel].fMenu.mbOthers.menu.opts $m entryconfig [$m index *Sound*] -state normal } - foreach obj [itcl_info objects -class dsk_FileViewer] { + foreach obj [itcl::find objects -class dsk_FileViewer] { set m [$obj getToplevel].fMenu.mbOpts.menu $m entryconfig [$m index *Sound*] -state normal } @@ -965,12 +967,12 @@ set l "Display AppBar" set m "Hide AppBar" } - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { if [winfo exists [$fv getToplevel]] { $fv _adjust_menu $m $l } } - foreach fl [itcl_info objects -class dsk_FileList] { + foreach fl [itcl::find objects -class dsk_FileList] { if [winfo exists [$fl getToplevel]] { $fl _adjust_menu $m $l } @@ -981,8 +983,8 @@ # ----- Variables --------------------------------------------------------- # - protected textviewer "" - protected tkdesk_menu - protected topl + protected variable textviewer "" + protected variable tkdesk_menu + protected variable topl } --- tkdesk-2.0.orig/tcldesk/Desktop.tcl +++ tkdesk-2.0/tcldesk/Desktop.tcl @@ -100,7 +100,7 @@ set flist $flb } foreach file $flist { - set di .di[dsk_DeskItem :: id] + set di .di[dsk_DeskItem::id] dsk_DeskItem $di -file $file -dontmap 1 set di [$di getToplevel] update idletasks @@ -124,7 +124,7 @@ proc dsk_desktop_update {} { global tkdesk - set dilist [itcl_info objects -class dsk_DeskItem] + set dilist [itcl::find objects -class dsk_DeskItem] set xoff 0 set yoff 0 @@ -140,7 +140,7 @@ continue } - set di .di[dsk_DeskItem :: id] + set di .di[dsk_DeskItem::id] dsk_DeskItem $di -file $file -dontmap 1 set di [$di getToplevel] update idletasks @@ -237,7 +237,7 @@ } wm geometry $top +[winfo pointerx $top]+[winfo pointery $top] - eval config $args + eval configure $args if [file isdirectory $file] { blt_drag&drop target $top.i handler file "$this _dd_drop dir %v" @@ -285,11 +285,12 @@ # ---- Methods ----------------------------------------------------------- - method config {config} {} - method configure {config} {} + method config {args} { + eval configure $args + } method cget {pubvar} { - return [virtual set [string trimleft $pubvar -]] + return [$this set [string trimleft $pubvar -]] } method drag {cmd args} { @@ -322,7 +323,7 @@ } } - delete + itcl::delete object $this } method open {} { @@ -335,7 +336,7 @@ } else { dsk_bell if {[cb_yesno "The associated file/directory has been deleted from outside TkDesk. Remove desk item?"] == 0} { - $this delete + itcl::delete object $this } } } @@ -515,7 +516,7 @@ proc move {ofile nfile} { # $rfile has been moved -> adjust associated icons - foreach di [itcl_info objects -class dsk_DeskItem] { + foreach di [itcl::find objects -class dsk_DeskItem] { if ![winfo exists [$di getToplevel]] continue set file [$di cget -file] if {$file == $ofile} { @@ -529,13 +530,13 @@ proc remove {rfile} { # $rfile has been deleted -> remove associated icons - foreach di [itcl_info objects -class dsk_DeskItem] { + foreach di [itcl::find objects -class dsk_DeskItem] { if ![winfo exists [$di getToplevel]] continue set file [$di cget -file] if {$file == $rfile} { - $di delete + itcl::delete object $di } elseif {[string first $rfile/ $file] == 0} { - $di delete + itcl::delete object $di } } } @@ -543,7 +544,7 @@ # ---- Variables --------------------------------------------------------- - public file "no name" { + public variable file "no name" { global tkdesk set havematch 0 @@ -605,10 +606,10 @@ } $top.l config -text [_break_name [file tail $file]] } - public dontmap 0 + public variable dontmap 0 - protected move_x - protected move_y + protected variable move_x + protected variable move_y common id_counter 0 common width 12 --- tkdesk-2.0.orig/tcldesk/DiskUsage.tcl +++ tkdesk-2.0/tcldesk/DiskUsage.tcl @@ -84,7 +84,7 @@ frame $top.fb -bd 1 -relief raised pack $top.fb -fill x - button $top.bClose -text " Close " -command "$this delete" + button $top.bClose -text " Close " -command "itcl::delete object $this" button $top.bRefresh -text " Refresh " -command "$this refresh" pack $top.bClose $top.bRefresh -in $top.fb -side left \ -padx $tkdesk(pad) -pady $tkdesk(pad) -ipady 2 @@ -92,9 +92,9 @@ wm minsize $top 40 16 #wm geometry $top 40x15 wm title $top "Disk Usage" - wm protocol $top WM_DELETE_WINDOW "$this delete" + wm protocol $top WM_DELETE_WINDOW "itcl::delete object $this" - eval config $args + eval configure $args } destructor { @@ -104,7 +104,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method refresh {} { @@ -121,11 +122,11 @@ # ----- Variables --------------------------------------------------------- # - public dir "/" { + public variable dir "/" { $this config -directory $dir } - public directory "/" { + public variable directory "/" { global tkdesk #dsk_busy @@ -167,7 +168,7 @@ } } else { if {[wm state $top] == "withdrawn"} { - after 200 $this delete + after 200 itcl::delete object $this } } dsk_status "Ready." @@ -193,7 +194,7 @@ } if {$dir != ""} { - dsk_DiskUsage .du[dsk_DiskUsage :: id] -directory $dir + dsk_DiskUsage .du[dsk_DiskUsage::id] -directory $dir } } --- tkdesk-2.0.orig/tcldesk/Editor.tcl +++ tkdesk-2.0/tcldesk/Editor.tcl @@ -186,7 +186,7 @@ $m add command -label "Save as... " -underline 5 \ -command "$this save as" $m add command -label "Save all" -underline 2 \ - -command "dsk_Editor :: save_all" + -command "dsk_Editor::save_all" $m add command -label "Print... " -underline 0 \ -command "$this print" \ -accelerator [lindex $accel(file,print) 0] @@ -349,7 +349,7 @@ pack $top.fMenu.mbBuffer -side left menu $top.fMenu.mbBuffer.menu \ - -postcommand "dsk_Editor :: bufferMenu $top.fMenu.mbBuffer.menu $this" + -postcommand "dsk_Editor::bufferMenu $top.fMenu.mbBuffer.menu $this" # add dummy entry to work around bug in pre Tk 4.0p2: $top.fMenu.mbBuffer.menu add command -label "dummy" @@ -524,7 +524,7 @@ update idletasks wm geometry $top-icon \ [winfo reqwidth $top-icon]x[winfo reqheight $top-icon] - wm protocol $top-icon WM_DELETE_WINDOW "$this delete" + wm protocol $top-icon WM_DELETE_WINDOW "itcl::delete object $this" wm iconwindow $top $top-icon update idletasks } else { @@ -550,7 +550,7 @@ } if {$args != {}} { - eval config $args + eval configure $args } if {!$files_set} { cb_deiconify $top @@ -571,7 +571,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -1169,7 +1170,7 @@ return "" } else { if !$dontdel { - $this delete + itcl::delete object $this } } } @@ -2358,7 +2359,7 @@ if ![info exists buffer($id,file)] continue if ![info exists changed($id)] continue if {$win != ""} { - set currentid [$win info protected currentid -value] + set currentid [$win info variable currentid -value] } else { set currentid -1 } @@ -2418,7 +2419,7 @@ } } - if {[itcl_info objects $w] != {}} { + if {[itcl::find objects $w] != {}} { $w buffer create $file 0 0 } } @@ -2431,7 +2432,7 @@ # ----- Variables --------------------------------------------------------- # - public files "" { + public variable files "" { set files_set 1 set dont_display 1 set id -1 @@ -2452,23 +2453,23 @@ dsk_status_ready } - public name "" { + public variable name "" { set buffer($currentid,file) $name wm title $top [cb_tilde $name collapse] wm iconname $top "[file tail $name]" } - protected currentid -1 - protected match_range "" - protected search_regexp "" - protected hsearch_lnr "" - protected autosavecount 0 - protected autosaveperiod 500 - protected undo_size 500 - protected dont_display 0 - protected files_set 0 - protected stat_label + protected variable currentid -1 + protected variable match_range "" + protected variable search_regexp "" + protected variable hsearch_lnr "" + protected variable autosavecount 0 + protected variable autosaveperiod 500 + protected variable undo_size 500 + protected variable dont_display 0 + protected variable files_set 0 + protected variable stat_label common buffer common bufcount 0 @@ -2503,19 +2504,19 @@ set w "" switch -- $cmd { new { - set w .de[dsk_Editor :: id] + set w .de[dsk_Editor::id] dsk_Editor $w $w buffer new {} } load { - set w .de[dsk_Editor :: id] + set w .de[dsk_Editor::id] dsk_Editor $w foreach file $args { $w buffer create $file } } string { - set w .de[dsk_Editor :: id] + set w .de[dsk_Editor::id] dsk_Editor $w $w buffer new {} eval [$w getToplevel].ft.text insert end $args @@ -2523,15 +2524,15 @@ # $w _changing } delall { - foreach obj [itcl_info objects -class dsk_Editor] { + foreach obj [itcl::find objects -class dsk_Editor] { catch {$obj close_win} } } fileview { set w [lindex $args 0] set file [lindex $args 1] - if {[itcl_info objects $w] == {}} { - set w .de[dsk_Editor :: id] + if {[itcl::find objects $w] == {}} { + set w .de[dsk_Editor::id] dsk_Editor $w set dsk_editor($w,viewerid) "" } @@ -2543,12 +2544,12 @@ } quickload { set w [lindex $args 0] - if {[itcl_info objects $w] == {}} { + if {[itcl::find objects $w] == {}} { catch {unset tkdesk(quick_load_editor)} return } set file [lindex $args 1] - dsk_Editor :: load_or_display $w $file + dsk_Editor::load_or_display $w $file } cmd { set cnt [incr dsk_editor(cnt)] @@ -2600,7 +2601,7 @@ cd ~ if $tkdesk(exec_as_root) return - set w .de[dsk_Editor :: id] + set w .de[dsk_Editor::id] dsk_Editor $w set win [$w getToplevel] $w buffer new {} --- tkdesk-2.0.orig/tcldesk/FileInfo.tcl +++ tkdesk-2.0/tcldesk/FileInfo.tcl @@ -163,7 +163,7 @@ wm title $top "File Information" wm protocol $top WM_DELETE_WINDOW "$this close" - eval config $args + eval configure $args } destructor { @@ -186,14 +186,15 @@ } if {[info tclversion] >= 8.0} { - $this delete + itcl::delete object $this } else { wm withdraw $top dsk_FileInfo::cache add $this } } - method config {config} { + method config {args} { + eval configure $args } method touch {} { @@ -513,7 +514,7 @@ switch $cmd { "get" { if {$objectCache == {}} { - return [eval dsk_FileInfo .fi[dsk_FileInfo :: id] $args] + return [eval dsk_FileInfo .fi[dsk_FileInfo::id] $args] } else { #puts "objectCache before: $objectCache" set obj [lindex $objectCache 0] @@ -533,7 +534,7 @@ # ----- Variables --------------------------------------------------------- # - public file "" { + public variable file "" { set file [cb_tilde $file expand] dsk_debug "dsk_FileInfo config file: $file" @@ -542,9 +543,9 @@ } } - protected owner - protected group - protected fmode + protected variable owner + protected variable group + protected variable fmode common id 0 common objectCache {} @@ -588,9 +589,9 @@ if {[info tclversion] >= 8.0} { # itcl 3.x seems to disallow object creation through # class procs - dsk_FileInfo .fi[dsk_FileInfo :: id] -file $file + dsk_FileInfo .fi[dsk_FileInfo::id] -file $file } else { - dsk_FileInfo :: cache get -file $file + dsk_FileInfo::cache get -file $file } } } --- tkdesk-2.0.orig/tcldesk/FileListbox.tcl +++ tkdesk-2.0/tcldesk/FileListbox.tcl @@ -162,8 +162,8 @@ $frame.mb.menu add cascade -label "Sort by ... " -menu $frame.mb.menu.smenu $frame.mb.menu add separator $frame.mb.menu add command -label "Open List Window" \ - -command "dsk_FileList .dfl\[dsk_FileList :: id\] \ - -directory \[$this info public directory -value\]" + -command "dsk_FileList .dfl\[dsk_FileList::id\] \ + -directory \[$this info variable directory -value\]" menu $frame.mb.menu.smenu $frame.mb.menu.smenu add radiobutton -label " Name " \ @@ -486,7 +486,7 @@ bind listimg-$frame {# nothing} $this _build_ls_cmd - eval config $args + eval configure $args $frame.dlb show_hsb $longlist } @@ -494,7 +494,7 @@ destructor { global [set this] - $frame.dlb delete + itcl::delete object $frame.dlb ::unset [set this] } @@ -502,7 +502,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -668,7 +669,7 @@ method _ask_mask {} { - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title " Set Mask " \ -label "Mask for files to show or select:" \ -history mask_history \ @@ -1020,7 +1021,7 @@ } dsk_debug "_quick_info file: $file" - set o [lindex [itcl_info objects -class dsk_FileInfo] 0] + set o [lindex [itcl::find objects -class dsk_FileInfo] 0] if {$o != {}} { set w [$o getToplevel] if [winfo exists $w] { @@ -1224,7 +1225,7 @@ } proc font {fnt} { - foreach obj [itcl_info objects -class dsk_FileListbox] { + foreach obj [itcl::find objects -class dsk_FileListbox] { if [winfo exists $obj.dlb.text] { $obj.dlb.text config -font [cb_font $fnt] } @@ -1233,7 +1234,7 @@ } proc color {col} { - foreach obj [itcl_info objects -class dsk_FileListbox] { + foreach obj [itcl::find objects -class dsk_FileListbox] { if [winfo exists $obj.dlb.text] { $obj.dlb.text config -foreground $col } @@ -1251,7 +1252,7 @@ proc showall {val} { set _showall $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { if {[$object cget -showall] != $val} { $object config -showall $val } @@ -1260,7 +1261,7 @@ proc longlist {val} { set _longlist $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { #if {[$object cget -longlist] != $val} { $object config -longlist $val #} @@ -1269,28 +1270,28 @@ proc topfolders {val} { set _topfolders $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { $object config -topfolders $val } } proc typechar {val} { set _typechar $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { $object config -typechar $val } } proc dotregular {val} { set _dotreg $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { $object config -dotregular $val } } proc addicons {val} { set _addicons $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { if {[$object cget -add_icons] != $val} { $object config -add_icons $val } @@ -1299,7 +1300,7 @@ proc sort {val} { set _sort $val - foreach object [itcl_info objects -class dsk_FileListbox] { + foreach object [itcl::find objects -class dsk_FileListbox] { $object config -sort $val } } @@ -1354,7 +1355,7 @@ set di [lsearch $taglist dir] set taglist [linsert $taglist $di $tname] foreach this \ - [itcl_info objects -class dsk_FileListbox] { + [itcl::find objects -class dsk_FileListbox] { [$this getLbObj] tag config $tname \ -foreground $tags($tname,color) \ -font $tags($tname,font) @@ -1384,7 +1385,7 @@ set tags($tname,image) $default_image } foreach this \ - [itcl_info objects -class dsk_FileListbox] { + [itcl::find objects -class dsk_FileListbox] { [$this getLbObj] tag config $tname \ -foreground $tags($tname,color) \ -font $tags($tname,font) @@ -1449,15 +1450,15 @@ # Options for dskC_ls: # - protected ls_cmd + protected variable ls_cmd - public invert {0} { + public variable invert {0} { $this _build_ls_cmd $this refresh ::set [set this](invert) $invert } - public sort {name} { + public variable sort {name} { global [set this] $this _build_ls_cmd @@ -1465,12 +1466,12 @@ ::set [set this](sort) $sort } - public notrivialdirs {0} { + public variable notrivialdirs {0} { $this _build_ls_cmd $this refresh } - public showall {0} { + public variable showall {0} { global [set this] $this _build_ls_cmd @@ -1478,7 +1479,7 @@ ::set [set this](showall) $showall } - public longlist {0} { + public variable longlist {0} { global [set this] $this _build_ls_cmd @@ -1487,27 +1488,27 @@ $frame.dlb show_hsb $longlist } - public topfolders {0} { + public variable topfolders {0} { $this _build_ls_cmd $this refresh } - public typechar {0} { + public variable typechar {0} { $this _build_ls_cmd $this refresh } - public dotregular {0} { + public variable dotregular {0} { #$this _build_ls_cmd $this refresh } - public add_icons {1} { + public variable add_icons {1} { $this refresh ::set [set this](add_icons) $add_icons } - public dont_refresh 0 + public variable dont_refresh 0 common _showall 0 common _longlist 0 @@ -1521,7 +1522,7 @@ # Other # - public toplevel "" { # a hack for the file list windows + public variable toplevel "" { # a hack for the file list windows global [set this] if {$toplevel != ""} { @@ -1546,16 +1547,16 @@ $frame.mb.menu add separator $frame.mb.menu add command -label "Open Browser " \ - -command "dsk_FileViewer .fv\[dsk_FileViewer :: id\] \ - -directory \[$this info public directory -value\]" + -command "dsk_FileViewer .fv\[dsk_FileViewer::id\] \ + -directory \[$this info variable directory -value\]" } } - public dir {} { + public variable dir {} { $this config -directory $dir } - public directory {} { + public variable directory {} { global tkdesk if {[string index $directory 0] == "~"} { @@ -1569,26 +1570,26 @@ } } - public mask {*} { + public variable mask {*} { $this config -directory $directory if {$toplevel == ""} { $viewer status "Ready." } } - public width {10} { + public variable width {10} { $frame.dlb config -width $width } - public height {10} { + public variable height {10} { $frame.dlb config -height $height } - public pad {4} { + public variable pad {4} { $frame.dlb config -pad $pad } - public viewer {} { + public variable viewer {} { bind $framedlb.text <1> " $viewer _selecting $this [bind $framedlb.text <1>] @@ -1607,14 +1608,14 @@ [bind $framedlb.text <3>]" } - protected _last_mask {*} - protected _last_size_stat "" - protected mtime 0 - protected refreshing 0 - protected old_selection "" - protected closed_image "" - protected invert_mask 0 - protected framedlb + protected variable _last_mask {*} + protected variable _last_size_stat "" + protected variable mtime 0 + protected variable refreshing 0 + protected variable old_selection "" + protected variable closed_image "" + protected variable invert_mask 0 + protected variable framedlb common default_image ficons16/file.xpm common path_image ficons16/diropen.xpm @@ -1671,17 +1672,17 @@ if {$pats == "!default"} { set tkdesk(color,directories) $col set tkdesk(font,directories) $font - dsk_FileListbox :: tag config "dir" [cb_col $col] $font $licon - dsk_DeskItem :: defimg dir $dicon + dsk_FileListbox::tag config "dir" [cb_col $col] $font $licon + dsk_DeskItem::defimg dir $dicon } elseif {$pats == "!symlink"} { set tkdesk(color,symdirectories) $col set tkdesk(font,symdirectories) $font - dsk_FileListbox :: tag config "symdir" [cb_col $col] $font $licon + dsk_FileListbox::tag config "symdir" [cb_col $col] $font $licon } elseif {$pats == "!opened"} { - dsk_FileListbox :: pathimage $licon + dsk_FileListbox::pathimage $licon } else { foreach pat $pats { - dsk_FileListbox :: tag create "dir $pat" [cb_col $col] $font $licon + dsk_FileListbox::tag create "dir $pat" [cb_col $col] $font $licon } } } @@ -1699,15 +1700,15 @@ if {$pats == "!default"} { set tkdesk(color,executables) $col set tkdesk(font,executables) $font - dsk_FileListbox :: tag config "exec" [cb_col $col] $font $licon - dsk_DeskItem :: defimg exec $dicon + dsk_FileListbox::tag config "exec" [cb_col $col] $font $licon + dsk_DeskItem::defimg exec $dicon } elseif {$pats == "!symlink"} { set tkdesk(color,symexecutables) $col set tkdesk(font,symexecutables) $font - dsk_FileListbox :: tag config "symexec" [cb_col $col] $font $licon + dsk_FileListbox::tag config "symexec" [cb_col $col] $font $licon } else { foreach pat $pats { - dsk_FileListbox :: tag create "exec $pat" [cb_col $col] $font $licon + dsk_FileListbox::tag create "exec $pat" [cb_col $col] $font $licon } } } @@ -1724,52 +1725,52 @@ catch {set licon [subst $licon]} catch {set dicon [subst $dicon]} if {$pats == "!default"} { - dsk_FileListbox :: font $font - dsk_FileListbox :: color [cb_col $col] - dsk_FileListbox :: defimage $licon - dsk_DeskItem :: defimg file $dicon + dsk_FileListbox::font $font + dsk_FileListbox::color [cb_col $col] + dsk_FileListbox::defimage $licon + dsk_DeskItem::defimg file $dicon } elseif {$pats == "!symlink"} { set tkdesk(color,symlinks) $col set tkdesk(font,symlinks) $font - dsk_FileListbox :: tag config "sym" [cb_col $col] $font $licon + dsk_FileListbox::tag config "sym" [cb_col $col] $font $licon } else { foreach pat $pats { - dsk_FileListbox :: tag create $pat [cb_col $col] $font $licon + dsk_FileListbox::tag create $pat [cb_col $col] $font $licon } } } } if [info exists tkdesk(file_tags,ignore)] { - dsk_FileListbox :: ignore $tkdesk(file_tags,ignore) + dsk_FileListbox::ignore $tkdesk(file_tags,ignore) } - dsk_FileListbox :: initC + dsk_FileListbox::initC } # "System" Settings -dsk_FileListbox :: font [cb_font $tkdesk(font,file_lbs)] +dsk_FileListbox::font [cb_font $tkdesk(font,file_lbs)] -dsk_FileListbox :: tag config dir \ +dsk_FileListbox::tag config dir \ [cb_col $tkdesk(color,directories)] [cb_font $tkdesk(font,directories)] -dsk_FileListbox :: tag config exec \ +dsk_FileListbox::tag config exec \ [cb_col $tkdesk(color,executables)] [cb_font $tkdesk(font,executables)] -dsk_FileListbox :: tag config sym \ +dsk_FileListbox::tag config sym \ [cb_col $tkdesk(color,symlinks)] [cb_font $tkdesk(font,symlinks)] -dsk_FileListbox :: tag config symdir \ +dsk_FileListbox::tag config symdir \ [cb_col $tkdesk(color,symdirectories)] [cb_font $tkdesk(font,symdirectories)] -dsk_FileListbox :: tag config symexec \ +dsk_FileListbox::tag config symexec \ [cb_col $tkdesk(color,symexecutables)] [cb_font $tkdesk(font,symexecutables)] # "Preferences" Settings -dsk_FileListbox :: showall $tkdesk(show_all_files) -dsk_FileListbox :: longlist $tkdesk(long_listing) -dsk_FileListbox :: topfolders $tkdesk(folders_on_top) -dsk_FileListbox :: typechar $tkdesk(append_type_char) -dsk_FileListbox :: dotregular $tkdesk(dot_regular) -dsk_FileListbox :: addicons $tkdesk(add_icons) -dsk_FileListbox :: sort $tkdesk(default_sort) +dsk_FileListbox::showall $tkdesk(show_all_files) +dsk_FileListbox::longlist $tkdesk(long_listing) +dsk_FileListbox::topfolders $tkdesk(folders_on_top) +dsk_FileListbox::typechar $tkdesk(append_type_char) +dsk_FileListbox::dotregular $tkdesk(dot_regular) +dsk_FileListbox::addicons $tkdesk(add_icons) +dsk_FileListbox::sort $tkdesk(default_sort) # "FileTags" Settings dsk_FileListbox_fileTags --- tkdesk-2.0.orig/tcldesk/Frame.tcl +++ tkdesk-2.0/tcldesk/Frame.tcl @@ -40,10 +40,12 @@ itcl_class Frame { - constructor {config} { + constructor {args} { #puts "Frame $this" #puts "class [::$this info class]" + eval configure $args + if {[info tclversion] >= 8.0} { set frame [::frame [namespace tail $this]-frame \ -class [namespace tail [$this info class]]] @@ -61,7 +63,8 @@ # ----- Methods and Procs ------------------------------------------------- - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -74,25 +77,25 @@ # ----- Class Variables -------------------------------------------------- - protected frame "" + protected variable frame "" - public bd {} { + public variable bd {} { config -borderwidth $bd } - public borderwidth {} { + public variable borderwidth {} { if [winfo exists $frame] { $frame config -bd $borderwidth } } - public bg {} { + public variable bg {} { config -background $bg } - public background {} { + public variable background {} { if [winfo exists $frame] { $frame config -bg $background } } - public relief {} { + public variable relief {} { if [winfo exists $frame] { $frame config -relief $relief } --- tkdesk-2.0.orig/tcldesk/HistEntry.tcl +++ tkdesk-2.0/tcldesk/HistEntry.tcl @@ -53,9 +53,11 @@ itcl_class dsk_HistEntry { inherit Toplevel - constructor {config} { + constructor {args} { global tkdesk [set this] + eval configure $args + if {$tkdesk(tcl_version) < 8.0} { Toplevel::constructor } @@ -162,7 +164,7 @@ cb_button $top.bCancel -text " Cancel " \ -underline 1 -command " set tkdesk(geometry,hist_entry) \[wm geometry $top\] - $this delete + itcl::delete object $this " pack $top.bOK $top.bApply -in $top.fb -side left \ @@ -214,7 +216,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method ok_pressed {{delete 1}} { @@ -225,7 +228,7 @@ [list [set [set this](entry)]] [set [set this](cbvar)] } if $delete { - delete + itcl::delete object $this ;#??? } } @@ -236,7 +239,7 @@ eval $addcallback \ [list [set [set this](entry)]] [set [set this](cbvar)] } - delete + itcl::delete object $this ;#??? } method histmenu {} { @@ -284,17 +287,17 @@ common id 0 - public label "dummy" - public title "" - public checklabel "" - public checkvalue 0 - public entrydefault "" - public entrypopupproc "" - public history "" - public callback "" - public addbutton "" - public addcallback "" - public nograb 0 - public noapply 0 + public variable label "dummy" + public variable title "" + public variable checklabel "" + public variable checkvalue 0 + public variable entrydefault "" + public variable entrypopupproc "" + public variable history "" + public variable callback "" + public variable addbutton "" + public variable addcallback "" + public variable nograb 0 + public variable noapply 0 } --- tkdesk-2.0.orig/tcldesk/List.tcl +++ tkdesk-2.0/tcldesk/List.tcl @@ -204,13 +204,13 @@ update idletasks wm geometry $top-icon \ [winfo reqwidth $top-icon]x[winfo reqheight $top-icon] - wm protocol $top-icon WM_DELETE_WINDOW "$this delete" + wm protocol $top-icon WM_DELETE_WINDOW "itcl::delete object $this" wm iconwindow $top $top-icon } else { wm iconbitmap $top @$tkdesk(library)/images/xbm/filing_open.xbm } - eval config $args + eval configure $args dsk_sound dsk_new_filelist if {$isFileSel} { @@ -238,10 +238,10 @@ pack $f.fButs -fill x button $f.bOK \ - -command "$this _fs_ok; $this delete" \ + -command "$this _fs_ok; itcl::delete object $this" \ -text " OK " -width 7 button $f.bCancel \ - -command "$this _fs_cancel; $this delete" \ + -command "$this _fs_cancel; itcl::delete object $this" \ -text "Cancel" -width 7 pack $f.bOK $f.bCancel -in $f.fButs -side left -expand y \ -padx $tkdesk(pad) -pady $tkdesk(pad) -ipady 1 @@ -254,7 +254,7 @@ set tkdesk(single_click) 0 set tkdesk(config_nostat) 1 set tkdesk(_doubleclick) 1 - $this _fs_ok; $this delete; + $this _fs_ok; itcl::delete object $this; set tkdesk(config_nostat) 0 catch {set tkdesk(single_click) \$tmpsc} catch {unset tmpsc} @@ -262,7 +262,7 @@ " wm protocol $top WM_DELETE_WINDOW \ - "$this _fs_cancel; $this delete" + "$this _fs_cancel; itcl::delete object $this" wm title $top $fileSelTitle catch {wm transient $top [[dsk_active win] getToplevel]} raise $top @@ -296,11 +296,11 @@ } } - $top.flb delete + itcl::delete object $top.flb catch {destroy $top-icon} set tkdesk(active_viewer) "" - foreach fv "[itcl_info objects -class dsk_FileViewer] \ - [itcl_info objects -class dsk_FileList]" { + foreach fv "[itcl::find objects -class dsk_FileViewer] \ + [itcl::find objects -class dsk_FileList]" { if {"$fv" != "$this"} { set tkdesk(active_viewer) $fv } @@ -311,7 +311,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -329,12 +330,12 @@ } if [winfo exists .dsk_appbar] { - $this delete + itcl::delete object $this } elseif {[dsk_active viewer] == 1} { # about to close last window dsk_exit 1 } else { - $this delete + itcl::delete object $this } } @@ -402,7 +403,7 @@ method refresh {{mode ""}} { if {$mode == "all"} { - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { $fv refresh } } @@ -489,7 +490,7 @@ return } - set dir [string trimright [$lb info public directory -value] "/"] + set dir [string trimright [$lb info variable directory -value] "/"] #set file [lindex [lindex [$lb.dlb get] [lindex $sel 0]] 0] set file [string trimright [lindex [split \ [lindex [[$lb getLbObj] get] \ @@ -510,7 +511,7 @@ if {$sel == "" || $lb == ""} { return } - set dir [string trimright [$lb info public directory -value] "/"] + set dir [string trimright [$lb info variable directory -value] "/"] #set file [lindex [lindex [$lb.dlb get] [lindex $sel 0]] 0] set file [string trimright [lindex [split \ [lindex [[$lb getLbObj] get] \ @@ -614,7 +615,7 @@ } if $tkdesk(menu,control) { - dsk_FileList .dfl[dsk_FileList :: id] -directory $dir + dsk_FileList .dfl[dsk_FileList::id] -directory $dir set tkdesk(menu,control) 0 } else { $this config -directory $dir @@ -634,7 +635,7 @@ proc status_bar {display} { global tkdesk - foreach fl [itcl_info objects -class dsk_FileList] { + foreach fl [itcl::find objects -class dsk_FileList] { $fl display_statbar $display } if $display { @@ -646,7 +647,7 @@ proc fileSelector {args} { set fs ::.flFileSel - catch {$fs delete} + catch {itcl::delete object $fs} eval dsk_FileList $fs -isFileSel 1 $args set w [$fs getToplevel] grab $w @@ -659,16 +660,16 @@ # ----- Variables --------------------------------------------------------- # - public dontmap 0 + public variable dontmap 0 - public dir {} { + public variable dir {} { if [winfo exists $top] { _configDir } } - public directory {} { + public variable directory {} { global env tkdesk if ![string match {[~/]*} $directory] { @@ -774,16 +775,16 @@ } } - public pad {4} { + public variable pad {4} { } - public isFileSel 0 - public fileSelTitle "Select File" - public fileSelLabel "Selection:" - - protected height_set 0 - protected last_directory "" - protected ypos - protected lbname + public variable isFileSel 0 + public variable fileSelTitle "Select File" + public variable fileSelLabel "Selection:" + + protected variable height_set 0 + protected variable last_directory "" + protected variable ypos + protected variable lbname common id 0 common statbar 0 --- tkdesk-2.0.orig/tcldesk/Periodic.tcl +++ tkdesk-2.0/tcldesk/Periodic.tcl @@ -137,7 +137,7 @@ wm title $top "Periodic Execution" wm protocol $top WM_DELETE_WINDOW "$this close" - eval config $args + eval configure $args wm deiconify $top } @@ -148,14 +148,15 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method close {} { global tkdesk set tkdesk(geometry,periodic) [wm geometry $top] - delete + itcl::delete object $this } method execute {} { @@ -224,7 +225,7 @@ # ----- Variables --------------------------------------------------------- # - public command "" { + public variable command "" { if {$command != ""} { if !$update_started { $this update @@ -238,12 +239,12 @@ } } - public period 10 { + public variable period 10 { $top.eSec delete 0 end $top.eSec insert end $period } - protected update_started 0 + protected variable update_started 0 common id 0 } @@ -261,9 +262,9 @@ proc dsk_periodic {{cmd ""} {period 10}} { if {$cmd != ""} { - dsk_Periodic .pe[dsk_Periodic :: id] -command $cmd -period $period + dsk_Periodic .pe[dsk_Periodic::id] -command $cmd -period $period } else { - dsk_Periodic .pe[dsk_Periodic :: id] -period $period + dsk_Periodic .pe[dsk_Periodic::id] -period $period } return } --- tkdesk-2.0.orig/tcldesk/Toplevel.tcl +++ tkdesk-2.0/tcldesk/Toplevel.tcl @@ -40,9 +40,11 @@ itcl_class Toplevel { - constructor {config} { + constructor {args} { #puts "Toplevel $this" #puts "class [$this info class]" + + eval configure $args if {[info tclversion] >= 8.0} { set top [::toplevel [namespace tail $this]-top \ @@ -61,7 +63,8 @@ # ----- Methods and Procs ------------------------------------------------- - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -74,5 +77,5 @@ # ----- Class Variables -------------------------------------------------- - protected top "x" + protected variable top "x" } --- tkdesk-2.0.orig/tcldesk/Viewer.tcl +++ tkdesk-2.0/tcldesk/Viewer.tcl @@ -69,7 +69,7 @@ itcl_class dsk_FileViewer { inherit dsk_Common Toplevel - constructor {config} { + constructor {args} { global [set this] tkdesk env cb_tools if {$tkdesk(tcl_version) < 8.0} { @@ -264,7 +264,7 @@ update idletasks wm geometry $top-icon \ [winfo reqwidth $top-icon]x[winfo reqheight $top-icon] - wm protocol $top-icon WM_DELETE_WINDOW "$this delete" + wm protocol $top-icon WM_DELETE_WINDOW "itcl::delete object $this" wm iconwindow $top $top-icon } else { wm iconbitmap $top @$tkdesk(library)/images/xbm/bigfiling.xbm @@ -277,9 +277,7 @@ # # Explicitly handle config's that may have been ignored earlier # - foreach attr $config { - config -$attr [set $attr] - } + eval configure $args dsk_sound dsk_new_filebrowser if !$dontmap { @@ -301,13 +299,13 @@ global tkdesk for {set i 0} {$i < $num_lbs_created} {incr i} { - catch "$top.lb$i delete" + catch "itcl::delete object $top.lb$i" } incr count -1 catch {destroy $top-icon} set tkdesk(active_viewer) "" - foreach fv "[itcl_info objects -class dsk_FileViewer] \ - [itcl_info objects -class dsk_FileList]" { + foreach fv "[itcl::find objects -class dsk_FileViewer] \ + [itcl::find objects -class dsk_FileList]" { if {"$fv" != "$this"} { set tkdesk(active_viewer) $fv } @@ -318,7 +316,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method cget {var} { @@ -336,12 +335,12 @@ } if [winfo exists .dsk_appbar] { - $this delete + itcl::delete object $this } elseif {[dsk_active viewer] == 1} { # about to close last window dsk_exit 1 } else { - $this delete + itcl::delete object $this } } @@ -351,7 +350,7 @@ method refresh {{mode ""}} { if {$mode == "all"} { - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { $fv refresh } } else { @@ -591,7 +590,7 @@ return } - set dir [string trimright [$lb info public directory -value] "/"] + set dir [string trimright [$lb info variable directory -value] "/"] #set file [lindex [lindex [$lb.dlb get] [lindex $sel 0]] 0] set file [string trimright [lindex [split \ [lindex [::[$lb getLbObj] get] \ @@ -616,7 +615,7 @@ if {$sel == "" || $lb == ""} { return } - set dir [string trimright [$lb info public directory -value] "/"] + set dir [string trimright [$lb info variable directory -value] "/"] #set file [lindex [lindex [$lb.dlb get] [lindex $sel 0]] 0] set file [string trimright [lindex [split \ [lindex [::[$lb getLbObj] get] \ @@ -772,7 +771,7 @@ # # fill list boxes # - dsk_FileListbox :: print_ready 0 + dsk_FileListbox::print_ready 0 for {set i $first_i} {$i < $dir_depth} {incr i} { if {$i >= $num_lbs_created && ![winfo exists $top.lb$i]} { if {$tkdesk(tcl_version) >= 8.0} { @@ -832,7 +831,7 @@ $this status "Ready. [dsk_fs_status $directory]" #$this status "Ready." } - dsk_FileListbox :: print_ready 1 + dsk_FileListbox::print_ready 1 dsk_status_ready 0 } @@ -851,11 +850,11 @@ # ----- Variables --------------------------------------------------------- # - public num_lbs 3 + public variable num_lbs 3 - public dontmap 0 + public variable dontmap 0 - public dir {} { + public variable dir {} { global tkdesk set access_ok 1 @@ -889,9 +888,9 @@ if {$access_ok} { if $tkdesk(menu,control) { if {$tkdesk(tcl_version) >= 8.0} { - set lname ::.dfl[dsk_FileList :: id] + set lname ::.dfl[dsk_FileList::id] } else { - set lname .dfl[dsk_FileList :: id] + set lname .dfl[dsk_FileList::id] } dsk_FileList $lname -directory $dir set tkdesk(menu,control) 0 @@ -902,7 +901,7 @@ } } - public directory "/" { + public variable directory "/" { global tkdesk env if {[winfo exists $top]} { @@ -912,13 +911,13 @@ } } - protected dir_depth 0 ;# depth of the current directory - protected first_lb 0 ;# number of leftmost listbox - protected num_lbs_created 0 ;# number of created listboxes (>= num_lbs) - protected lbdirs ;# array of each lb's directory - protected sb_state "packed" - protected last_directory "" - protected ls_proc {} + protected variable dir_depth 0 ;# depth of the current directory + protected variable first_lb 0 ;# number of leftmost listbox + protected variable num_lbs_created 0 ;# number of created listboxes (>= num_lbs) + protected variable lbdirs ;# array of each lb's directory + protected variable sb_state "packed" + protected variable last_directory "" + protected variable ls_proc {} common count 0 common id 0 --- tkdesk-2.0.orig/tcldesk/action.tcl +++ tkdesk-2.0/tcldesk/action.tcl @@ -124,10 +124,10 @@ dsk_debug "tkdesk(file_lb,control) $tkdesk(file_lb,control), viewer $viewer" if $tkdesk(file_lb,control) { if $tkdesk(in_browser) { - dsk_FileViewer .fv[dsk_FileViewer :: id] \ + dsk_FileViewer .fv[dsk_FileViewer::id] \ -dir "$file" -num_lbs $tkdesk(num_lbs) } else { - dsk_FileList .dfl[dsk_FileList :: id] -dir "$file" + dsk_FileList .dfl[dsk_FileList::id] -dir "$file" } set tkdesk(file_lb,control) 0 } elseif {$viewer != ""} { @@ -186,7 +186,7 @@ } elseif {$tkdesk(file_lb,control) == 2} { # called from one of the appbar special menus with Shift pressed - dsk_DeskItem .di[dsk_DeskItem :: id] \ + dsk_DeskItem .di[dsk_DeskItem::id] \ -file [cb_tilde $file expand] set tkdesk(file_lb,control) 0 @@ -612,7 +612,12 @@ } # cope with a bug in itcl 1.5 - if {[itcl_info objects $t] != {}} { + # + # Update 04/19/2004: I just ported an itcl 1.5 workaround so + # that it will work with itcl 3.x. That can't be a good thing... + # -- JCC + # + if {[itcl::find objects $t] != {}} { incr dsk_ask_exec(cnt) set t "$t$dsk_ask_exec(cnt)" } @@ -702,7 +707,7 @@ proc dsk_ask_dir {{browser ""}} { global tkdesk - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Open Directory" \ -label "Directory to open:" \ -checklabel "In Browser" \ @@ -727,10 +732,10 @@ if [file readable $tmpdir] { dsk_busy if $val { - dsk_FileViewer .fv[dsk_FileViewer :: id] \ + dsk_FileViewer .fv[dsk_FileViewer::id] \ -dir $tmpdir -num_lbs $tkdesk(num_lbs) } else { - dsk_FileList .dfl[dsk_FileList :: id] -dir $tmpdir + dsk_FileList .dfl[dsk_FileList::id] -dir $tmpdir } dsk_lazy } else { @@ -753,7 +758,7 @@ proc dsk_ask_dir {{browser ""}} { global tkdesk - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Open Directory" \ -label "Directory to open:" \ -checklabel "In Browser" \ @@ -778,10 +783,10 @@ if [file readable $tmpdir] { dsk_busy if $val { - dsk_FileViewer .fv[dsk_FileViewer :: id] \ + dsk_FileViewer .fv[dsk_FileViewer::id] \ -dir $tmpdir -num_lbs $tkdesk(num_lbs) } else { - dsk_FileList .dfl[dsk_FileList :: id] -dir $tmpdir + dsk_FileList .dfl[dsk_FileList::id] -dir $tmpdir } dsk_lazy } else { @@ -818,7 +823,7 @@ set dsk_filesel(saving) 0 } - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Select A File" \ -entrydefault [string trimright [file dirname $filter] /]/ \ -entrypopupproc dsk_filesel_file_menu \ @@ -1000,7 +1005,7 @@ } if {$dir != "" && \ - [string length [itcl_info objects $tkdesk(active_viewer)]] > 0} { + [string length [itcl::find objects $tkdesk(active_viewer)]] > 0} { if {![file isdirectory $dir] && $special == ""} { set dir [_make_path_valid $dir] catch {dsk_bell} @@ -1034,10 +1039,10 @@ if [file readable $dir] { if $tkdesk(in_browser) { - set f [dsk_FileViewer .fv[dsk_FileViewer :: id] \ + set f [dsk_FileViewer .fv[dsk_FileViewer::id] \ -directory "$dir" -num_lbs $tkdesk(num_lbs)] } else { - set f [dsk_FileList .dfl[dsk_FileList :: id] -directory "$dir"] + set f [dsk_FileList .dfl[dsk_FileList::id] -directory "$dir"] } } else { dsk_errbell @@ -1061,7 +1066,7 @@ global tkdesk if [file readable $dir] { - dsk_FileViewer .fv[dsk_FileViewer :: id] -dir $dir \ + dsk_FileViewer .fv[dsk_FileViewer::id] -dir $dir \ -num_lbs $tkdesk(num_lbs) } else { dsk_errbell @@ -1324,8 +1329,10 @@ eval dsk_exec $tkdesk(editor,cmd) $files } else { if {$files != ""} { - dsk_Editor [set e .de[dsk_Editor :: id]] -files $files - if {[string length [$e cget -files]] == 0} {$e delete} + dsk_Editor [set e .de[dsk_Editor::id]] -files $files + if {[string length [$e cget -files]] == 0} { + itcl::delete object $e + } #dsk_editor load $files } else { set e [dsk_editor new] @@ -1336,8 +1343,10 @@ if {$tkdesk(editor,cmd) != "builtin"} { dsk_exec $tkdesk(editor,cmd) $file } else { - dsk_Editor [set e .de[dsk_Editor :: id]] -files $file - if {[string length [$e cget -files]] == 0} {$e delete} + dsk_Editor [set e .de[dsk_Editor::id]] -files $file + if {[string length [$e cget -files]] == 0} { + itcl::delete object $e + } #dsk_editor load $file } } @@ -1452,7 +1461,7 @@ set noapply 0 } - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Enter String" \ -label $msg \ -entrydefault $tmpvar \ @@ -1554,7 +1563,7 @@ } } - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Print" \ -label "Print command (file names will be appended):" \ -entrydefault $cmd \ @@ -1579,7 +1588,7 @@ set cmd "lpr" } - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Print" \ -label "Print command (pipe):" \ -entrydefault $cmd \ --- tkdesk-2.0.orig/tcldesk/appbar-dialup.tcl +++ tkdesk-2.0/tcldesk/appbar-dialup.tcl @@ -77,9 +77,9 @@ if {$dsk_appbar(dialup,state) == "down" \ && !$dsk_appbar(dialup,offhook)} { if {$phonenr == {}} { - dsk_HistEntry .he[dsk_HistEntry :: id] \ + dsk_HistEntry .he[dsk_HistEntry::id] \ -title "Connect to ISP" \ - -label "Phone number to dial:" \ + -label "Provider name: (default 'provider')" \ -history dialup_history \ -callback dsk_dialup_ok } else { @@ -103,10 +103,10 @@ set nr $entry - if {[string length $nr] == 0} { - dsk_bell - return - } +# if {[string length $nr] == 0} { +# dsk_bell +# return +# } dialup_history add $nr --- tkdesk-2.0.orig/tcldesk/appbar.tcl +++ tkdesk-2.0/tcldesk/appbar.tcl @@ -380,7 +380,7 @@ wm deiconify $t _appbar_bind_global - dsk_Common :: adjustAppBarMenuEntry 1 + dsk_Common::adjustAppBarMenuEntry 1 dsk_lazy } @@ -553,7 +553,7 @@ } elseif {$me == "buffers"} { $m add cascade -label "Buffers" -menu $m.bufs menu [set tm $m.bufs] -postcommand \ - "dsk_Editor :: bufferMenu $tm" + "dsk_Editor::bufferMenu $tm" } elseif [regexp {^\*[^ ]} $me] { set cm $m.cas$_appbar_special(cas) incr _appbar_special(cas) @@ -741,7 +741,7 @@ } else { cb_info "The application bar cannot be closed because there is no file browser window on screen." } - dsk_Common :: adjustAppBarMenuEntry 0 + dsk_Common::adjustAppBarMenuEntry 0 } # --- tkdesk-2.0.orig/tcldesk/cb_tools/help.tcl +++ tkdesk-2.0/tcldesk/cb_tools/help.tcl @@ -41,7 +41,7 @@ # since the functionality is provided at a higher level through # the following class procs: # -# cb_Help :: show ?? ?? +# cb_Help::show ?? ?? # If has not yet been loaded this creates a new help # window that displays , else the respective window # is made visible. is used to define the "headings" @@ -52,16 +52,16 @@ # should be indented depending on their respective level. # This is only used if is a true regular expression. # -# cb_Help :: bind_for_context ?? +# cb_Help::bind_for_context ?? # Binds all widgets in so that F1 invokes the # "show" proc on the value of the respective array-variable # of . is a global array whose indices are the # widget names for whom there is help available. # is a list like { ??} and will -# be passed to cb_Help :: show when there is no item for +# be passed to cb_Help::show when there is no item for # the current widget. # -# cb_Help :: setfont +# cb_Help::setfont # Makes the standard font for help windows. # @@ -266,7 +266,7 @@ update idletasks wm geometry $this-icon \ [winfo reqwidth $this-icon]x[winfo reqheight $this-icon] - wm protocol $this-icon WM_DELETE_WINDOW "$this delete" + wm protocol $this-icon WM_DELETE_WINDOW "itcl::delete object $this" wm iconwindow $this $this-icon } else { wm iconbitmap $this @$cb_tools(path)/bitmaps/help.xbm @@ -321,6 +321,15 @@ # $file is a pipe set err [catch "set fd \[open \{$file\}\]"] } else { + if {![file exists $file]} { + foreach auto_ext {.gz .z .Z} { + if {[file exists "$file$auto_ext"]} { + set file "$file$auto_ext" + set cb_help($this,public,file) $file + break + } + } + } #foreach fake_ext {"" .gz .z .Z} { set ext [file extension $file];#$fake_ext if {$ext == ".gz" || $ext == ".z"} { --- tkdesk-2.0.orig/tcldesk/cb_tools/itcl_reload.tcl +++ tkdesk-2.0/tcldesk/cb_tools/itcl_reload.tcl @@ -35,17 +35,17 @@ # ---------------------------------------------------------------------- proc itcl_unload {args} { foreach class [eval itcl_dependencies $args] { - foreach o [itcl_info objects -class $class] { - $o delete + foreach o [itcl::find objects -class $class] { + itcl::delete object $o } - rename $class {} + itcl::delete class $class } foreach class $args { - foreach o [itcl_info objects -class $class] { - $o delete + foreach o [itcl::find objects -class $class] { + itcl::delete object $o } - rename $class {} + itcl::delete class $class } } @@ -86,11 +86,11 @@ set depends(x) make-this-an-array unset depends(x) - set classes [itcl_info classes] + set classes [itcl::find classes] foreach class $args { foreach dclass $classes { if {$dclass != $class} { - set hier [$dclass :: info heritage] + set hier [$dclass::info heritage] if {[lsearch $hier $class] >= 0} { set depends($dclass) $class } --- tkdesk-2.0.orig/tcldesk/cb_tools/tools.tcl +++ tkdesk-2.0/tcldesk/cb_tools/tools.tcl @@ -306,7 +306,7 @@ set cb_tools(restarting) 1 if {[info commands "itcl_class"] == "itcl_class"} { - eval itcl_unload [itcl_info classes] + eval itcl_unload [itcl::find classes] } foreach w [winfo children .] {catch {destroy $w}} @@ -577,21 +577,21 @@ set img [image create photo -file $file] } bmp { - if [auto_execok bmptoppm] { + if {"" ne [auto_execok bmptoppm]} { set img [image create photo -data [exec bmptoppm $file]] } else { error "couldn't find bmptoppm" } } pcx { - if [auto_execok pcxtoppm] { + if {"" ne [auto_execok pcxtoppm]} { set img [image create photo -data [exec pcxtoppm $file]] } else { error "couldn't find pcxtoppm" } } pict { - if [auto_execok picttoppm] { + if {"" ne [auto_execok picttoppm]} { set img [image create photo -data [exec picttoppm $file]] } else { error "couldn't find picttoppm" @@ -604,9 +604,22 @@ if {[lsearch [image types] "pixmap"] > -1} { set img [image create pixmap -file $file] } else { - if [auto_execok xpmtoppm] { - exec xpmtoppm $file >/tmp/[pid].ppm 2>/dev/null - set img [image create photo -file /tmp/[pid].ppm] + if {"" ne [auto_execok xpmtoppm]} { + set err 1 + set fd "" + for {set i 0} {$err != 0} {incr i} { + set err [catch { + set fd [open /tmp/[expr [pid] + $i].ppm + {WRONLY CREAT EXCL} 0600]}] + if {$err == 0} { + set fname /tmp/[expr [pid] + $i].ppm + close $fd + } + } + + exec xpmtoppm $file > $fname 2>/dev/null + set img [image create photo -file $fname] + exec rm -f $fname } else { error "couldn't find xpmtoppm" } @@ -797,4 +810,4 @@ } set RNG_seed [expr ($RNG_seed*7141+54773) % $max] return [expr int(double($RNG_seed)*[lindex $args 0]/$max)] -} \ No newline at end of file +} --- tkdesk-2.0.orig/tcldesk/config.tcl +++ tkdesk-2.0/tcldesk/config.tcl @@ -224,7 +224,7 @@ } } - #dsk_Editor .de[dsk_Editor :: id] -files $clist + #dsk_Editor .de[dsk_Editor::id] -files $clist set ed $tkdesk(editor,cmd) if [info exists tkdesk(conf_editor,cmd)] { set tkdesk(editor,cmd) $tkdesk(conf_editor,cmd) @@ -501,12 +501,12 @@ } set tkdesk(trashdir) [cb_tilde $tkdesk(trashdir) expand] - dsk_Listbox :: selcolor [cb_col $tkdesk(color,listsel)] - dsk_Listbox :: modifier $tkdesk(use_old_modifiers) - dsk_Listbox :: scrollbarside $tkdesk(side_of_scrollbars) + dsk_Listbox::selcolor [cb_col $tkdesk(color,listsel)] + dsk_Listbox::modifier $tkdesk(use_old_modifiers) + dsk_Listbox::scrollbarside $tkdesk(side_of_scrollbars) #set tkdesk(file_lb,minwidth) $tkdesk(file_lb,width) - dsk_DeskItem :: set_width $tkdesk(desk_items,label_width) + dsk_DeskItem::set_width $tkdesk(desk_items,label_width) # Backward compatibility: set tkdesk(strict_motif) $tk_strictMotif @@ -679,8 +679,8 @@ dsk_setup_server } - dsk_FileList :: status_bar $tkdesk(list_statbar) - dsk_FileListbox :: dotregular $tkdesk(dot_regular) + dsk_FileList::status_bar $tkdesk(list_statbar) + dsk_FileListbox::dotregular $tkdesk(dot_regular) option add *Menu.tearOff $tkdesk(tearoff-menus) set tk_strictMotif $tkdesk(strict_motif) @@ -865,7 +865,7 @@ if ![info exists tkdesk(soundcmd)] { set tkdesk(use_sound) 0 } - dsk_Common :: setSoundEntryState + dsk_Common::setSoundEntryState return } @@ -1102,7 +1102,7 @@ dsk_status "Saving Layout ..." foreach class {dsk_FileViewer dsk_FileList dsk_DeskItem \ dsk_HistEntry} { - set obj_list [itcl_info objects -class $class] + set obj_list [itcl::find objects -class $class] foreach obj $obj_list { set top [$obj getToplevel] if ![winfo exists $top] continue @@ -1307,7 +1307,7 @@ dsk_FileViewer { set tkdesk(have_window) 1 dsk_progress "Creating a file browser..." - set win .fv[dsk_FileViewer :: id] + set win .fv[dsk_FileViewer::id] set nlb [lindex $l 4] if {$nlb == ""} { set nlb $tkdesk(num_lbs) @@ -1336,7 +1336,7 @@ dsk_FileList { set tkdesk(have_window) 1 dsk_progress "Creating a file list..." - set win .dfl[dsk_FileList :: id] + set win .dfl[dsk_FileList::id] dsk_FileList $win -dir [lindex $l 1] -dontmap 1 set win [$win getToplevel] #wm withdraw $win @@ -1360,7 +1360,7 @@ set tkdesk(have_window) 1 } dsk_progress "Creating a desk item..." - set win .di[dsk_DeskItem :: id] + set win .di[dsk_DeskItem::id] dsk_DeskItem $win -file $itemname -dontmap 1 set win [$win getToplevel] #wm withdraw $win @@ -1432,10 +1432,10 @@ ButtonBar { cb_image !reset read_ButtonBar - foreach br [itcl_info objects -class dsk_FileViewer] { + foreach br [itcl::find objects -class dsk_FileViewer] { $br _button_bar } - foreach fl [itcl_info objects -class dsk_FileList] { + foreach fl [itcl::find objects -class dsk_FileList] { $fl _button_bar } } @@ -1449,15 +1449,15 @@ } FileTags { #dsk_reread_config - dsk_FileListbox :: tag reset + dsk_FileListbox::tag reset cb_image !reset read_FileTags - foreach fl [itcl_info objects -class dsk_FileListbox] { + foreach fl [itcl::find objects -class dsk_FileListbox] { if [winfo exists [$fl getFrame]] { $fl refresh } } - foreach di [itcl_info objects -class dsk_DeskItem] { + foreach di [itcl::find objects -class dsk_DeskItem] { if [winfo exists [$di getToplevel]] { $di refresh } @@ -1525,9 +1525,9 @@ # foreach obj [itcl_info objects -class $class] { # $obj delete # } -# $class :: id reset +# $class::id reset # } -# dsk_Editor :: id reset +# dsk_Editor::id reset # foreach topname {dsk_ask_exec dsk_ask_dir dsk_jobs dsk_copy \ # dsk_delete dsk_appbar dsk_find_annotation} { # catch "destroy .$topname" @@ -1553,7 +1553,7 @@ proc dsk_persave_config {} { global tkdesk - if {[itcl_info objects -class dsk_FileViewer] != ""} { + if {[itcl::find objects -class dsk_FileViewer] != ""} { dsk_save_config after [expr $tkdesk(update,config) * 60000] dsk_persave_config } @@ -1620,7 +1620,7 @@ set tkdesk(_cmdmenu,cnt) 0 if [info exists tkdesk(commands)] { foreach class "dsk_FileViewer dsk_FileList" { - foreach t [itcl_info objects -class $class] { + foreach t [itcl::find objects -class $class] { if {$class == "dsk_FileViewer"} { set m [$t getToplevel].fMenu.mbCmds.menu } else { @@ -1725,7 +1725,7 @@ set tkdesk(_dirmenu,cnt) 0 if [info exists tkdesk(directories)] { foreach class "dsk_FileViewer dsk_FileList" { - foreach t [itcl_info objects -class $class] { + foreach t [itcl::find objects -class $class] { set m [$t getToplevel].fMenu.mbDirs.menu set fe [expr [$m cget -tearoff] ? 11 : 10] catch "$m delete $fe last" --- tkdesk-2.0.orig/tcldesk/configs/AppBar +++ tkdesk-2.0/tcldesk/configs/AppBar @@ -143,8 +143,8 @@ ### get the phone number selected in dsk_dialup passed as first ### argument, to be able to dial the correct phone number.) -set tkdesk(appbar,dialup,cmd_up) "/etc/ppp/ppp-on" -set tkdesk(appbar,dialup,cmd_down) "/etc/ppp/ppp-off" +set tkdesk(appbar,dialup,cmd_up) "/usr/bin/pon" +set tkdesk(appbar,dialup,cmd_down) "/usr/bin/poff" # Another possible dialing alternative... #set tkdesk(appbar,dialup,cmd_up) "/usr/bin/wvdial" @@ -342,8 +342,8 @@ {{Communicator: Inbox} {dsk_netscape rcmd mail}} {{Communicator: Send Mail} {dsk_netscape rcmd send}} {{Thunderbird} {dsk_exec thunderbird}} - {{Netscape Mail} {dsk_netscape url mailbox:}} {{Elm} {eval dsk_exec $tkdesk(cmd,xterm) -geometry 80x40 -e elm}} + {{Mutt} {eval dsk_exec $tkdesk(cmd,xterm) -geometry 80x40 -e mutt}} - {{Outgoing Mail} {dsk_view mailq}} {{Directory } {dsk_open_dir ~/Mail}} @@ -449,21 +449,22 @@ {{next/paintbrush.xpm} { {{Graphics etc.}} - - {{XV} {dsk_exec xv}} + {{ImageMagick} {dsk_exec display}} {{The Gimp} {dsk_exec gimp}} {{XPaint} {dsk_exec xpaint}} {{XFig} {dsk_exec xfig}} + {{XV} {dsk_exec xv}} - {{XSpread} {dsk_exec xspread}} - {{dd} {dsk_exec xv %A}} + {{dd} {dsk_exec display %A}} }} {{next/netscape.xpm} { {{Internet}} - - {{Netscape} {dsk_exec netscape}} + {{Mozilla} {dsk_exec mozilla}} {{Open URL...} { - dsk_read_string {Open URL using Netscape:} { + dsk_read_string {Open URL using Mozilla/Netscape:} { # view_manual_page is defined in file Local dsk_netscape url $dsk_read_string window } @@ -491,6 +492,7 @@ } {{Locations} {{TkDesk Home } {dsk_netscape url http://tkdesk.sourceforge.net window}} + {{Debian Project } {dsk_netscape url http://www.debian.org window}} - {{Freshmeat } {dsk_netscape url http://www.freshmeat.net window}} {{Slashdot } {dsk_netscape url http://www.slashdot.org window}} @@ -512,7 +514,7 @@ {{Dial-up Networking}} - {{Connect/Disconnect} {dsk_dialup}} - {{Information (ifconfig)} {dsk_view ifconfig}} + {{Information (ifconfig)} {dsk_view /sbin/ifconfig}} }} {{next/PrinterHP.xpm} { --- tkdesk-2.0.orig/tcldesk/configs/AppBar_Be +++ tkdesk-2.0/tcldesk/configs/AppBar_Be @@ -141,8 +141,8 @@ ### get the phone number selected in dsk_dialup passed as first ### argument, to be able to dial the correct phone number.) -set tkdesk(appbar,dialup,cmd_up) "/etc/ppp/ppp-on" -set tkdesk(appbar,dialup,cmd_down) "/etc/ppp/ppp-off" +set tkdesk(appbar,dialup,cmd_up) "/usr/bin/pon" +set tkdesk(appbar,dialup,cmd_down) "/usr/bin/poff" # Another possible dialing alternative... #set tkdesk(appbar,dialup,cmd_up) "/usr/bin/wvdial" --- tkdesk-2.0.orig/tcldesk/configs/Commands +++ tkdesk-2.0/tcldesk/configs/Commands @@ -65,25 +65,36 @@ {{Octal} {dsk_view od -t o -A x %s}} {{Characters} {dsk_view od -t c -A x %s}} {{Strings} {dsk_view od -s -A x %s}} + {{Hex and Strings} {dsk_view hexdump -e {"%06.6_ax " 16/1 "%02x "} -e {" " "%_p"} -e {"\n"} %s}} } - {{RPM...} + {{DEB...} {.} - {{Installed RPM's} {dsk_view rpm -q -a | sort}} - {{Info about RPM...} { - dsk_read_string {Display info about RPM package:} { - dsk_view rpm -q -i $dsk_read_string + {{Installed DEB's} {dsk_view dpkg --list}} + {{Info about installed DEB...} { + dsk_read_string {Display info about an installed DEB package:} { + dsk_view dpkg --status $dsk_read_string } }} - {{Show An RPM's Files...} { - dsk_read_string {Display files of RPM package:} { - dsk_view rpm -q -l $dsk_read_string + {{Show An Installed DEB's Files...} { + dsk_read_string {Display files of an installed DEB package:} { + dsk_view dpkg --listfiles $dsk_read_string } }} - {{Uninstall RPM...} { - dsk_read_string {Uninstall RPM package:} { - dsk_exec_as_root rpm -e $dsk_read_string + {{Remove DEB...} { + dsk_read_string {Remove DEB package:} { + dsk_exec_as_root dpkg --remove $dsk_read_string } }} + {{Purge DEB...} { + dsk_read_string {Purge DEB package:} { + dsk_exec_as_root dpkg --purge $dsk_read_string + } + }} + {{Install a package with apt-get} { + dsk_read_string {Package name:} { + dsk_exec_as_root apt-get install $dsk_read_string + } + }} } } --- tkdesk-2.0.orig/tcldesk/configs/FileTags +++ tkdesk-2.0/tcldesk/configs/FileTags @@ -82,6 +82,7 @@ {{.*rc} {$tkdesk(color,foreground)} {} {ficons16/system.xpm} {ficons32/system.xpm}} {{*.rpm} {$tkdesk(color,foreground)} {} {ficons16/rpm.xpm}} + {{*.deb} {$tkdesk(color,foreground)} {} {ficons16/deb.xpm}} {{*.sgml} {SeaGreen}} {{{*.tar.z} {*.tar.gz} {*.tgz} {*.tar.Z} {*.taz} {*.t.Z}} {$tkdesk(color,foreground)} {} --- tkdesk-2.0.orig/tcldesk/configs/Popups +++ tkdesk-2.0/tcldesk/configs/Popups @@ -104,7 +104,7 @@ - {{Make tar.gz} {dsk_exec tar cf - -C %d %f | gzip >[string_replace %s " " "_"].tar.gz}} {{Make zip} {dsk_exec zip -r %s.zip %f}} - {{Which rpm} {dsk_view rpm -qfli %s}} + {{Which deb} {dsk_view dpkg -S %s}} }} } @@ -137,7 +137,7 @@ {{Edit} {dsk_edit %s}} {{Strip} {dsk_exec strip %s}} {{Libraries} {dsk_view ldd %s}} - {{Which rpm} {dsk_view rpm -qfli %s}} + {{Which deb} {dsk_view dpkg -S %s}} }} } @@ -195,8 +195,8 @@ {{*.deb} { {{Info } {dsk_view dpkg --info %s}} - - {{Install} {eval dsk_exec $tkdesk(cmd,xterm) -sl 256 -T "dpkg -i %f" -e pauseme "dpkg -i %s"}} - {{List} {dsk_view dpkg-deb -c %s}} + {{Install} {eval dsk_exec_as_root $tkdesk(cmd,xterm) -sl 256 -T "dpkg -i %f" -e pauseme "dpkg -i %s"}} + {{List Contents} {dsk_view dpkg-deb -c %s}} {{Extract} {dsk_exec dpkg-deb -x %s ./}} }} {{{*.diff} {*.patch}} { @@ -214,9 +214,9 @@ {{-> Postscript } {dsk_exec dvips %s}} }} {{{*.gif} {*.jpg} {*.jpeg} {*.bmp} {*.pcx} {*.p?m} {*.rle} {*.tif} {*.tga} {*.png}} { - {{View (xv)} {dsk_exec xv %s}} - {{Background (tiled)} {dsk_exec xv -root -quit %s}} - {{Background (expand)} {dsk_exec xv -root -max -smooth -quit %s}} + {{View (xview)} {dsk_exec xview -quiet %s}} + {{Background (tiled)} {dsk_exec xsetbg %s}} + {{Background (expand)} {dsk_exec xsetbg -fullscreen %s}} }} {{{*.html} {*.htm}} { {{Netscape (new window)} {dsk_netscape file %s window}} @@ -394,13 +394,13 @@ }} }} {{*.xbm} { - {{View (xv)} {dsk_exec xv %s}} + {{View (xview)} {dsk_exec xview -quiet %s}} {{Edit (bitmap)} {dsk_exec bitmap %s}} {{Edit ASCII} {dsk_edit %s}} }} {{*.xpm} { + {{View (xview)} {dsk_exec xview -quiet %s}} {{View (sxpm)} {dsk_exec sxpm %s}} - {{View (xv)} {dsk_exec xv %s}} {{Edit (pixmap)} {dsk_exec pixmap -filename %s}} {{Edit ASCII} {dsk_edit %s}} }} @@ -436,7 +436,7 @@ {{Open Directory} {dsk_open_dir %d}} {{Print...} {dsk_print %s}} {{Mail to...} {dsk_mail %s}} - {{Which rpm} {dsk_view rpm -qfli %s}} + {{Which deb} {dsk_view dpkg -S %s}} }} } --- tkdesk-2.0.orig/tcldesk/configs/Sounds +++ tkdesk-2.0/tcldesk/configs/Sounds @@ -21,6 +21,7 @@ set tkdesk(soundcmd) "cat %s >/dev/audio &" #set tkdesk(soundcmd) "play %s &" +#set tkdesk(soundcmd) "sox %s -t au /dev/audio &" ### The following lines define the file names of sounds for various TkDesk ### events. If the sound file name is not absolute, TkDesk will look for --- tkdesk-2.0.orig/tcldesk/copy.tcl +++ tkdesk-2.0/tcldesk/copy.tcl @@ -600,9 +600,9 @@ } if {$cmd == "move"} { if [file isdirectory $dest] { - dsk_DeskItem :: move $f $dest/[file tail $f] + dsk_DeskItem::move $f $dest/[file tail $f] } else { - dsk_DeskItem :: move $f $dest + dsk_DeskItem::move $f $dest } } } --- tkdesk-2.0.orig/tcldesk/cpanels.tcl +++ tkdesk-2.0/tcldesk/cpanels.tcl @@ -319,7 +319,7 @@ -padx $tkdesk(pad) -pady $tkdesk(pad) \ -expand yes -ipady 2 - catch {$f.dlb delete} + catch {itcl::delete object $f.dlb} dsk_Listbox $f.dlb -width $tkdesk(file_lb,width) -height 10 \ -font [cb_font $tkdesk(font,file_lbs)] \ -bg [cb_col $tkdesk(color,filelb)] \ --- tkdesk-2.0.orig/tcldesk/delete.tcl +++ tkdesk-2.0/tcldesk/delete.tcl @@ -349,7 +349,7 @@ dsk_refresh "$alist $dest" } foreach f $alist { - dsk_DeskItem :: remove $f + dsk_DeskItem::remove $f } if ![winfo exists $t] return if !$dsk_delete(all) { --- tkdesk-2.0.orig/tcldesk/dsk_Listbox.tcl +++ tkdesk-2.0/tcldesk/dsk_Listbox.tcl @@ -148,7 +148,7 @@ bind $frame.text "$this _sel_drag stop" set drag(afterId) {} bind $frame.text " - set tmp_cb \[$this info public callback -value\] + set tmp_cb \[$this info variable callback -value\] if {\$tmp_cb != \"\"} { eval \$tmp_cb $this \[$this select get\] } @@ -193,7 +193,7 @@ pack $frame.sb -side right -padx $pad -fill y } - eval config $args + eval configure $args update ;# idletasks } @@ -206,7 +206,8 @@ # ----- Methods and Procs ------------------------------------------------- # - method config {config} { + method config {args} { + eval configure $args } method textconfig {args} { @@ -779,13 +780,13 @@ set autosb $activate if $autosb { # (un)packing of the sb while resizing works not too well: - foreach this [itcl_info objects -class dsk_Listbox] { + foreach this [itcl::find objects -class dsk_Listbox] { bind $frame.text \ "after 200 \{catch \"$this _pack_sb\"\}; break" $this _pack_sb } } else { - foreach this [itcl_info objects -class dsk_Listbox] { + foreach this [itcl::find objects -class dsk_Listbox] { bind $frame.text {break} $this _pack_sb 1 } @@ -819,7 +820,7 @@ # ----- Variables --------------------------------------------------------- # - public pad 4 { + public variable pad 4 { pack $frame.hsb -side bottom -padx $pad -pady $pad -fill x if {$sb_packed} { pack $frame.sb -side left -padx $pad -fill y @@ -834,7 +835,7 @@ } } - public list {} { + public variable list {} { $frame.text delete 1.0 end foreach entry $list { @@ -846,7 +847,7 @@ } } - public listtext {} { + public variable listtext {} { # substitute \t: #set list [subst -nocommands -novariables $list] @@ -858,47 +859,47 @@ $frame.text insert end $listtext } - public font fixed { + public variable font fixed { $frame.text config -font [cb_font $font] } - public width 20 { + public variable width 20 { $frame.text config -width $width } - public height 10 { + public variable height 10 { $frame.text config -height $height } - public bg \#d9d9d9 { + public variable bg \#d9d9d9 { if {[winfo depth .] > 1} { $frame.text config -background $bg } } - public fg black { + public variable fg black { if {[winfo depth .] > 1} { $frame.text config -foreground $fg } } - public seltag {} { + public variable seltag {} { eval $frame.text tag config seltag $seltag } - public mode "multi" - public callback "" - public has_dots 0 + public variable mode "multi" + public variable callback "" + public variable has_dots 0 # this is only for internal use - public stop_dragging 1 + public variable stop_dragging 1 - protected sb_packed 1 - protected _pack_sb_working 0 - protected sel_start "" - protected sel_select "" - protected was_selected 0 - protected drag + protected variable sb_packed 1 + protected variable _pack_sb_working 0 + protected variable sel_start "" + protected variable sel_select "" + protected variable was_selected 0 + protected variable drag set drag(afterId) "" common mod_toggle --- tkdesk-2.0.orig/tcldesk/file_ops.tcl +++ tkdesk-2.0/tcldesk/file_ops.tcl @@ -182,7 +182,7 @@ } if {$type == "file"} { - set dsk_create(win,file) [dsk_HistEntry .dhe[dsk_HistEntry :: id] \ + set dsk_create(win,file) [dsk_HistEntry .dhe[dsk_HistEntry::id] \ -label "Name of new file:" \ -title "New File" \ -checklabel "Open in Editor" \ @@ -190,7 +190,7 @@ -callback {dsk_create_callback file} \ -nograb 1] } else { - set dsk_create(win,directory) [dsk_HistEntry .dhe[dsk_HistEntry :: id] \ + set dsk_create(win,directory) [dsk_HistEntry .dhe[dsk_HistEntry::id] \ -label "Name of new directory:" \ -title "New Directory" \ -checklabel "Open after Creation" \ @@ -264,20 +264,20 @@ file { set d [file dirname $args] set t [file tail $args] - foreach fl [itcl_info objects -class dsk_FileListbox] { + foreach fl [itcl::find objects -class dsk_FileListbox] { if {$d == [string trimright \ - [$fl info public directory -value] "/"]} { + [$fl info variable directory -value] "/"]} { [$fl getLbObj] select name $t } } } X { - if {[itcl_info objects $tkdesk(active_viewer)] != ""} { + if {[itcl::find objects $tkdesk(active_viewer)] != ""} { $tkdesk(active_viewer) select X $args } } clear { - if {[itcl_info objects $tkdesk(active_viewer)] != ""} { + if {[itcl::find objects $tkdesk(active_viewer)] != ""} { $tkdesk(active_viewer) select clear } } @@ -621,7 +621,7 @@ } else { dsk_refresh $path/ dsk_select file [list $path/$tmpnewname] - dsk_DeskItem :: move [list $file] [list $path/$tmpnewname] + dsk_DeskItem::move [list $file] [list $path/$tmpnewname] # move annotations: if [info exists tkdesk_anno($file)] { set tkdesk_anno($path/$tmpnewname) $tkdesk_anno($file) --- tkdesk-2.0.orig/tcldesk/find.tcl +++ tkdesk-2.0/tcldesk/find.tcl @@ -654,7 +654,7 @@ proc _dsk_find_lb {name} { global tkdesk - catch {$name delete} + catch {itcl::delete object $name} dsk_Listbox $name -width 10 -height 2 \ -font [cb_font $tkdesk(font,file_lbs)] \ --- tkdesk-2.0.orig/tcldesk/history.tcl +++ tkdesk-2.0/tcldesk/history.tcl @@ -35,7 +35,8 @@ itcl_class dsk_history { - constructor {config} { + constructor {args} { + eval configure $args } destructor { @@ -264,16 +265,16 @@ # ----- Variables --------------------------------------------------------- # - public size 20 - public command "" - public callback "" - - protected list {} - protected changed 1 - protected last_menu "" - protected pointer 0 - protected lock 0 - protected dirbuf "" + public variable size 20 + public variable command "" + public variable callback "" + + protected variable list {} + protected variable changed 1 + protected variable last_menu "" + protected variable pointer 0 + protected variable lock 0 + protected variable dirbuf "" common max_entry_length 80 } --- tkdesk-2.0.orig/tcldesk/itcl_reload.tcl +++ tkdesk-2.0/tcldesk/itcl_reload.tcl @@ -35,17 +35,17 @@ # ---------------------------------------------------------------------- proc itcl_unload {args} { foreach class [eval itcl_dependencies $args] { - foreach o [itcl_info objects -class $class] { - $o delete + foreach o [itcl::find objects -class $class] { + itcl::delete object $o } - rename $class {} + itcl::delete class $class } foreach class $args { - foreach o [itcl_info objects -class $class] { - $o delete + foreach o [itcl::find objects -class $class] { + itcl::delete object $o } - rename $class {} + itcl::delete class $class } } @@ -86,11 +86,11 @@ set depends(x) make-this-an-array unset depends(x) - set classes [itcl_info classes] + set classes [itcl::find classes] foreach class $args { foreach dclass $classes { if {$dclass != $class} { - set hier [$dclass :: info heritage] + set hier [$dclass::info heritage] if {[lsearch $hier $class] >= 0} { set depends($dclass) $class } --- tkdesk-2.0.orig/tcldesk/popup.tcl +++ tkdesk-2.0/tcldesk/popup.tcl @@ -206,7 +206,7 @@ if ![string match "deskitem*" $opt] { $m add separator $m add command -label "Put on Desk " -command \ - "dsk_DeskItem .di\[dsk_DeskItem :: id\] \ + "dsk_DeskItem .di\[dsk_DeskItem::id\] \ -file \"$sfile\"" } --- tkdesk-2.0.orig/tcldesk/server.tcl +++ tkdesk-2.0/tcldesk/server.tcl @@ -71,7 +71,8 @@ fconfigure $dsk_server(s_channel) -buffering none -blocking off set err 1 for {set i 0} {$err != 0} {incr i} { - set err [catch {set fd [open /tmp/tkdesks[expr [pid] + $i] w 0600]}] + set err [catch {set fd [open /tmp/tkdesks[expr [pid] + $i] {WRONLY CREAT + EXCL} 0600]}] } puts $fd [expr $port -1] --- tkdesk-2.0.orig/tcldesk/update.tcl +++ tkdesk-2.0/tcldesk/update.tcl @@ -64,12 +64,12 @@ if {[lsearch $refreshed_dirs $dir] < 0} { lappend refreshed_dirs $dir - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { catch {$fv refreshdir $dir} #$fv refreshdir $dir } - foreach fl [itcl_info objects -class dsk_FileList] { + foreach fl [itcl::find objects -class dsk_FileList] { catch {$fl refreshdir $dir} } @@ -109,7 +109,7 @@ set refreshed_toplevels "" if {[llength $lblist] == 0} { - set lblist [itcl_info objects -class dsk_FileListbox] + set lblist [itcl::find objects -class dsk_FileListbox] set revisit 1 } else { set revisit 0 @@ -119,11 +119,11 @@ if {!$tkdesk(bgexec,working)} { foreach lb $lblist { set dir "" - catch {set dir [$lb info public directory -value]} + catch {set dir [$lb info variable directory -value]} if {$dir == ""} { continue } - set mtime [$lb info protected mtime -value] + set mtime [$lb info variable mtime -value] if [file exists $dir] { # take care of a possible race condition set rmtime [expr $mtime + 1] --- tkdesk-2.0.orig/tcldesk/util.tcl +++ tkdesk-2.0/tcldesk/util.tcl @@ -129,7 +129,7 @@ foreach class {dsk_FileViewer dsk_FileList dsk_DiskUsage dsk_FileInfo dsk_Periodic dsk_Editor dsk_DeskItem} { - foreach obj [itcl_info objects -class $class] { + foreach obj [itcl::find objects -class $class] { lappend dsk_busy(busy) [$obj getToplevel] } } @@ -234,10 +234,10 @@ dsk_progress $str } - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { catch {$fv status $str $do_update} } - foreach fv [itcl_info objects -class dsk_FileList] { + foreach fv [itcl::find objects -class dsk_FileList] { catch {$fv status $str $do_update} } } @@ -251,10 +251,10 @@ dsk_progress "Waiting..." } - foreach fv [itcl_info objects -class dsk_FileViewer] { + foreach fv [itcl::find objects -class dsk_FileViewer] { catch {$fv status_ready $do_update} } - foreach fv [itcl_info objects -class dsk_FileList] { + foreach fv [itcl::find objects -class dsk_FileList] { catch {$fv status_ready $do_update} } } @@ -471,12 +471,12 @@ proc dsk_active {what {arg ""}} { global tkdesk env - if {[itcl_info objects $tkdesk(active_viewer)] == ""} { - set fvl "[itcl_info objects -class dsk_FileViewer] \ - [itcl_info objects -class dsk_FileList]" + if {[itcl::find objects $tkdesk(active_viewer)] == ""} { + set fvl "[itcl::find objects -class dsk_FileViewer] \ + [itcl::find objects -class dsk_FileList]" set tkdesk(active_viewer) [lindex $fvl 0] } - if {[itcl_info objects $tkdesk(active_viewer)] == ""} { + if {[itcl::find objects $tkdesk(active_viewer)] == ""} { set tkdesk(active_viewer) "" } dsk_debug "tkdesk(active_viewer) $tkdesk(active_viewer)" @@ -509,8 +509,8 @@ } } viewer { - return [llength "[itcl_info objects -class dsk_FileViewer] \ - [itcl_info objects -class dsk_FileList]"] + return [llength "[itcl::find objects -class dsk_FileViewer] \ + [itcl::find objects -class dsk_FileList]"] } } } --- tkdesk-2.0.orig/tkdesk.main +++ tkdesk-2.0/tkdesk.main @@ -460,35 +460,35 @@ proc dsk_widget_config {} { global tkdesk - dsk_Listbox :: selcolor [cb_col $tkdesk(color,listsel)] - dsk_Listbox :: modifier $tkdesk(use_old_modifiers) + dsk_Listbox::selcolor [cb_col $tkdesk(color,listsel)] + dsk_Listbox::modifier $tkdesk(use_old_modifiers) # "System" Settings - dsk_FileListbox :: font [cb_font $tkdesk(font,file_lbs)] + dsk_FileListbox::font [cb_font $tkdesk(font,file_lbs)] - dsk_FileListbox :: tag config dir \ + dsk_FileListbox::tag config dir \ [cb_col $tkdesk(color,directories)] \ [cb_font $tkdesk(font,directories)] - dsk_FileListbox :: tag config exec \ + dsk_FileListbox::tag config exec \ [cb_col $tkdesk(color,executables)] \ [cb_font $tkdesk(font,executables)] - dsk_FileListbox :: tag config sym \ + dsk_FileListbox::tag config sym \ [cb_col $tkdesk(color,symlinks)] \ [cb_font $tkdesk(font,symlinks)] - dsk_FileListbox :: tag config symdir \ + dsk_FileListbox::tag config symdir \ [cb_col $tkdesk(color,symdirectories)] \ [cb_font $tkdesk(font,symdirectories)] - dsk_FileListbox :: tag config symexec \ + dsk_FileListbox::tag config symexec \ [cb_col $tkdesk(color,symexecutables)] \ [cb_font $tkdesk(font,symexecutables)] # "Preferences" Settings - dsk_FileListbox :: showall $tkdesk(show_all_files) - dsk_FileListbox :: longlist $tkdesk(long_listing) - dsk_FileListbox :: topfolders $tkdesk(folders_on_top) - dsk_FileListbox :: typechar $tkdesk(append_type_char) - dsk_FileListbox :: addicons $tkdesk(add_icons) - dsk_FileListbox :: sort $tkdesk(default_sort) + dsk_FileListbox::showall $tkdesk(show_all_files) + dsk_FileListbox::longlist $tkdesk(long_listing) + dsk_FileListbox::topfolders $tkdesk(folders_on_top) + dsk_FileListbox::typechar $tkdesk(append_type_char) + dsk_FileListbox::addicons $tkdesk(add_icons) + dsk_FileListbox::sort $tkdesk(default_sort) # "FileTags" Settings dsk_FileListbox_fileTags @@ -587,12 +587,16 @@ } } -if {[info command itcl_class-orig] == ""} { - rename itcl_class itcl_class-orig - proc itcl_class {name def} { - catch {rename $name {}} - uplevel 1 itcl_class-orig $name [list $def] - } +#if {[info command itcl_class-orig] == ""} { +# rename itcl_class itcl_class-orig +# proc itcl_class {name def} { +# catch {rename $name {}} +# uplevel 1 itcl_class-orig $name [list $def] +# } +#} +proc itcl_class {name def} { + catch {itcl::delete class $name} + uplevel 1 itcl::class $name [list $def] } # Provide backward-compatibility for "history:" @@ -619,8 +623,8 @@ } dsk_progress "Initializing tcldesk..." -foreach c [itcl_info classes dsk_*] { - catch {rename $c {}} +foreach c [itcl::find classes dsk_*] { + catch {itcl::delete class $c} } if $tkdesk(no_auto_loading) { @@ -834,7 +838,7 @@ if {[winfo depth .] == 1} { set tkdesk(append_type_char) 1 - dsk_FileListbox :: typechar $tkdesk(append_type_char) + dsk_FileListbox::typechar $tkdesk(append_type_char) } # @@ -936,12 +940,12 @@ } set tkdesk(geometry,fbrowser) \ $tkdesk(file_lb,width)x$tkdesk(file_lb,height)+100+50 - dsk_FileViewer .fv[dsk_FileViewer :: id] \ + dsk_FileViewer .fv[dsk_FileViewer::id] \ -dir $dir -num_lbs $tkdesk(num_lbs) set tkdesk(geometry,fbrowser) "" # create the Trash window: - #set twin .dfl[dsk_FileList :: id] + #set twin .dfl[dsk_FileList::id] #dsk_progress "Creating the trash window..." #dsk_FileList $twin -dir $tkdesk(configdir)/.trash -dontmap 1 #update @@ -1013,7 +1017,7 @@ } } - foreach obj [itcl_info objects -class dsk_Editor] { + foreach obj [itcl::find objects -class dsk_Editor] { if [winfo exists [$obj getToplevel]] { if {[$obj close_win] == "cancel"} { return @@ -1049,12 +1053,12 @@ # clean up cb_image !reset - foreach obj [itcl_info objects -class dsk_Editor] { + foreach obj [itcl::find objects -class dsk_Editor] { if {[$obj close_win] == "cancel"} { return } } - catch {eval itcl_unload [itcl_info classes]} + catch {eval itcl_unload [itcl::find classes]} foreach w [winfo children .] {destroy $w} # and now restart --- tkdesk-2.0.orig/tools/pauseme +++ tkdesk-2.0/tools/pauseme @@ -2,7 +2,9 @@ PROG=$1 shift -$PROG "$@" +"$PROG" "$@" +exitstat=$? echo "Press return ..." read dummy +exit $exitstat