diff options
Diffstat (limited to 'tix')
-rw-r--r-- | tix/ChangeLog | 77 | ||||
-rwxr-xr-x | tix/configure | 30 | ||||
-rw-r--r-- | tix/configure.in | 2 | ||||
-rw-r--r-- | tix/generic/tixForm.c | 4 | ||||
-rw-r--r-- | tix/generic/tixGrFmt.c | 5 | ||||
-rw-r--r-- | tix/generic/tixGrRC.c | 5 | ||||
-rw-r--r-- | tix/generic/tixGrSel.c | 5 | ||||
-rw-r--r-- | tix/generic/tixGrSort.c | 5 | ||||
-rw-r--r-- | tix/generic/tixGrid.c | 5 | ||||
-rw-r--r-- | tix/generic/tixItcl.c | 5 | ||||
-rw-r--r-- | tix/generic/tixItcl.h | 13 | ||||
-rw-r--r-- | tix/generic/tixMethod.c | 5 | ||||
-rw-r--r-- | tix/generic/tk4.0/tk.tcl | 113 | ||||
-rw-r--r-- | tix/generic/tk4.1/console.tcl | 421 | ||||
-rw-r--r-- | tix/generic/tk4.1/tk.tcl | 112 | ||||
-rwxr-xr-x | tix/unix/configure | 87 | ||||
-rw-r--r-- | tix/unix/samAppInit.c | 5 | ||||
-rwxr-xr-x | tix/unix/tk8.1/configure | 143 | ||||
-rw-r--r-- | tix/unix/tk8.3/Makefile.in | 556 | ||||
-rw-r--r-- | tix/unix/tk8.3/aclocal.m4 | 1 | ||||
-rwxr-xr-x | tix/unix/tk8.3/configure | 2499 | ||||
-rw-r--r-- | tix/unix/tk8.3/configure.in | 372 | ||||
-rw-r--r-- | tix/unix/tk8.3/pkgIndex.tcl.in | 4 | ||||
-rw-r--r-- | tix/unix/tk8.3/tixAppInit.c | 112 | ||||
-rw-r--r-- | tix/win/Makefile.in | 104 | ||||
-rwxr-xr-x | tix/win/configure | 569 | ||||
-rw-r--r-- | tix/win/configure.in | 23 |
27 files changed, 5077 insertions, 205 deletions
diff --git a/tix/ChangeLog b/tix/ChangeLog index 6da6ad6f998..da2ca97b8d0 100644 --- a/tix/ChangeLog +++ b/tix/ChangeLog @@ -1,8 +1,83 @@ +2001-08-11 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Don't generate a def file by + filtering the output of running nm over the object + files. Generate an import library as a side + effect of creating the dll. Avoid creating the dll + multiple times when building with gcc. + +2001-08-11 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Add console and tixwishres objects + to WISHOBJS variable. + +2001-08-11 Mo DeJong <mdejong@cygnus.com> + + * generic/tixForm.c: + * generic/tixGrFmt.c: + * generic/tixGrRC.c: + * generic/tixGrSel.c: + * generic/tixGrSort.c: + * generic/tixGrid.c: + * generic/tixItcl.c: + * generic/tixItcl.h: + * generic/tixMethod.c: + * unix/samAppInit.c: Define TCL_STORAGE_CLASS as + DLLEXPORT when BUILD_tix is define to fix dll export + declarations under Windows. + +2001-08-09 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Remove unused LD variable. Fix up + a couple of object rules so that the -c argument + is only passed to CC once. + * win/configure: Regen. + * win/configure.in: Use AC_CANONICAL_HOST and AC_CHECK_TOOL + macros to figure out cross tool name like NM instead of + just looking at environment variables. + +2001-08-09 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Add CYGWIN and GCC variables and use + them to support building with Cygwin, Mingw, and VC++. + Remove unused nmake variables. Use GCC instead of OBJEXT + to switch between gcc and VC++ style build rules. Don't + pass libraries that are added by default when linking + with CC instead of LD. + * win/configure: Regen. + * win/configure.in: Call AC_CYGWIN, define CYGWIN and + subst it into the Makefile. Subst GCC into the Makefile. + +2001-07-12 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Compile the tkConsole81.c file when + building tix for Tcl/Tk 8.3. + +2001-07-12 Mo DeJong <mdejong@cygnus.com> + + * configure: + * configure.in: Add support for mingw32 and windows32 hosts. + +2001-06-01 Mo DeJong <mdejong@cygnus.com> + + * win/Makefile.in: Add build targets to support Tcl/Tk 8.3. + +2001-03-27 Ian Roxborough <irox@redhat.com> + + * unix/tk8.3: New directory for tcl/tk8.3 support. + + * unix/tk8.3/Makefile.in + * unix/tk8.3/aclocal.m4 + * unix/tk8.3/configure + * unix/tk8.3/configure.in + * unix/tk8.3/pkgIndex.tcl.in + * unix/tk8.3/tixAppInit.c: New files for tcl/tk8.3 support. + 2000-01-26 DJ Delorie <dj@cygnus.com> * win/tixWCmpt.c (DllMain): Use _imp__ instead of __imp_ -1999-12-06 Mo DeJong <mdejong@cygnus.com> +1999-12-06 Mo DeJong <mdejong@cygnus.com> * win/Makefile.in: removed export of symbols that start with _real@. this is needed for VC++ 6.0 diff --git a/tix/configure b/tix/configure index f40e582fcf2..545d57d5a49 100755 --- a/tix/configure +++ b/tix/configure @@ -28,6 +28,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -142,6 +143,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -312,6 +314,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -477,12 +484,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # 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" +if test -z "$sitefile"; then + 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 fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -547,7 +558,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:551: checking host system type" >&5 +echo "configure:562: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -569,7 +580,7 @@ echo "$ac_t""$host" 1>&6 case "${host}" in -*-*-cygwin*) +*cygwin* | *mingw32* | *windows32*) CONFIGDIR="win" ;; *) CONFIGDIR="unix" ;; @@ -577,7 +588,7 @@ esac echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:581: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:592: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -630,7 +641,7 @@ EOF # 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. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -732,6 +743,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g diff --git a/tix/configure.in b/tix/configure.in index a7680a451a2..b7690ce2e46 100644 --- a/tix/configure.in +++ b/tix/configure.in @@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(..) AC_CANONICAL_HOST case "${host}" in -*-*-cygwin*) +*cygwin* | *mingw32* | *windows32*) CONFIGDIR="win" ;; *) CONFIGDIR="unix" ;; diff --git a/tix/generic/tixForm.c b/tix/generic/tixForm.c index bd298fab077..66a3ad00669 100644 --- a/tix/generic/tixForm.c +++ b/tix/generic/tixForm.c @@ -45,6 +45,10 @@ typedef struct SpringList { int num; } SpringList; +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif /* * SubCommands of the tixForm command. diff --git a/tix/generic/tixGrFmt.c b/tix/generic/tixGrFmt.c index 16ba8b647f5..d9b06fc3643 100644 --- a/tix/generic/tixGrFmt.c +++ b/tix/generic/tixGrFmt.c @@ -45,6 +45,11 @@ typedef struct GridFmtStruct { int filled; } GridFmtStruct; +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + static TIX_DECLARE_SUBCMD(Tix_GrFormatBorder); static TIX_DECLARE_SUBCMD(Tix_GrFormatGrid); EXTERN TIX_DECLARE_SUBCMD(Tix_GrFormat); diff --git a/tix/generic/tixGrRC.c b/tix/generic/tixGrRC.c index 920aca56412..08ad18d4d77 100644 --- a/tix/generic/tixGrRC.c +++ b/tix/generic/tixGrRC.c @@ -15,6 +15,11 @@ #include <tixDef.h> #include <tixGrid.h> +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + static TIX_DECLARE_SUBCMD(Tix_GrRCSize); EXTERN TIX_DECLARE_SUBCMD(Tix_GrSetSize); diff --git a/tix/generic/tixGrSel.c b/tix/generic/tixGrSel.c index 9f45de68507..ef866e21c9a 100644 --- a/tix/generic/tixGrSel.c +++ b/tix/generic/tixGrSel.c @@ -15,6 +15,11 @@ #include <tixDef.h> #include <tixGrid.h> +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN TIX_DECLARE_SUBCMD(Tix_GrSelection); static TIX_DECLARE_SUBCMD(Tix_GrSelIncludes); static TIX_DECLARE_SUBCMD(Tix_GrSelModify); diff --git a/tix/generic/tixGrSort.c b/tix/generic/tixGrSort.c index 2be59eb76fb..d6ba9870eb3 100644 --- a/tix/generic/tixGrSort.c +++ b/tix/generic/tixGrSort.c @@ -44,6 +44,11 @@ static int sortCode; /* Anything other than TCL_OK means a * Forward declarations for procedures defined in this file: */ +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN TIX_DECLARE_SUBCMD(Tix_GrSort); static int SortCompareProc _ANSI_ARGS_((CONST VOID *first, diff --git a/tix/generic/tixGrid.c b/tix/generic/tixGrid.c index 716c8049703..6a0b477c62f 100644 --- a/tix/generic/tixGrid.c +++ b/tix/generic/tixGrid.c @@ -250,6 +250,11 @@ static void RecalScrollRegion _ANSI_ARGS_((WidgetPtr wPtr, Tix_GridScrollInfo *scrollInfo)); static void Tix_GrResetRenderBlocks _ANSI_ARGS_((WidgetPtr wPtr)); +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + static TIX_DECLARE_SUBCMD(Tix_GrBdType); static TIX_DECLARE_SUBCMD(Tix_GrCGet); static TIX_DECLARE_SUBCMD(Tix_GrConfig); diff --git a/tix/generic/tixItcl.c b/tix/generic/tixItcl.c index 02993d8e6dc..e64c2a8ade8 100644 --- a/tix/generic/tixItcl.c +++ b/tix/generic/tixItcl.c @@ -114,6 +114,11 @@ TixItclRestoreGlobalNameSp(nameSpPtr, interp) * with no code and symbols. */ +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN void TixItclDummy _ANSI_ARGS_((void)); diff --git a/tix/generic/tixItcl.h b/tix/generic/tixItcl.h index 57c83d1cb33..be016034393 100644 --- a/tix/generic/tixItcl.h +++ b/tix/generic/tixItcl.h @@ -38,6 +38,11 @@ typedef struct _TixItclNameSp { TixItclNameSp x; \ x.iPtr = (Interp*)(i); +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN int TixItclSetGlobalNameSp _ANSI_ARGS_(( TixItclNameSp * nameSpPtr, Tcl_Interp * interp)); EXTERN void TixItclRestoreGlobalNameSp _ANSI_ARGS_(( @@ -63,6 +68,11 @@ typedef struct _TixItclNameSp { x.iPtr = (Interp*)(i); \ x.nsToken = NULL; +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN int TixItclSetGlobalNameSp _ANSI_ARGS_(( TixItclNameSp * nameSpPtr, Tcl_Interp * interp)); EXTERN void TixItclRestoreGlobalNameSp _ANSI_ARGS_(( @@ -76,3 +86,6 @@ EXTERN void TixItclRestoreGlobalNameSp _ANSI_ARGS_(( #endif /* ITCL_2 */ #endif /* TK_8_0_OR_LATER */ + +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT diff --git a/tix/generic/tixMethod.c b/tix/generic/tixMethod.c index e09d5f371c8..388411a57de 100644 --- a/tix/generic/tixMethod.c +++ b/tix/generic/tixMethod.c @@ -475,6 +475,11 @@ static int Tix_CallMethodByContext(interp, context, widRec, method, argc, argv) #else +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN int Tix_GlobalEvalArgv _ANSI_ARGS_((Tcl_Interp * interp, Tcl_CmdInfo * cmdInfoPtr, int argc)); diff --git a/tix/generic/tk4.0/tk.tcl b/tix/generic/tk4.0/tk.tcl new file mode 100644 index 00000000000..f81a49b0b29 --- /dev/null +++ b/tix/generic/tk4.0/tk.tcl @@ -0,0 +1,113 @@ +# tk.tcl -- +# +# Initialization script normally executed in the interpreter for each +# Tk-based application. Arranges class bindings for widgets. +# +# @(#) tk.tcl 1.73 95/08/30 16:40:20 +# +# Copyright (c) 1992-1994 The Regents of the University of California. +# Copyright (c) 1994-1995 Sun Microsystems, Inc. +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +# Insist on running with compatible versions of Tcl and Tk. + +scan [info tclversion] "%d.%d" a b +if {$a != 7} { + error "wrong version of Tcl loaded ([info tclversion]): need 7.x" +} +scan $tk_version "%d.%d" a b +if {($a != 4) || ($b < 0)} { + error "wrong version of Tk loaded ($tk_version): need 4.x" +} +unset a b + +# Add Tk's directory to the end of the auto-load search path: + +lappend auto_path $tk_library + +# Turn off strict Motif look and feel as a default. + +set tk_strictMotif 0 + +# tkScreenChanged -- +# This procedure is invoked by the binding mechanism whenever the +# "current" screen is changing. The procedure does two things. +# First, it uses "upvar" to make global variable "tkPriv" point at an +# array variable that holds state for the current display. Second, +# it initializes the array if it didn't already exist. +# +# Arguments: +# screen - The name of the new screen. + +proc tkScreenChanged screen { + set disp [file rootname $screen] + uplevel #0 upvar #0 tkPriv.$disp tkPriv + global tkPriv + if [info exists tkPriv] { + set tkPriv(screen) $screen + return + } + set tkPriv(afterId) {} + set tkPriv(buttons) 0 + set tkPriv(buttonWindow) {} + set tkPriv(dragging) 0 + set tkPriv(focus) {} + set tkPriv(grab) {} + set tkPriv(initPos) {} + set tkPriv(inMenubutton) {} + set tkPriv(listboxPrev) {} + set tkPriv(mouseMoved) 0 + set tkPriv(oldGrab) {} + set tkPriv(popup) {} + set tkPriv(postedMb) {} + set tkPriv(pressX) 0 + set tkPriv(pressY) 0 + set tkPriv(screen) $screen + set tkPriv(selectMode) char + set tkPriv(window) {} +} + +# Do initial setup for tkPriv, so that it is always bound to something +# (otherwise, if someone references it, it may get set to a non-upvar-ed +# value, which will cause trouble later). + +tkScreenChanged [winfo screen .] + +# ---------------------------------------------------------------------- +# Read in files that define all of the class bindings. +# ---------------------------------------------------------------------- + +#Not needed in ETK +# +#source $tk_library/button.tcl +#source $tk_library/entry.tcl +#source $tk_library/listbox.tcl +#source $tk_library/menu.tcl +#source $tk_library/scale.tcl +#source $tk_library/scrollbar.tcl +#source $tk_library/text.tcl + +# ---------------------------------------------------------------------- +# Default bindings for keyboard traversal. +# ---------------------------------------------------------------------- + +bind all <Tab> {focus [tk_focusNext %W]} +bind all <Shift-Tab> {focus [tk_focusPrev %W]} + +# tkCancelRepeat -- +# This procedure is invoked to cancel an auto-repeat action described +# by tkPriv(afterId). It's used by several widgets to auto-scroll +# the widget when the mouse is dragged out of the widget with a +# button pressed. +# +# Arguments: +# None. + +proc tkCancelRepeat {} { + global tkPriv + after cancel $tkPriv(afterId) + set tkPriv(afterId) {} +} + diff --git a/tix/generic/tk4.1/console.tcl b/tix/generic/tk4.1/console.tcl new file mode 100644 index 00000000000..f20d83fe32c --- /dev/null +++ b/tix/generic/tk4.1/console.tcl @@ -0,0 +1,421 @@ +# console.tcl -- +# +# This code constructs the console window for an application. It +# can be used by non-unix systems that do not have built-in support +# for shells. +# +# SCCS: @(#) console.tcl 1.28 96/03/07 16:32:14 +# +# Copyright (c) 1995-1996 Sun Microsystems, Inc. +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +# + +# TODO: history - remember partially written command + +# tkConsoleInit -- +# This procedure constructs and configures the console windows. +# +# Arguments: +# None. + +proc tkConsoleInit {} { + global tcl_platform + + if {$tcl_platform(platform) == "macintosh"} { + # Use the native scrollbar for the console + rename scrollbar "" + rename macscrollbar scrollbar + } + text .console -yscrollcommand ".sb set" -setgrid true + scrollbar .sb -command ".console yview" + pack .sb -side right -fill both + pack .console -fill both -expand 1 -side left + if {$tcl_platform(platform) == "macintosh"} { + after idle {.console configure -font {Monaco 9 normal}} + .sb configure -bg white + .console configure -bg white -bd 0 -highlightthickness 0 \ + -selectbackground black -selectforeground white \ + -selectborderwidth 0 -insertwidth 1 + .console tag configure sel -relief ridge + bind .console <FocusIn> { .console tag configure sel -borderwidth 0 + .console configure -selectbackground black -selectforeground white } + bind .console <FocusOut> { .console tag configure sel -borderwidth 2 + .console configure -selectbackground white -selectforeground black } + } + + tkConsoleBind .console + + .console tag configure stderr -foreground red + .console tag configure stdin -foreground blue + + focus .console + + wm protocol . WM_DELETE_WINDOW { wm withdraw . } + wm title . "Console" + flush stdout + .console mark set output [.console index "end - 1 char"] + tkTextSetCursor .console end + .console mark set promptEnd insert + .console mark gravity promptEnd left +} + +# tkConsoleInvoke -- +# Processes the command line input. If the command is complete it +# is evaled in the main interpreter. Otherwise, the continuation +# prompt is added and more input may be added. +# +# Arguments: +# None. + +proc tkConsoleInvoke {args} { + if ![winfo exists .console] tkConsoleInit + + set ranges [.console tag ranges input] + set cmd "" + if {$ranges != ""} { + set pos 0 + while {[lindex $ranges $pos] != ""} { + set start [lindex $ranges $pos] + set end [lindex $ranges [incr pos]] + append cmd [.console get $start $end] + incr pos + } + } + if {$cmd == ""} { + tkConsolePrompt + } elseif [info complete $cmd] { + .console mark set output end + .console tag delete input + set result [interp record $cmd] + if {$result != ""} { + .console insert insert "$result\n" + } + tkConsoleHistory reset + tkConsolePrompt + } else { + tkConsolePrompt partial + } + .console yview -pickplace insert +} + +# tkConsoleHistory -- +# This procedure implements command line history for the +# console. In general is evals the history command in the +# main interpreter to obtain the history. The global variable +# histNum is used to store the current location in the history. +# +# Arguments: +# cmd - Which action to take: prev, next, reset. + +set histNum 1 +proc tkConsoleHistory {cmd} { + if ![winfo exists .console] tkConsoleInit + global histNum + + switch $cmd { + prev { + incr histNum -1 + if {$histNum == 0} { + set cmd {history event [expr [history nextid] -1]} + } else { + set cmd "history event $histNum" + } + if {[catch {interp eval $cmd} cmd]} { + incr histNum + return + } + .console delete promptEnd end + .console insert promptEnd $cmd {input stdin} + } + next { + incr histNum + if {$histNum == 0} { + set cmd {history event [expr [history nextid] -1]} + } elseif {$histNum > 0} { + set cmd "" + set histNum 1 + } else { + set cmd "history event $histNum" + } + if {$cmd != ""} { + catch {interp eval $cmd} cmd + } + .console delete promptEnd end + .console insert promptEnd $cmd {input stdin} + } + reset { + set histNum 1 + } + } +} + +# tkConsolePrompt -- +# This procedure draws the prompt. If tcl_prompt1 or tcl_prompt2 +# exists in the main interpreter it will be called to generate the +# prompt. Otherwise, a hard coded default prompt is printed. +# +# Arguments: +# partial - Flag to specify which prompt to print. + +proc tkConsolePrompt {{partial normal}} { + if ![winfo exists .console] tkConsoleInit + if {$partial == "normal"} { + set temp [.console index "end - 1 char"] + .console mark set output end + if [interp eval "info exists tcl_prompt1"] { + interp eval "eval \[set tcl_prompt1\]" + } else { + puts -nonewline "% " + } + } else { + set temp [.console index output] + .console mark set output end + if [interp eval "info exists tcl_prompt2"] { + interp eval "eval \[set tcl_prompt2\]" + } else { + puts -nonewline "> " + } + } + flush stdout + .console mark set output $temp + tkTextSetCursor .console end + .console mark set promptEnd insert + .console mark gravity promptEnd left +} + +# tkConsoleBind -- +# This procedure first ensures that the default bindings for the Text +# class have been defined. Then certain bindings are overridden for +# the class. +# +# Arguments: +# None. + +proc tkConsoleBind {win} { + if ![winfo exists .console] tkConsoleInit + bindtags $win "$win Text . all" + + # Ignore all Alt, Meta, and Control keypresses unless explicitly bound. + # Otherwise, if a widget binding for one of these is defined, the + # <KeyPress> class binding will also fire and insert the character, + # which is wrong. Ditto for <Escape>. + + bind $win <Alt-KeyPress> {# nothing } + bind $win <Meta-KeyPress> {# nothing} + bind $win <Control-KeyPress> {# nothing} + bind $win <Escape> {# nothing} + bind $win <KP_Enter> {# nothing} + + bind $win <Tab> { + tkConsoleInsert %W \t + focus %W + break + } + bind $win <Return> { + %W mark set insert {end - 1c} + tkConsoleInsert %W "\n" + tkConsoleInvoke + break + } + bind $win <Delete> { + if {[%W tag nextrange sel 1.0 end] != ""} { + %W tag remove sel sel.first promptEnd + } else { + if [%W compare insert < promptEnd] { + break + } + } + } + bind $win <BackSpace> { + if {[%W tag nextrange sel 1.0 end] != ""} { + %W tag remove sel sel.first promptEnd + } else { + if [%W compare insert <= promptEnd] { + break + } + } + } + foreach left {Control-a Home} { + bind $win <$left> { + if [%W compare insert < promptEnd] { + tkTextSetCursor %W {insert linestart} + } else { + tkTextSetCursor %W promptEnd + } + break + } + } + foreach right {Control-e End} { + bind $win <$right> { + tkTextSetCursor %W {insert lineend} + break + } + } + bind $win <Control-d> { + if [%W compare insert < promptEnd] { + break + } + } + bind $win <Control-k> { + if [%W compare insert < promptEnd] { + %W mark set insert promptEnd + } + } + bind $win <Control-t> { + if [%W compare insert < promptEnd] { + break + } + } + bind $win <Meta-d> { + if [%W compare insert < promptEnd] { + break + } + } + bind $win <Meta-BackSpace> { + if [%W compare insert <= promptEnd] { + break + } + } + bind $win <Control-h> { + if [%W compare insert <= promptEnd] { + break + } + } + foreach prev {Control-p Up} { + bind $win <$prev> { + tkConsoleHistory prev + break + } + } + foreach prev {Control-n Down} { + bind $win <$prev> { + tkConsoleHistory next + break + } + } + bind $win <Control-v> { + if [%W compare insert > promptEnd] { + catch { + %W insert insert [selection get -displayof %W] {input stdin} + %W see insert + } + } + break + } + bind $win <Insert> { + catch {tkConsoleInsert %W [selection get -displayof %W]} + break + } + bind $win <KeyPress> { + tkConsoleInsert %W %A + break + } + foreach left {Control-b Left} { + bind $win <$left> { + if [%W compare insert == promptEnd] { + break + } + tkTextSetCursor %W insert-1c + break + } + } + foreach right {Control-f Right} { + bind $win <$right> { + tkTextSetCursor %W insert+1c + break + } + } + bind $win <F9> { + eval destroy [winfo child .] + source $tk_library/console.tcl + } + foreach copy {F16 Meta-w Control-i} { + bind $win <$copy> { + if {[selection own -displayof %W] == "%W"} { + clipboard clear -displayof %W + catch { + clipboard append -displayof %W [selection get -displayof %W] + } + } + break + } + } + foreach paste {F18 Control-y} { + bind $win <$paste> { + catch { + set clip [selection get -displayof %W -selection CLIPBOARD] + set list [split $clip \n\r] + tkConsoleInsert %W [lindex $list 0] + foreach x [lrange $list 1 end] { + %W mark set insert {end - 1c} + tkConsoleInsert %W "\n" + tkConsoleInvoke + tkConsoleInsert %W $x + } + } + break + } + } +} + +# tkConsoleInsert -- +# Insert a string into a text at the point of the insertion cursor. +# If there is a selection in the text, and it covers the point of the +# insertion cursor, then delete the selection before inserting. Insertion +# is restricted to the prompt area. +# +# Arguments: +# w - The text window in which to insert the string +# s - The string to insert (usually just a single character) + +proc tkConsoleInsert {w s} { + if ![winfo exists .console] tkConsoleInit + if {$s == ""} { + return + } + catch { + if {[$w compare sel.first <= insert] + && [$w compare sel.last >= insert]} { + $w tag remove sel sel.first promptEnd + $w delete sel.first sel.last + } + } + if {[$w compare insert < promptEnd]} { + $w mark set insert end + } + $w insert insert $s {input stdin} + $w see insert +} + +# tkConsoleOutput -- +# +# This routine is called directly by ConsolePutsCmd to cause a string +# to be displayed in the console. +# +# Arguments: +# dest - The output tag to be used: either "stderr" or "stdout". +# string - The string to be displayed. + +proc tkConsoleOutput {dest string} { + if ![winfo exists .console] tkConsoleInit + .console insert output $string $dest + .console see insert +} + +# tkConsoleExit -- +# +# This routine is called by ConsoleEventProc when the main window of +# the application is destroyed. +# +# Arguments: +# None. + +proc tkConsoleExit {} { + if ![winfo exists .console] tkConsoleInit + exit +} + + + diff --git a/tix/generic/tk4.1/tk.tcl b/tix/generic/tk4.1/tk.tcl new file mode 100644 index 00000000000..c243963976e --- /dev/null +++ b/tix/generic/tk4.1/tk.tcl @@ -0,0 +1,112 @@ +# tk.tcl -- +# +# Initialization script normally executed in the interpreter for each +# Tk-based application. Arranges class bindings for widgets. +# +# SCCS: @(#) tk.tcl 1.81 96/02/16 10:48:13 +# +# Copyright (c) 1992-1994 The Regents of the University of California. +# Copyright (c) 1994-1996 Sun Microsystems, Inc. +# +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. + +# Insist on running with compatible versions of Tcl and Tk. + +package require -exact Tk 4.1 +package require -exact Tcl 7.5 + +# Add Tk's directory to the end of the auto-load search path, if it +# isn't already on the path: + +if {[lsearch -exact $auto_path $tk_library] < 0} { + lappend auto_path $tk_library +} + +# Turn off strict Motif look and feel as a default. + +set tk_strictMotif 0 + +# tkScreenChanged -- +# This procedure is invoked by the binding mechanism whenever the +# "current" screen is changing. The procedure does two things. +# First, it uses "upvar" to make global variable "tkPriv" point at an +# array variable that holds state for the current display. Second, +# it initializes the array if it didn't already exist. +# +# Arguments: +# screen - The name of the new screen. + +proc tkScreenChanged screen { + set disp [file rootname $screen] + uplevel #0 upvar #0 tkPriv.$disp tkPriv + global tkPriv + if [info exists tkPriv] { + set tkPriv(screen) $screen + return + } + set tkPriv(afterId) {} + set tkPriv(buttons) 0 + set tkPriv(buttonWindow) {} + set tkPriv(dragging) 0 + set tkPriv(focus) {} + set tkPriv(grab) {} + set tkPriv(initPos) {} + set tkPriv(inMenubutton) {} + set tkPriv(listboxPrev) {} + set tkPriv(mouseMoved) 0 + set tkPriv(oldGrab) {} + set tkPriv(popup) {} + set tkPriv(postedMb) {} + set tkPriv(pressX) 0 + set tkPriv(pressY) 0 + set tkPriv(screen) $screen + set tkPriv(selectMode) char + set tkPriv(window) {} +} + +# Do initial setup for tkPriv, so that it is always bound to something +# (otherwise, if someone references it, it may get set to a non-upvar-ed +# value, which will cause trouble later). + +tkScreenChanged [winfo screen .] + +# ---------------------------------------------------------------------- +# Read in files that define all of the class bindings. +# ---------------------------------------------------------------------- + +#Not needed in ETK +# +#if {$tcl_platform(platform) != "macintosh"} { +# source $tk_library/button.tcl +# source $tk_library/entry.tcl +# source $tk_library/listbox.tcl +# source $tk_library/menu.tcl +# source $tk_library/scale.tcl +# source $tk_library/scrlbar.tcl +# source $tk_library/text.tcl +#} +# + +# ---------------------------------------------------------------------- +# Default bindings for keyboard traversal. +# ---------------------------------------------------------------------- + +bind all <Tab> {focus [tk_focusNext %W]} +bind all <Shift-Tab> {focus [tk_focusPrev %W]} + +# tkCancelRepeat -- +# This procedure is invoked to cancel an auto-repeat action described +# by tkPriv(afterId). It's used by several widgets to auto-scroll +# the widget when the mouse is dragged out of the widget with a +# button pressed. +# +# Arguments: +# None. + +proc tkCancelRepeat {} { + global tkPriv + after cancel $tkPriv(afterId) + set tkPriv(afterId) {} +} + diff --git a/tix/unix/configure b/tix/unix/configure index 5f7d983cfd0..f321e8ad074 100755 --- a/tix/unix/configure +++ b/tix/unix/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12.2 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -36,6 +36,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -150,6 +151,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -320,6 +322,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -341,7 +348,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12.2" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -485,12 +492,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # 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" +if test -z "$sitefile"; then + 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 fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -561,7 +572,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:565: checking for a BSD compatible install" >&5 +echo "configure:576: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -609,10 +620,12 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:616: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:629: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -661,7 +674,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 -echo "configure:665: checking for Tcl configuration script" >&5 +echo "configure:678: checking for Tcl configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -696,6 +709,10 @@ else ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -724,7 +741,11 @@ fi - + + + + + @@ -748,7 +769,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 -echo "configure:752: checking for Tk configuration script" >&5 +echo "configure:773: checking for Tk configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -783,6 +804,10 @@ else ac_cv_c_tkconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -814,7 +839,8 @@ fi - + + @@ -824,7 +850,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:828: checking how to run the C preprocessor" >&5 +echo "configure:854: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -839,13 +865,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 843 "configure" +#line 869 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -856,13 +882,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 860 "configure" +#line 886 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -873,13 +899,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 877 "configure" +#line 903 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -907,7 +933,7 @@ echo "$ac_t""$CPP" 1>&6 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tcl=true echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 -echo "configure:911: checking for Tcl headers in the source tree" >&5 +echo "configure:937: checking for Tcl headers in the source tree" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -964,17 +990,17 @@ if test x"${ac_cv_c_tclh}" = x ; then echo "$ac_t""none" 1>&6 ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcl.h""... $ac_c" 1>&6 -echo "configure:968: checking for tcl.h" >&5 +echo "configure:994: checking for tcl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 973 "configure" +#line 999 "configure" #include "confdefs.h" #include <tcl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1038,7 +1064,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tk=true echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 -echo "configure:1042: checking for Tk headers in the source tree" >&5 +echo "configure:1068: checking for Tk headers in the source tree" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -1145,7 +1171,7 @@ EOF # 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. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1 | grep ac_space` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1224,7 +1250,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12.2" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1248,6 +1274,7 @@ s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -1267,12 +1294,16 @@ s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g s%@SRC_DIR@%$SRC_DIR%g s%@TCLCONFIG@%$TCLCONFIG%g s%@TCL_DEFS@%$TCL_DEFS%g +s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g +s%@TCL_LIB_FULL_PATH@%$TCL_LIB_FULL_PATH%g s%@TCL_LIBS@%$TCL_LIBS%g +s%@TCL_CFLAGS@%$TCL_CFLAGS%g s%@TCL_SHLIB_CFLAGS@%$TCL_SHLIB_CFLAGS%g s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g @@ -1283,6 +1314,8 @@ s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g s%@TKCONFIG@%$TKCONFIG%g s%@TK_VERSION@%$TK_VERSION%g s%@TK_DEFS@%$TK_DEFS%g +s%@TK_LIB_FILE@%$TK_LIB_FILE%g +s%@TK_LIB_FULL_PATH@%$TK_LIB_FULL_PATH%g s%@TK_LIBS@%$TK_LIBS%g s%@TK_BUILD_INCLUDES@%$TK_BUILD_INCLUDES%g s%@TK_XINCLUDES@%$TK_XINCLUDES%g diff --git a/tix/unix/samAppInit.c b/tix/unix/samAppInit.c index 955f5e1db80..85b818b47c8 100644 --- a/tix/unix/samAppInit.c +++ b/tix/unix/samAppInit.c @@ -37,6 +37,11 @@ # endif #endif +#ifdef BUILD_tix +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + EXTERN int Tclsam_Init _ANSI_ARGS_((Tcl_Interp *interp)); EXTERN int Tksam_Init _ANSI_ARGS_((Tcl_Interp *interp)); EXTERN int Tixsam_Init _ANSI_ARGS_((Tcl_Interp *interp)); diff --git a/tix/unix/tk8.1/configure b/tix/unix/tk8.1/configure index a51613bc700..5bf188f36b2 100755 --- a/tix/unix/tk8.1/configure +++ b/tix/unix/tk8.1/configure @@ -42,6 +42,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -156,6 +157,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -326,6 +328,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -491,12 +498,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # 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" +if test -z "$sitefile"; then + 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 fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -606,7 +617,7 @@ if test "$tix_ok" = "yes"; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:610: checking for $ac_word" >&5 +echo "configure:621: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -636,7 +647,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:640: checking for $ac_word" >&5 +echo "configure:651: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -687,7 +698,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:691: checking for $ac_word" >&5 +echo "configure:702: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -719,7 +730,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -730,12 +741,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 734 "configure" +#line 745 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -761,12 +772,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:765: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:776: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:770: checking whether we are using GNU C" >&5 +echo "configure:781: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -775,7 +786,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -794,7 +805,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:798: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:809: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -861,7 +872,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:865: checking for a BSD compatible install" >&5 +echo "configure:876: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -916,7 +927,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:920: checking for $ac_word" >&5 +echo "configure:931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -944,7 +955,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:948: checking how to run the C preprocessor" >&5 +echo "configure:959: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -959,13 +970,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 963 "configure" +#line 974 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -976,13 +987,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 980 "configure" +#line 991 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -993,13 +1004,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 997 "configure" +#line 1008 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1027,17 +1038,17 @@ for ac_hdr in unistd.h limits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1031: checking for $ac_hdr" >&5 +echo "configure:1042: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1036 "configure" +#line 1047 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1064,7 +1075,7 @@ fi done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1068: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1079: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1096,9 +1107,9 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking unsigned char""... $ac_c" 1>&6 -echo "configure:1100: checking unsigned char" >&5 +echo "configure:1111: checking unsigned char" >&5 cat > conftest.$ac_ext <<EOF -#line 1102 "configure" +#line 1113 "configure" #include "confdefs.h" #include <stdio.h> int main() { @@ -1107,7 +1118,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* tcl_ok=supported else @@ -1133,12 +1144,12 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:1137: checking for strcasecmp" >&5 +echo "configure:1148: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1142 "configure" +#line 1153 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -1161,7 +1172,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:1165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -1183,7 +1194,7 @@ fi if test "$tcl_ok" = 0; then echo $ac_n "checking for strcasecmp in -lsocket""... $ac_c" 1>&6 -echo "configure:1187: checking for strcasecmp in -lsocket" >&5 +echo "configure:1198: checking for strcasecmp in -lsocket" >&5 ac_lib_var=`echo socket'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1191,7 +1202,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1195 "configure" +#line 1206 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1202,7 +1213,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1226,7 +1237,7 @@ fi fi if test "$tcl_ok" = 0; then echo $ac_n "checking for strcasecmp in -linet""... $ac_c" 1>&6 -echo "configure:1230: checking for strcasecmp in -linet" >&5 +echo "configure:1241: checking for strcasecmp in -linet" >&5 ac_lib_var=`echo inet'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1234,7 +1245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 1238 "configure" +#line 1249 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1245,7 +1256,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1286,7 +1297,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 -echo "configure:1290: checking for Tcl configuration script" >&5 +echo "configure:1301: checking for Tcl configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1321,6 +1332,10 @@ else ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -1377,7 +1392,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 -echo "configure:1381: checking for Tk configuration script" >&5 +echo "configure:1396: checking for Tk configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1412,6 +1427,10 @@ else ac_cv_c_tkconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -1457,7 +1476,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tcl=true echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 -echo "configure:1461: checking for Tcl headers in the source tree" >&5 +echo "configure:1480: checking for Tcl headers in the source tree" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -1514,17 +1533,17 @@ if test x"${ac_cv_c_tclh}" = x ; then echo "$ac_t""none" 1>&6 ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcl.h""... $ac_c" 1>&6 -echo "configure:1518: checking for tcl.h" >&5 +echo "configure:1537: checking for tcl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1523 "configure" +#line 1542 "configure" #include "confdefs.h" #include <tcl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1588,7 +1607,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tk=true echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 -echo "configure:1592: checking for Tk headers in the source tree" >&5 +echo "configure:1611: checking for Tk headers in the source tree" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -1842,12 +1861,12 @@ done if test "$checked" = "0"; then tcl_checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1846: checking for connect" >&5 +echo "configure:1865: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1851 "configure" +#line 1870 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -1870,7 +1889,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1892,7 +1911,7 @@ fi if test "$tcl_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:1896: checking for main in -lsocket" >&5 +echo "configure:1915: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1900,14 +1919,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 1904 "configure" +#line 1923 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1933,12 +1952,12 @@ fi tk_oldLibs=$TK_LIBS TK_LIBS="$TK_LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:1937: checking for accept" >&5 +echo "configure:1956: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1942 "configure" +#line 1961 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char accept(); below. */ @@ -1961,7 +1980,7 @@ accept(); ; return 0; } EOF -if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -1983,12 +2002,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1987: checking for gethostbyname" >&5 +echo "configure:2006: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1992 "configure" +#line 2011 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -2011,7 +2030,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2029,7 +2048,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:2033: checking for main in -lnsl" >&5 +echo "configure:2052: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2037,14 +2056,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2041 "configure" +#line 2060 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/tix/unix/tk8.3/Makefile.in b/tix/unix/tk8.3/Makefile.in new file mode 100644 index 00000000000..dcfdea0be7b --- /dev/null +++ b/tix/unix/tk8.3/Makefile.in @@ -0,0 +1,556 @@ +# Makefile -- +# +# This file is a Makefile to compile Tix with Tk version +# 8.1. If it has the name "Makefile.in" then it is a +# template for a Makefile; to generate the actual Makefile, run +# "./configure", which is a configuration script generated by the +# "autoconf" program (constructs like "@foo@" will get replaced in the +# actual Makefile. + +# CYGNUS LOCAL: Set VPATH. +VPATH = @srcdir@ +srcdir = @srcdir@ + +#---------------------------------------------------------------- +# Things you can change to personalize the Makefile for your own +# site (you can make these changes in either Makefile.in or +# Makefile, but changes to Makefile will get lost if you re-run +# the configuration script). +#---------------------------------------------------------------- + +# Default top-level directories in which to install architecture- +# specific files (exec_prefix) and machine-independent files such +# as scripts (prefix). The values specified here may be overridden +# at configure-time with the --exec-prefix and --prefix options +# to the "configure" script. + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +TIX_VERSION = @TIX_VERSION@ + +@SET_MAKE@ + +# Directory in which to install the library of Tix scripts and demos +# (note: you can set the TIX_LIBRARY environment variable at run-time to +# override the compiled-in location): +TIX_LIBRARY = $(prefix)/share/tix$(TIX_VERSION) + +# Directory in which to install the archive libtix.a: +LIB_DIR = $(exec_prefix)/lib +LIB_INSTALL_DIR = $(LIB_DIR) +LIB_RUNTIME_DIR = $(LIB_DIR) + +# Directory in which to install the program tixwish: +BIN_DIR = $(exec_prefix)/bin + +# To change the compiler switches, for example to change from -O +# to -g, change the following line: +CFLAGS = -O +TIX_CFLAGS = $(CFLAGS) -fwritable-strings + +# To disable ANSI-C procedure prototypes reverse the comment characters +# on the following lines: +PROTO_FLAGS = +#PROTO_FLAGS = -DNO_PROTOTYPE + +# To enable memory debugging reverse the comment characters on the following +# lines. Warning: if you enable memory debugging, you must do it +# *everywhere*, including all the code that calls Tcl, and you must use +# ckalloc and ckfree everywhere instead of malloc and free. +MEM_DEBUG_FLAGS = +#MEM_DEBUG_FLAGS = -DTCL_MEM_DEBUG + +# Some versions of make, like SGI's, use the following variable to +# determine which shell to use for executing commands: +SHELL = /bin/sh + +# Location of the Tcl 8.1 source directory. +# +TCL_SRC_DIR = @TCL_SRC_DIR@ +TCL_GENERIC_DIR = $(TCL_SRC_DIR)/generic +TCL_BIN_DIR = @TCL_BIN_DIR@ + +# Location of the Tk 8.1 source directory. +# +TK_SRC_DIR = @TK_SRC_DIR@ +TK_GENERIC_DIR = $(TK_SRC_DIR)/generic + +# Libraries to use when linking: +LIBS = @ITK_BUILD_LIB_SPEC@ @ITCL_BUILD_LIB_SPEC@ \ + @TK_BUILD_LIB_SPEC@ @TCL_BUILD_LIB_SPEC@ @TK_LIBS@ + +# Libraries for building a stand-alone Tclsh. +# +LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@ + +RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \ + TK_LIBRARY=$(TK_SRC_DIR)/library \ + $(TCL_BIN_DIR)/tclsh + + +#---------------------------------------------------------------- +# The information below is modified by the configure script when +# Makefile is generated from Makefile.in. You shouldn't normally +# modify any of this stuff by hand. +#---------------------------------------------------------------- + +CC = @CC@ + +SHLIB_CFLAGS = @SHLIB_CFLAGS@ +SHLIB_LD = @SHLIB_LD@ +SHLIB_SUFFIX = @SHLIB_SUFFIX@ +SHLIB_VERSION = @SHLIB_VERSION@ +TIX_SHLIB_CFLAGS = @TIX_SHLIB_CFLAGS@ +TK_XINCLUDES = @TK_XINCLUDES@ + +ITCL_EXT = + +SRC_DIR = @TIX_SRC_DIR@ +GENERIC_DIR = $(SRC_DIR)/generic +UNIX_DIR = $(SRC_DIR)/unix +AC_FLAGS = @DEFS@ @TIX_DEFS@ +RANLIB = @RANLIB@ +TIX_RANLIB = @TIX_RANLIB@ +INSTALL = @TIX_SRC_DIR@/install.sh -c +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ + +TIX_LIB_FILE = @TIX_LIB_FILE@ +TIX_EXE_FILE = @TIX_EXE_FILE@ +TCL_SAM_FILE = @TCL_SAM_FILE@ +TK_SAM_FILE = @TK_SAM_FILE@ +TIX_SAM_FILE = @TIX_SAM_FILE@ +TCL_SAMEXE_FILE = @TCL_SAMEXE_FILE@ +TK_SAMEXE_FILE = @TK_SAMEXE_FILE@ +TIX_SAMEXE_FILE = @TIX_SAMEXE_FILE@ + +INST_EXE = $(TIX_EXE_FILE)$(TIX_VERSION).8.1$(ITCL_EXT) +INST_TIX_SAMEXE = $(TIX_SAMEXE_FILE)$(TIX_VERSION).8.1$(ITCL_EXT) +INST_TK_SAMEXE = $(TK_SAMEXE_FILE)8.1 +INST_TCL_SAMEXE = $(TCL_SAMEXE_FILE)8.1 + +SAM_TARGETS = $(TIX_SAM_FILE) + +TIX_SAM_TARGETS = @TIX_SAM_TARGETS@ +SAM_INSTALL = @TIX_SAM_INSTALL@ + +ITCL_CFLAGS = + +CC_SWITCHES = $(TIX_CFLAGS) $(AC_FLAGS) -I$(TCL_GENERIC_DIR) \ + -I$(TCL_SRC_DIR)/unix -I$(TK_GENERIC_DIR) -I$(TK_SRC_DIR)/unix \ + $(ITCL_CFLAGS) \ + -I$(GENERIC_DIR) -I$(UNIX_DIR) $(TK_XINCLUDES) $(TIX_SHLIB_CFLAGS) + +#---------------------------------------------------------------- +# The information below should be usable as is. You shouldn't need +# to modify it. +#---------------------------------------------------------------- + +CORE_OBJS = \ + tixClass.o \ + tixCmds.o \ + tixCompat.o \ + tixError.o \ + tixGeometry.o \ + tixInit.o \ + tixItcl.o \ + tixList.o \ + tixMethod.o \ + tixOption.o \ + tixScroll.o \ + tixSmpLs.o \ + tixUtils.o \ + tixWidget.o + +DITEM_OBJS = \ + tixDItem.o \ + tixDiITxt.o \ + tixDiImg.o \ + tixDiStyle.o \ + tixDiText.o \ + tixDiWin.o + +MANAGER_OBJS = \ + tixForm.o \ + tixFormMisc.o + +WIDGET_OBJS = \ + tixGrid.o \ + tixGrData.o \ + tixGrFmt.o \ + tixGrRC.o \ + tixGrSel.o \ + tixGrSort.o \ + tixGrUtl.o \ + tixHList.o \ + tixHLCol.o \ + tixHLInd.o \ + tixHLHdr.o \ + tixInputO.o \ + tixNBFrame.o \ + tixTList.o + +MISC_OBJS = \ + tixImgCmp.o \ + tixImgXpm.o \ + tixMwm.o + +UNIX_OBJS = \ + tixUnixDraw.o \ + tixUnixXpm.o \ + tixUnixWm.o + +OBJS = $(CORE_OBJS) $(DITEM_OBJS) $(MANAGER_OBJS) $(MISC_OBJS) \ + $(WIDGET_OBJS) $(UNIX_OBJS) + +TCL_SAM_OBJS = \ + tclUnixSam80.o + +TK_SAM_OBJS = \ + tkUnixSam80.o + +TIX_SAM_OBJS = \ + $(OBJS) tixUnixSam.o + +#---------------------------------------------------------------------- +# These are the scripts that we'll compile into the SAM's. The +# scripts of TK must be included in the fixed order. +#---------------------------------------------------------------------- + +TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl + +TK_SCRIPTS = \ + $(TK_SRC_DIR)/library/bgerror.tcl \ + $(TK_SRC_DIR)/library/dialog.tcl \ + $(TK_SRC_DIR)/library/focus.tcl \ + $(TK_SRC_DIR)/library/obsolete.tcl \ + $(TK_SRC_DIR)/library/optMenu.tcl \ + $(TK_SRC_DIR)/library/palette.tcl \ + $(TK_SRC_DIR)/library/tearoff.tcl \ + $(TK_SRC_DIR)/library/clrpick.tcl \ + $(TK_SRC_DIR)/library/comdlg.tcl \ + $(TK_SRC_DIR)/library/msgbox.tcl \ + $(TK_SRC_DIR)/library/tkfbox.tcl \ + $(TK_SRC_DIR)/library/xmfbox.tcl \ + $(SRC_DIR)/generic/tk4.2/tk.tcl \ + $(TK_SRC_DIR)/library/button.tcl \ + $(TK_SRC_DIR)/library/entry.tcl \ + $(TK_SRC_DIR)/library/listbox.tcl \ + $(TK_SRC_DIR)/library/menu.tcl \ + $(TK_SRC_DIR)/library/scale.tcl \ + $(TK_SRC_DIR)/library/scrlbar.tcl \ + $(TK_SRC_DIR)/library/text.tcl \ + $(SRC_DIR)/generic/tk8.0/console.tcl + +TIX_SCRIPTS = \ + $(SRC_DIR)/library/pref/*.fsc \ + $(SRC_DIR)/library/pref/*.csc \ + $(SRC_DIR)/library/*.tcl + +all: $(TIX_LIB_FILE) $(TIX_EXE_FILE) @TIX_SAM_TARGETS@ + +$(TIX_LIB_FILE): $(OBJS) + rm -f $(TIX_LIB_FILE) + @TIX_MAKE_LIB@ + $(TIX_RANLIB) $(TIX_LIB_FILE) + +$(TCL_SAM_FILE): $(TCL_SAM_OBJS) + rm -f $(TCL_SAM_FILE) + @TCL_MAKE_SAM@ + $(TIX_RANLIB) $(TCL_SAM_FILE) + +$(TK_SAM_FILE): $(TK_SAM_OBJS) + rm -f $(TK_SAM_FILE) + @TK_MAKE_SAM@ + $(TIX_RANLIB) $(TK_SAM_FILE) + +$(TIX_SAM_FILE): $(TIX_SAM_OBJS) + rm -f $(TIX_SAM_FILE) + @TIX_MAKE_SAM@ + $(TIX_RANLIB) $(TIX_SAM_FILE) + +$(TIX_EXE_FILE): tixAppInit.o $(TIX_LIB_FILE) @TCL_LIB_FULL_PATH@ \ + @TK_LIB_FULL_PATH@ @ITCL_LIB_FULL_PATH@ + $(CC) @LD_FLAGS@ tixAppInit.o @TIX_BUILD_LIB_SPEC@ $(LIBS) \ + @TIX_LD_SEARCH_FLAGS@ -o $(TIX_EXE_FILE) + +$(TCL_SAMEXE_FILE): $(UNIX_DIR)/samAppInit.c $(TCL_SAM_FILE) + $(CC) $(CC_SWITCHES) @LD_FLAGS@ -DUSE_TCL $(UNIX_DIR)/samAppInit.c \ + @TCL_BUILD_SAM_SPEC@ $(LIBS_TCLONLY) \ + @TIX_LD_SEARCH_FLAGS@ -o $(TCL_SAMEXE_FILE) + +$(TK_SAMEXE_FILE): $(UNIX_DIR)/samAppInit.c $(TCL_SAM_FILE) $(TK_SAM_FILE) \ + @TCL_LIB_FULL_PATH@ @TK_LIB_FULL_PATH@ @ITCL_LIB_FULL_PATH@ + $(CC) $(CC_SWITCHES) @LD_FLAGS@ -DUSE_TK $(UNIX_DIR)/samAppInit.c \ + @TK_BUILD_SAM_SPEC@ @TCL_BUILD_SAM_SPEC@ $(LIBS) \ + @TIX_LD_SEARCH_FLAGS@ -o $(TK_SAMEXE_FILE) + +$(TIX_SAMEXE_FILE): $(UNIX_DIR)/samAppInit.c $(TCL_SAM_FILE) $(TK_SAM_FILE) \ + $(TIX_SAM_FILE) @TCL_LIB_FULL_PATH@ @TK_LIB_FULL_PATH@ \ + @ITCL_LIB_FULL_PATH@ + $(CC) $(CC_SWITCHES) @LD_FLAGS@ -DUSE_TIX $(UNIX_DIR)/samAppInit.c \ + @TIX_BUILD_SAM_SPEC@ \ + @TK_BUILD_SAM_SPEC@ @TCL_BUILD_SAM_SPEC@ \ + $(LIBS) \ + @TIX_LD_SEARCH_FLAGS@ -o $(TIX_SAMEXE_FILE) + + +#---------------------------------------------------------------------- +# +# .o file rules +# +#---------------------------------------------------------------------- +tixAppInit.o : tixAppInit.c + $(CC) -c $(CC_SWITCHES) $(srcdir)/tixAppInit.c + +tixClass.o : $(GENERIC_DIR)/tixClass.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixClass.c + +tixCmds.o: $(GENERIC_DIR)/tixCmds.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixCmds.c + +tixCompat.o: $(GENERIC_DIR)/tixCompat.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixCompat.c + +tixDItem.o: $(GENERIC_DIR)/tixDItem.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDItem.c + +tixDiImg.o: $(GENERIC_DIR)/tixDiImg.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDiImg.c + +tixDiITxt.o: $(GENERIC_DIR)/tixDiITxt.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDiITxt.c + +tixDiStyle.o: $(GENERIC_DIR)/tixDiStyle.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDiStyle.c + +tixDiText.o: $(GENERIC_DIR)/tixDiText.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDiText.c + +tixDiWin.o: $(GENERIC_DIR)/tixDiWin.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixDiWin.c + +tixError.o: $(GENERIC_DIR)/tixError.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixError.c + +tixForm.o: $(GENERIC_DIR)/tixForm.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixForm.c + +tixFormMisc.o: $(GENERIC_DIR)/tixFormMisc.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixFormMisc.c + +tixGeometry.o: $(GENERIC_DIR)/tixGeometry.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGeometry.c + +tixGrid.o: $(GENERIC_DIR)/tixGrid.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrid.c + +tixGrData.o: $(GENERIC_DIR)/tixGrData.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrData.c + +tixGrFmt.o: $(GENERIC_DIR)/tixGrFmt.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrFmt.c + +tixGrRC.o: $(GENERIC_DIR)/tixGrRC.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrRC.c + +tixGrSel.o: $(GENERIC_DIR)/tixGrSel.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrSel.c + +tixGrSort.o: $(GENERIC_DIR)/tixGrSort.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrSort.c + +tixGrUtl.o: $(GENERIC_DIR)/tixGrUtl.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixGrUtl.c + +tixHLCol.o: $(GENERIC_DIR)/tixHLCol.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixHLCol.c + +tixHLHdr.o: $(GENERIC_DIR)/tixHLHdr.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixHLHdr.c + +tixHLInd.o: $(GENERIC_DIR)/tixHLInd.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixHLInd.c + +tixHList.o: $(GENERIC_DIR)/tixHList.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixHList.c + +tixImgCmp.o: $(GENERIC_DIR)/tixImgCmp.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixImgCmp.c + +tixImgXpm.o: $(GENERIC_DIR)/tixImgXpm.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixImgXpm.c + +tixInit.o: $(GENERIC_DIR)/tixInit.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInit.c + +tixItcl.o: $(GENERIC_DIR)/tixItcl.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixItcl.c + +tixInputO.o : $(GENERIC_DIR)/tixInputO.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixInputO.c + +tixList.o: $(GENERIC_DIR)/tixList.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixList.c + +tixMethod.o : $(GENERIC_DIR)/tixMethod.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixMethod.c + +tixMwm.o: $(GENERIC_DIR)/tixMwm.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixMwm.c + +tixNBFrame.o: $(GENERIC_DIR)/tixNBFrame.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixNBFrame.c + +tixOption.o: $(GENERIC_DIR)/tixOption.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixOption.c + +tixSmpLs.o: $(GENERIC_DIR)/tixSmpLs.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixSmpLs.c + +tixScroll.o: $(GENERIC_DIR)/tixScroll.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixScroll.c + +tixTList.o: $(GENERIC_DIR)/tixTList.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixTList.c + +tixUtils.o: $(GENERIC_DIR)/tixUtils.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixUtils.c + +tixWidget.o: $(GENERIC_DIR)/tixWidget.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tixWidget.c + +tixUnixDraw.o: $(UNIX_DIR)/tixUnixDraw.c + $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tixUnixDraw.c + +tixUnixXpm.o: $(UNIX_DIR)/tixUnixXpm.c + $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tixUnixXpm.c + +tixUnixWm.o: $(UNIX_DIR)/tixUnixWm.c + $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tixUnixWm.c + +# +# Dependence rules for SAM +# +tclUnixSam80.o: tclUnixSam80.c tclSamLib.c + $(CC) -c $(CC_SWITCHES) tclUnixSam80.c + +tclSamLib.c: + $(RUN_TCLSH) $(SRC_DIR)/tools/tclc.tcl $(TCL_SCRIPTS) \ + > tclSamLib.c + +tkUnixSam80.o: tkUnixSam80.c tkSamLib.c + $(CC) -c $(CC_SWITCHES) tkUnixSam80.c + +tkSamLib.c: + $(RUN_TCLSH) $(SRC_DIR)/tools/tclc.tcl $(TK_SCRIPTS) \ + > tkSamLib.c + +tixUnixSam.o: $(UNIX_DIR)/tixUnixSam.c tixSamLib.c + $(CC) -c -I. $(CC_SWITCHES) $(UNIX_DIR)/tixUnixSam.c + +tixSamLib.c: + $(RUN_TCLSH) $(SRC_DIR)/tools/tclc.tcl $(TIX_SCRIPTS) \ + > tixSamLib.c + + +tests: $(TIX_EXE_FILE) + TCL_LIBRARY=$(TCL_SRC_DIR)/library TK_LIBRARY=$(TK_SRC_DIR)/library \ + ITCL_LIBRARY=$(ITCL_SRC_DIR)/library \ + ITK_LIBRARY=$(ITK_SRC_DIR)/library \ + IWIDGETS_LIBRARY=$(ITCL_ROOT_DIR)/$(IWIDGETS) \ + TIX_LIBRARY=$(SRC_DIR)/library \ + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:. \ + ./$(TIX_EXE_FILE) $(SRC_DIR)/tests/Driver.tcl + +sa-tests: $(TIX_SAMEXE_FILE) + ./$(TIX_SAMEXE_FILE) $(SRC_DIR)/tests/Driver.tcl + +#---------------------------------------------------------------------- +# +# INSTALLATION +# +#---------------------------------------------------------------------- +_install_: $(TIX_LIB_FILE) $(TIX_EXE_FILE) $(SAM_INSTALL) + @for i in $(LIB_DIR) $(BIN_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @echo "Installing $(TIX_LIB_FILE) as $(LIB_DIR)/$(TIX_LIB_FILE)" + @$(INSTALL_DATA) $(TIX_LIB_FILE) $(LIB_DIR)/$(TIX_LIB_FILE) + @echo "Installing $(TIX_EXE_FILE) as $(BIN_DIR)/$(INST_EXE)" + @$(INSTALL_PROGRAM) $(TIX_EXE_FILE) $(BIN_DIR)/$(INST_EXE) + +_install_sam_exe_: $(SAM_TARGETS) + @for i in $(LIB_DIR) $(BIN_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @echo "Installing $(TK_SAM_FILE) as $(LIB_DIR)/$(TK_SAM_FILE)" + @$(INSTALL_DATA) $(TK_SAM_FILE) $(LIB_DIR)/$(TK_SAM_FILE) + @echo "Installing $(TCL_SAM_FILE) as $(LIB_DIR)/$(TCL_SAM_FILE)" + @$(INSTALL_DATA) $(TCL_SAM_FILE) $(LIB_DIR)/$(TCL_SAM_FILE) + @echo "" + @echo "Installing $(TIX_SAMEXE_FILE) as $(BIN_DIR)/$(INST_TIX_SAMEXE)" + @$(INSTALL_PROGRAM) $(TIX_SAMEXE_FILE) $(BIN_DIR)/$(INST_TIX_SAMEXE) + @echo "Installing $(TK_SAMEXE_FILE) as $(BIN_DIR)/$(INST_TK_SAMEXE)" + @$(INSTALL_PROGRAM) $(TK_SAMEXE_FILE) $(BIN_DIR)/$(INST_TK_SAMEXE) + @echo "Installing $(TCL_SAMEXE_FILE) as $(BIN_DIR)/$(INST_TCL_SAMEXE)" + @$(INSTALL_PROGRAM) $(TCL_SAMEXE_FILE) $(BIN_DIR)/$(INST_TCL_SAMEXE) + +_install_sam_lib_: $(SAM_TARGETS) + @for i in $(LIB_DIR) $(BIN_DIR) ; \ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ + mkdir $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ + done; + @echo "Installing $(TIX_SAM_FILE) as $(LIB_DIR)/$(TIX_SAM_FILE)" + @$(INSTALL_DATA) $(TIX_SAM_FILE) $(LIB_DIR)/$(TIX_SAM_FILE) + + +install: _install_ + @echo The binary files have been installed. + @echo You probably need to make install in the parent directory + @echo to install other files. + +sam_clean: + rm -f tixSamLib.c $(UNIX_DIR)/tixBitmaps.c + +clean: + rm -f *.so *.a *.o *_s.o core errs *~ \#* TAGS *.E sta* \ + a.out errors $(TIX_EXE_FILE) $(TIX_LIB_FILE) *.bak \ + $(SAM_TARGETS) tclSamLib.c tkSamLib.c + +distclean: clean + rm -f Makefile config.* lib.exp + +depend: + makedepend -- $(CC_SWITCHES) -- $(SRCS) + +# CYGNUS LOCAL: Makefile depends upon config.status +Makefile: Makefile.in config.status + ./config.status + +.c.o: + $(CC) -c $(CC_SWITCHES) $< + +# CYGNUS LOCAL: Rebuild config.status when appropriate. +config.status: configure + $(SHELL) config.status --recheck + +# DO NOT DELETE THIS LINE -- make depend depends on it. + diff --git a/tix/unix/tk8.3/aclocal.m4 b/tix/unix/tk8.3/aclocal.m4 new file mode 100644 index 00000000000..f5b22bea8aa --- /dev/null +++ b/tix/unix/tk8.3/aclocal.m4 @@ -0,0 +1 @@ +"sinclude(../../../config/acinclude.m4)" diff --git a/tix/unix/tk8.3/configure b/tix/unix/tk8.3/configure new file mode 100755 index 00000000000..5bf188f36b2 --- /dev/null +++ b/tix/unix/tk8.3/configure @@ -0,0 +1,2499 @@ +#! /bin/sh + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + --enable-gcc allow use of gcc if available" +ac_help="$ac_help + --with-tclconfig directory containing tcl configuration (tclConfig.sh)" +ac_help="$ac_help + --with-tkconfig directory containing tk configuration (tkConfig.sh)" +ac_help="$ac_help + --with-tclinclude directory where tcl headers are" +ac_help="$ac_help + --with-tkinclude directory where tk headers are" +ac_help="$ac_help + --enable-sam build stand-alone modules" +ac_help="$ac_help + --enable-shared build libtix as a shared library" + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +sitefile= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +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' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# 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 + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=../../generic/tixInit.c + +# 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_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + 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 "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$sitefile"; then + 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 + fi +else + CONFIG_SITE="$sitefile" +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + +#-------------------------------------------------------------------- +# Remove the ./config.cache file and rerun configure if +# the cache file belong to a different architecture +# +# This doesn't seem to work in the Cygnus environment, +# it causes an error message about having more than +# one target, so I disabled it. meissner@cygnus.com +#---------------------------------------------------------------------- +#AC_CHECK_PROG(UNAME, uname -a, [uname -a], "") +#if test "$UNAME" = ""; then +# AC_CHECK_PROG(UNAME, uname, [uname], "") +#fi +# +#if test "$UNAME" != ""; then +# uname=`$UNAME` +# AC_MSG_CHECKING([cached value of \$uname]) +# AC_CACHE_VAL(ac_cv_prog_uname, [nocached=1 ac_cv_prog_uname=`$UNAME`]) +# if test "$nocached" = "1"; then +# AC_MSG_RESULT(no) +# else +# AC_MSG_RESULT(yes) +# fi +# +# if test "$uname" != "$ac_cv_prog_uname"; then +# echo "Running on a different machine/architecture. Can't use cached values" +# echo "Removing config.cache and running configure again ..." +# rm -f config.cache +# CMDLINE="$0 $*" +# exec $CMDLINE +# fi +#fi + +#---------------------------------------------------------------------- +# We don't want to use any relative path because we need to generate +# Makefile's in subdirectories +#---------------------------------------------------------------------- +if test "$INSTALL" = "./install.sh"; then + INSTALL=`pwd`/install.sh +fi + +#-------------------------------------------------------------------- +# Version information about this TIX release. +#-------------------------------------------------------------------- + +TIX_VERSION=4.1 +TIX_MAJOR_VERSION=4 +TIX_MINOR_VERSION=1 + +BIN_VERSION=${TIX_VERSION}.8.1 + + +VERSION=${BIN_VERSION} + +#-------------------------------------------------------------------- +# See if user wants to use gcc to compile Tix. This option must +# be used before any checking that uses the C compiler. +#-------------------------------------------------------------------- + +# Check whether --enable-gcc or --disable-gcc was given. +if test "${enable_gcc+set}" = set; then + enableval="$enable_gcc" + tix_ok=$enableval +else + tix_ok=no +fi + +if test "$tix_ok" = "yes"; then + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:621: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:651: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:702: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 745 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:776: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:781: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:809: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + +else + CC=${CC-cc} + +fi + +ac_aux_dir= +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 + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# 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" +# ./install, which can be erroneously created by make from ./install.sh. +echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:876: checking for a BSD compatible install" >&5 +if test -z "$INSTALL"; then +if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in + /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if test -f $ac_dir/$ac_prog; then + if test $ac_prog = install && + grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done + IFS="$ac_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 + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL="$ac_install_sh" + fi +fi +echo "$ac_t""$INSTALL" 1>&6 + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +# Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:931: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:959: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +#line 974 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +#line 991 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +#line 1008 "configure" +#include "confdefs.h" +#include <assert.h> +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +echo "$ac_t""$CPP" 1>&6 + +for ac_hdr in unistd.h limits.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1042: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1047 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:1079: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftestmake <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftestmake 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 +rm -f conftestmake +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$ac_t""yes" 1>&6 + SET_MAKE= +else + echo "$ac_t""no" 1>&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + + +#-------------------------------------------------------------------- +# unsigned char is not supported by some non-ANSI compilers. +#-------------------------------------------------------------------- + +echo $ac_n "checking unsigned char""... $ac_c" 1>&6 +echo "configure:1111: checking unsigned char" >&5 +cat > conftest.$ac_ext <<EOF +#line 1113 "configure" +#include "confdefs.h" +#include <stdio.h> +int main() { + + unsigned char c = 'c'; + +; return 0; } +EOF +if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + tcl_ok=supported +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + tcl_ok=notsupported +fi +rm -f conftest* + +echo "$ac_t""$tcl_ok" 1>&6 +if test $tcl_ok = supported; then + cat >> confdefs.h <<\EOF +#define UCHAR_SUPPORTED 1 +EOF + +fi + +#-------------------------------------------------------------------- +# Check whether there is an strcasecmp function on this system. +# This is a bit tricky because under SCO it's in -lsocket and +# under Sequent Dynix it's in -linet. +#-------------------------------------------------------------------- + +echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 +echo "configure:1148: checking for strcasecmp" >&5 +if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1153 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strcasecmp(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strcasecmp(); + +int main() { + +/* 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_strcasecmp) || defined (__stub___strcasecmp) +choke me +#else +strcasecmp(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strcasecmp=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_strcasecmp=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'strcasecmp`\" = yes"; then + echo "$ac_t""yes" 1>&6 + tcl_ok=1 +else + echo "$ac_t""no" 1>&6 +tcl_ok=0 +fi + +if test "$tcl_ok" = 0; then + echo $ac_n "checking for strcasecmp in -lsocket""... $ac_c" 1>&6 +echo "configure:1198: checking for strcasecmp in -lsocket" >&5 +ac_lib_var=`echo socket'_'strcasecmp | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1206 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strcasecmp(); + +int main() { +strcasecmp() +; return 0; } +EOF +if { (eval echo configure:1217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + tcl_ok=1 +else + echo "$ac_t""no" 1>&6 +tcl_ok=0 +fi + +fi +if test "$tcl_ok" = 0; then + echo $ac_n "checking for strcasecmp in -linet""... $ac_c" 1>&6 +echo "configure:1241: checking for strcasecmp in -linet" >&5 +ac_lib_var=`echo inet'_'strcasecmp | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-linet $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1249 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char strcasecmp(); + +int main() { +strcasecmp() +; return 0; } +EOF +if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + tcl_ok=1 +else + echo "$ac_t""no" 1>&6 +tcl_ok=0 +fi + +fi +if test "$tcl_ok" = 0; then + cat >> confdefs.h <<\EOF +#define NO_STRCASECMP 1 +EOF + +fi + +# Check for Tcl and Tk. + +dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." +if test x"${no_tcl}" = x ; then + no_tcl=true + # Check whether --with-tclconfig or --without-tclconfig was given. +if test "${with_tclconfig+set}" = set; then + withval="$with_tclconfig" + with_tclconfig=${withval} +fi + + echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 +echo "configure:1301: checking for Tcl configuration script" >&5 + if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + if test x"${with_tclconfig}" != x ; then + if test -f "${with_tclconfig}/tclConfig.sh" ; then + ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` + else + { echo "configure: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" 1>&2; exit 1; } + fi + fi + + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in $dirlist; do + if test -f $srcdir/$i/unix/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)` + break + fi + done + fi + if test x"${ac_cv_c_tclconfig}" = x ; then + for i in $dirlist; do + if test -n "`ls -dr $i/tcl* 2>/dev/null`" ; then + tclconfpath=$i + break + fi + done + + for i in `ls -dr $tclconfpath/tcl* 2>/dev/null ` ; do + if test -f $i/unix/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/unix; pwd)` + break + fi + if test -f $i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/win; pwd)` + break + fi + done + fi + + if test x"${ac_cv_c_tclconfig}" = x ; then + ccpath=`which ${CC} | sed -e 's:/bin/.*::'`/lib + if test -f $ccpath/tclConfig.sh; then + ac_cv_c_tclconfig=$ccpath + fi + fi + +fi + + if test x"${ac_cv_c_tclconfig}" = x ; then + TCLCONFIG="" + echo "configure: warning: Can't find Tcl configuration definitions" 1>&2 + else + no_tcl="" + TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh + echo "$ac_t""${TCLCONFIG}" 1>&6 + fi +fi + + + + . $TCLCONFIG + + + + + + + + + + + + + + + + + + + + + +dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." +if test x"${no_tk}" = x ; then + no_tk=true + # Check whether --with-tkconfig or --without-tkconfig was given. +if test "${with_tkconfig+set}" = set; then + withval="$with_tkconfig" + with_tkconfig=${withval} +fi + + echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 +echo "configure:1396: checking for Tk configuration script" >&5 + if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + if test x"${with_tkconfig}" != x ; then + if test -f "${with_tkconfig}/tkConfig.sh" ; then + ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` + else + { echo "configure: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" 1>&2; exit 1; } + fi + fi + + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in $dirlist; do + if test -f $srcdir/$i/unix/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)` + break + fi + done + fi + if test x"${ac_cv_c_tkconfig}" = x ; then + for i in $dirlist; do + if test -n "`ls -dr $i/tk* 2>/dev/null`" ; then + tkconfpath=$i + break + fi + done + + for i in `ls -dr $tkconfpath/tk* 2>/dev/null ` ; do + if test -f $i/unix/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/unix; pwd)` + break + fi + if test -f $i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/win; pwd)` + break + fi + done + fi + + if test x"${ac_cv_c_tkconfig}" = x ; then + ccpath=`which ${CC} | sed -e 's:/bin/.*::'`/lib + if test -f $ccpath/tkConfig.sh; then + ac_cv_c_tkconfig=$ccpath + fi + fi + +fi + + if test x"${ac_cv_c_tkconfig}" = x ; then + TKCONFIG="" + echo "configure: warning: Can't find Tk configuration definitions" 1>&2 + else + no_tk="" + TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh + echo "$ac_t""${TKCONFIG}" 1>&6 + fi +fi + + + + if test -f "$TKCONFIG" ; then + . $TKCONFIG + fi + + + + + + + + + + + + + + + +dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." +no_tcl=true +echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 +echo "configure:1480: checking for Tcl headers in the source tree" >&5 +# Check whether --with-tclinclude or --without-tclinclude was given. +if test "${with_tclinclude+set}" = set; then + withval="$with_tclinclude" + with_tclinclude=${withval} +fi + +if eval "test \"`echo '$''{'ac_cv_c_tclh'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +if test x"${with_tclinclude}" != x ; then + if test -f ${with_tclinclude}/tcl.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)` + elif test -f ${with_tclinclude}/generic/tcl.h ; then + ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)` + else + { echo "configure: error: ${with_tclinclude} directory doesn't contain headers" 1>&2; exit 1; } + fi +fi + +if test x"${ac_cv_c_tclconfig}" != x ; then + for i in $dirlist; do + if test -f $ac_cv_c_tclconfig/$i/generic/tcl.h ; then + ac_cv_c_tclh=`(cd $ac_cv_c_tclconfig/$i/generic; pwd)` + break + fi + done +fi + +if test x"${ac_cv_c_tclh}" = x ; then + for i in $dirlist; do + if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then + tclpath=$srcdir/$i + break + fi + done + + for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do + if test -f $i/generic/tcl.h ; then + ac_cv_c_tclh=`(cd $i/generic; pwd)` + break + fi + done +fi + +if test x"${ac_cv_c_tclh}" = x ; then + ccpath=`which ${CC} | sed -e 's:/bin/.*::'`/include + if test -f $ccpath/tcl.h; then + ac_cv_c_tclh=$ccpath + fi +fi + +if test x"${ac_cv_c_tclh}" = x ; then + echo "$ac_t""none" 1>&6 + ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tcl.h""... $ac_c" 1>&6 +echo "configure:1537: checking for tcl.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1542 "configure" +#include "confdefs.h" +#include <tcl.h> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_cv_c_tclh=installed +else + echo "$ac_t""no" 1>&6 +ac_cv_c_tclh="" +fi + +else + echo "$ac_t""${ac_cv_c_tclh}" 1>&6 +fi + +fi + + TCLHDIR="" +if test x"${ac_cv_c_tclh}" = x ; then + { echo "configure: error: Can't find any Tcl headers" 1>&2; exit 1; } +fi +if test x"${ac_cv_c_tclh}" != x ; then + no_tcl="" + if test x"${ac_cv_c_tclh}" != x"installed" ; then + if test x"${CC}" = xcl ; then + tmp="`cygpath --windows ${ac_cv_c_tclh}`" + ac_cv_c_tclh="`echo $tmp | sed -e s#\\\\\\\\#/#g`" + fi + echo "$ac_t""${ac_cv_c_tclh}" 1>&6 + TCLHDIR="-I${ac_cv_c_tclh}" + fi +fi + + + +# FIXME: consider only doing this if --with-x given. + +# +# Ok, lets find the tk source trees so we can use the headers +# If the directory (presumably symlink) named "tk" exists, use that one +# in preference to any others. Same logic is used when choosing library +# and again with Tcl. The search order is the best place to look first, then in +# decreasing significance. The loop breaks if the trigger file is found. +# Note the gross little conversion here of srcdir by cd'ing to the found +# directory. This converts the path from a relative to an absolute, so +# recursive cache variables for the path will work right. We check all +# the possible paths in one loop rather than many seperate loops to speed +# things up. +# the alternative search directory is involked by --with-tkinclude +# +dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." +no_tk=true +echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 +echo "configure:1611: checking for Tk headers in the source tree" >&5 +# Check whether --with-tkinclude or --without-tkinclude was given. +if test "${with_tkinclude+set}" = set; then + withval="$with_tkinclude" + with_tkinclude=${withval} +fi + +if eval "test \"`echo '$''{'ac_cv_c_tkh'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +if test x"${with_tkinclude}" != x ; then + if test -f ${with_tkinclude}/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}; pwd)` + elif test -f ${with_tkinclude}/generic/tk.h ; then + ac_cv_c_tkh=`(cd ${with_tkinclude}/generic; pwd)` + else + { echo "configure: error: ${with_tkinclude} directory doesn't contain headers" 1>&2; exit 1; } + fi +fi + +if test x"${ac_cv_c_tkconfig}" != x ; then + for i in $dirlist; do + if test -f $ac_cv_c_tkconfig/$i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $ac_cv_c_tkconfig/$i/generic; pwd)` + break + fi + done +fi + +if test x"${ac_cv_c_tkh}" = x ; then + for i in $dirlist; do + if test -n "`ls -dr $srcdir/$i/tk* 2>/dev/null`" ; then + tkpath=$srcdir/$i + break + fi + done + + for i in `ls -dr $tkpath/tk* 2>/dev/null ` ; do + if test -f $i/generic/tk.h ; then + ac_cv_c_tkh=`(cd $i/generic; pwd)` + break + fi + done +fi + +if test x"${ac_cv_c_tkh}" = x ; then + echo "$ac_t""none" 1>&6 + ccpath=`which ${CC} | sed -e 's:/bin/.*::'`/include + if test -f $ccpath/tk.h; then + ac_cv_c_tkh=$ccpath + fi +else + echo "$ac_t""${ac_cv_c_tkh}" 1>&6 +fi + +fi + + TKHDIR="" +if test x"${ac_cv_c_tkh}" = x ; then + { echo "configure: error: Can't find any Tk headers" 1>&2; exit 1; } +fi +if test x"${ac_cv_c_tkh}" != x ; then + no_tk="" + if test x"${ac_cv_c_tkh}" != x"installed" ; then + if test x"${CC}" = xcl ; then + tmp="`cygpath --windows ${ac_cv_c_tkh}`" + ac_cv_c_tkh="`echo $tmp | sed -e s#\\\\\\\\#/#g`" + fi + echo "$ac_t""found in ${ac_cv_c_tkh}" 1>&6 + TKHDIR="-I${ac_cv_c_tkh}" + fi +fi + + + + +#-------------------------------------------------------------------- +# Find out the top level source directory of the Tix package. +#-------------------------------------------------------------------- +TIX_SRC_DIR=`cd ${srcdir}/../..; pwd` + +#-------------------------------------------------------------------- +# See if we should compile SAM +#-------------------------------------------------------------------- + +# Check whether --enable-sam or --disable-sam was given. +if test "${enable_sam+set}" = set; then + enableval="$enable_sam" + ok=$enableval +else + ok=no +fi + + +if test "$ok" = "yes"; then + TIX_BUILD_SAM="yes" + TIX_SAM_TARGETS='$(SAM_TARGETS)' +else + TIX_BUILD_SAM="no" +fi + + TIX_SAM_INSTALL=_install_sam_lib_ + +IS_ITCL=0 +ITCL_BUILD_LIB_SPEC="" +ITK_BUILD_LIB_SPEC="" +TIX_EXE_FILE=tixwish +TCL_SAMEXE_FILE=satclsh +TK_SAMEXE_FILE=sawish +TIX_SAMEXE_FILE=satixwish + +#-------------------------------------------------------------------- +# Read in configuration information generated by Tcl for shared +# libraries, and arrange for it to be substituted into our +# Makefile. +#-------------------------------------------------------------------- + +CC=$TCL_CC +SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS +SHLIB_LD=$TCL_SHLIB_LD +SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS +SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX +SHLIB_VERSION=$TCL_SHLIB_VERSION + +DL_LIBS=$TCL_DL_LIBS +LD_FLAGS=$TCL_LD_FLAGS +TIX_LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS + +#-------------------------------------------------------------------- +# Read in configuration information generated by Tk and arrange +# for it to be substituted into our Makefile. +#-------------------------------------------------------------------- + +TIX_DEFS="$TK_DEFS $TCL_DEFS" + +# Note: in the following variable, it's important to use the absolute +# path name of the Tcl directory rather than "..": this is because +# AIX remembers this path and will attempt to use it at run-time to look +# up the Tcl library. + +TIX_BUILD_LOCATION="`pwd`" +if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}" + TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam${VERSION}" + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}" +else + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`" + TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`" + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`" +fi + +#-------------------------------------------------------------------- +# See if we should compile shared library. +#-------------------------------------------------------------------- + +# Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + ok=$enableval +else + ok=no +fi + + +if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then + TIX_SHLIB_CFLAGS="${SHLIB_CFLAGS}" + TIX_RANLIB=":" + + # The main Tix library + # + eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" + TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + + # The Tcl SAM library + # + VERSION=8.1 + eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}" + TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}" + + # The Tk SAM library + # + VERSION=8.1 + eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}" + TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}" + + # The Tix SAM library + # + VERSION=${BIN_VERSION} + eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" + TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" + +else + TIX_SHLIB_CFLAGS="" + TIX_RANLIB='$(RANLIB)' + + # The main Tix library + # + eval "TIX_LIB_FILE=libtix${TCL_UNSHARED_LIB_SUFFIX}" + TIX_MAKE_LIB="ar cr ${TIX_LIB_FILE} \${OBJS}" + + # The Tcl SAM library + + VERSION=8.1 + eval "TCL_SAM_FILE=libtclsam${TCL_UNSHARED_LIB_SUFFIX}" + TCL_MAKE_SAM="ar cr ${TCL_SAM_FILE} \${TCL_SAM_OBJS}" + + # The Tk SAM library + # + VERSION=8.1 + eval "TK_SAM_FILE=libtksam${TCL_UNSHARED_LIB_SUFFIX}" + TK_MAKE_SAM="ar cr ${TK_SAM_FILE} \${TK_SAM_OBJS}" + + # The Tix SAM library + # + VERSION=${BIN_VERSION} + eval "TIX_SAM_FILE=libtixsam${TCL_UNSHARED_LIB_SUFFIX}" + TIX_MAKE_SAM="ar cr ${TIX_SAM_FILE} \${TIX_SAM_OBJS}" +fi + +TIX_LIB_FULL_PATH="`pwd`/${TIX_LIB_FILE}" + +#-------------------------------------------------------------------- +# Check for the existence of the -lsocket and -lnsl libraries. +# The order here is important, so that they end up in the right +# order in the command line generated by make. Here are some +# special considerations: +# 1. Use "connect" and "accept" to check for -lsocket, and +# "gethostbyname" to check for -lnsl. +# 2. Use each function name only once: can't redo a check because +# autoconf caches the results of the last check and won't redo it. +# 3. Use -lnsl and -lsocket only if they supply procedures that +# aren't already present in the normal libraries. This is because +# IRIX 5.2 has libraries, but they aren't needed and they're +# bogus: they goof up name resolution if used. +# 4. On some SVR4 systems, can't use -lsocket without -lnsl too. +# To get around this problem, check for both libraries together +# if -lsocket doesn't work by itself. +#-------------------------------------------------------------------- + +checked=0 +for i in $TK_LIBS; do + if test "$i" = "-lsocket"; then + checked=1 + fi +done + +if test "$checked" = "0"; then + tcl_checkBoth=0 + echo $ac_n "checking for connect""... $ac_c" 1>&6 +echo "configure:1865: checking for connect" >&5 +if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1870 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { + +/* 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_connect) || defined (__stub___connect) +choke me +#else +connect(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_connect=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then + echo "$ac_t""yes" 1>&6 + tcl_checkSocket=0 +else + echo "$ac_t""no" 1>&6 +tcl_checkSocket=1 +fi + + if test "$tcl_checkSocket" = 1; then + echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 +echo "configure:1915: checking for main in -lsocket" >&5 +ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1923 "configure" +#include "confdefs.h" + +int main() { +main() +; return 0; } +EOF +if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + TK_LIBS="$TK_LIBS -lsocket" +else + echo "$ac_t""no" 1>&6 +tcl_checkBoth=1 +fi + + fi + if test "$tcl_checkBoth" = 1; then + tk_oldLibs=$TK_LIBS + TK_LIBS="$TK_LIBS -lsocket -lnsl" + echo $ac_n "checking for accept""... $ac_c" 1>&6 +echo "configure:1956: checking for accept" >&5 +if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 1961 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char accept(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char accept(); + +int main() { + +/* 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_accept) || defined (__stub___accept) +choke me +#else +accept(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_accept=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_accept=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'accept`\" = yes"; then + echo "$ac_t""yes" 1>&6 + tcl_checkNsl=0 +else + echo "$ac_t""no" 1>&6 +TK_LIBS=$tk_oldLibs +fi + + fi + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:2006: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2011 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { + +/* 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_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +gethostbyname(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 +echo "configure:2052: checking for main in -lnsl" >&5 +ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $LIBS" +cat > conftest.$ac_ext <<EOF +#line 2060 "configure" +#include "confdefs.h" + +int main() { +main() +; return 0; } +EOF +if { (eval echo configure:2067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + TK_LIBS="$TK_LIBS -lnsl" +else + echo "$ac_t""no" 1>&6 +fi + +fi + +fi + +#---------------------------------------------------------------------- +# Substitution strings exported by TIX +#---------------------------------------------------------------------- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# The "binary version" of Tix (see docs/Pkg.txt) +TIX_VERSION_PKG=${BIN_VERSION} + + +TIXSAM_PKG_FILE="[file join [file dirname \$dir] ${TIX_SAM_FILE}]" +if test "$TIX_BUILD_SAM" = "yes"; then + TIX_SAM_PACKAGE_IFNEEDED="package ifneeded Tixsam ${TIX_VERSION_PKG} [list load \"${TIXSAM_PKG_FILE}\" Tixsam]" +fi + +# The package file, usually a shared library +TIX_PKG_FILE="[file join [file dirname \$dir] ${TIX_LIB_FILE}]" + + + +trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# 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. +# 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. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs + + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS <<EOF +#! /bin/sh +# Generated automatically by configure. +# Run this file to recreate the current configuration. +# This directory was configured as follows, +# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" + +trap 'rm -fr `echo "Makefile pkgIndex.tcl ../../tixConfig.sh" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <<EOF + +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@CC@%$CC%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@RANLIB@%$RANLIB%g +s%@CPP@%$CPP%g +s%@SET_MAKE@%$SET_MAKE%g +s%@TCLCONFIG@%$TCLCONFIG%g +s%@TCL_DEFS@%$TCL_DEFS%g +s%@TCL_LIB_FILE@%$TCL_LIB_FILE%g +s%@TCL_LIB_FULL_PATH@%$TCL_LIB_FULL_PATH%g +s%@TCL_LIBS@%$TCL_LIBS%g +s%@TCL_CFLAGS@%$TCL_CFLAGS%g +s%@TCL_SHLIB_CFLAGS@%$TCL_SHLIB_CFLAGS%g +s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g +s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g +s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g +s%@TCL_RANLIB@%$TCL_RANLIB%g +s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g +s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g +s%@TKCONFIG@%$TKCONFIG%g +s%@TK_VERSION@%$TK_VERSION%g +s%@TK_DEFS@%$TK_DEFS%g +s%@TK_LIB_FILE@%$TK_LIB_FILE%g +s%@TK_LIB_FULL_PATH@%$TK_LIB_FULL_PATH%g +s%@TK_LIBS@%$TK_LIBS%g +s%@TK_BUILD_INCLUDES@%$TK_BUILD_INCLUDES%g +s%@TK_XINCLUDES@%$TK_XINCLUDES%g +s%@TK_XLIBSW@%$TK_XLIBSW%g +s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g +s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g +s%@TCLHDIR@%$TCLHDIR%g +s%@TKHDIR@%$TKHDIR%g +s%@TIX_RANLIB@%$TIX_RANLIB%g +s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g +s%@SHLIB_LD@%$SHLIB_LD%g +s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g +s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g +s%@SHLIB_VERSION@%$SHLIB_VERSION%g +s%@DL_LIBS@%$DL_LIBS%g +s%@LD_FLAGS@%$LD_FLAGS%g +s%@TCL_VERSION@%$TCL_VERSION%g +s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g +s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g +s%@TK_SRC_DIR@%$TK_SRC_DIR%g +s%@TK_BIN_DIR@%$TK_BIN_DIR%g +s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g +s%@TIX_MAJOR_VERSION@%$TIX_MAJOR_VERSION%g +s%@TIX_MINOR_VERSION@%$TIX_MINOR_VERSION%g +s%@TIX_VERSION@%$TIX_VERSION%g +s%@TIX_SRC_DIR@%$TIX_SRC_DIR%g +s%@TIX_SHLIB_CFLAGS@%$TIX_SHLIB_CFLAGS%g +s%@TIX_MAKE_LIB@%$TIX_MAKE_LIB%g +s%@TIX_LIB_FILE@%$TIX_LIB_FILE%g +s%@TIX_BUILD_LIB_SPEC@%$TIX_BUILD_LIB_SPEC%g +s%@TIX_LIB_SPEC@%$TIX_LIB_SPEC%g +s%@TIX_EXE_FILE@%$TIX_EXE_FILE%g +s%@TIX_SAM_TARGETS@%$TIX_SAM_TARGETS%g +s%@TIX_SAM_INSTALL@%$TIX_SAM_INSTALL%g +s%@TIX_LIB_FULL_PATH@%$TIX_LIB_FULL_PATH%g +s%@TCL_SAM_FILE@%$TCL_SAM_FILE%g +s%@TCL_MAKE_SAM@%$TCL_MAKE_SAM%g +s%@TK_SAM_FILE@%$TK_SAM_FILE%g +s%@TK_MAKE_SAM@%$TK_MAKE_SAM%g +s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g +s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g +s%@TIX_DEFS@%$TIX_DEFS%g +s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g +s%@ITCL_LIB_FULL_PATH@%$ITCL_LIB_FULL_PATH%g +s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g +s%@TCL_SAMEXE_FILE@%$TCL_SAMEXE_FILE%g +s%@TK_SAMEXE_FILE@%$TK_SAMEXE_FILE%g +s%@TIX_SAMEXE_FILE@%$TIX_SAMEXE_FILE%g +s%@TCL_BUILD_SAM_SPEC@%$TCL_BUILD_SAM_SPEC%g +s%@TK_BUILD_SAM_SPEC@%$TK_BUILD_SAM_SPEC%g +s%@TIX_BUILD_SAM_SPEC@%$TIX_BUILD_SAM_SPEC%g +s%@TIX_BUILD_LOCATION@%$TIX_BUILD_LOCATION%g +s%@TIX_VERSION_PKG@%$TIX_VERSION_PKG%g +s%@TIX_PKG_FILE@%$TIX_PKG_FILE%g +s%@TIX_SAM_PACKAGE_IFNEEDED@%$TIX_SAM_PACKAGE_IFNEEDED%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# 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_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # 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" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <<EOF + +CONFIG_FILES=\${CONFIG_FILES-"Makefile pkgIndex.tcl ../../tixConfig.sh"} +EOF +cat >> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +EOF +cat >> $CONFIG_STATUS <<EOF + +EOF +cat >> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + + diff --git a/tix/unix/tk8.3/configure.in b/tix/unix/tk8.3/configure.in new file mode 100644 index 00000000000..701c794d28b --- /dev/null +++ b/tix/unix/tk8.3/configure.in @@ -0,0 +1,372 @@ +dnl This file is an input file used by the GNU "autoconf" program to +dnl generate the file "configure", which is run to configure the +dnl Makefile in this directory. + +AC_INIT(../../generic/tixInit.c) + +#-------------------------------------------------------------------- +# Remove the ./config.cache file and rerun configure if +# the cache file belong to a different architecture +# +# This doesn't seem to work in the Cygnus environment, +# it causes an error message about having more than +# one target, so I disabled it. meissner@cygnus.com +#---------------------------------------------------------------------- +#AC_CHECK_PROG(UNAME, uname -a, [uname -a], "") +#if test "$UNAME" = ""; then +# AC_CHECK_PROG(UNAME, uname, [uname], "") +#fi +# +#if test "$UNAME" != ""; then +# uname=`$UNAME` +# AC_MSG_CHECKING([cached value of \$uname]) +# AC_CACHE_VAL(ac_cv_prog_uname, [nocached=1 ac_cv_prog_uname=`$UNAME`]) +# if test "$nocached" = "1"; then +# AC_MSG_RESULT(no) +# else +# AC_MSG_RESULT(yes) +# fi +# +# if test "$uname" != "$ac_cv_prog_uname"; then +# echo "Running on a different machine/architecture. Can't use cached values" +# echo "Removing config.cache and running configure again ..." +# rm -f config.cache +# CMDLINE="$0 $*" +# exec $CMDLINE +# fi +#fi + +#---------------------------------------------------------------------- +# We don't want to use any relative path because we need to generate +# Makefile's in subdirectories +#---------------------------------------------------------------------- +if test "$INSTALL" = "./install.sh"; then + INSTALL=`pwd`/install.sh +fi + +#-------------------------------------------------------------------- +# Version information about this TIX release. +#-------------------------------------------------------------------- + +TIX_VERSION=4.1 +TIX_MAJOR_VERSION=4 +TIX_MINOR_VERSION=1 + +BIN_VERSION=${TIX_VERSION}.8.1 + + +VERSION=${BIN_VERSION} + +#-------------------------------------------------------------------- +# See if user wants to use gcc to compile Tix. This option must +# be used before any checking that uses the C compiler. +#-------------------------------------------------------------------- + +AC_ARG_ENABLE(gcc, [ --enable-gcc allow use of gcc if available], + [tix_ok=$enableval], [tix_ok=no]) +if test "$tix_ok" = "yes"; then + AC_PROG_CC +else + CC=${CC-cc} +AC_SUBST(CC) +fi + +AC_PROG_INSTALL +AC_PROG_RANLIB +AC_HAVE_HEADERS(unistd.h limits.h) +AC_PROG_MAKE_SET + +#-------------------------------------------------------------------- +# unsigned char is not supported by some non-ANSI compilers. +#-------------------------------------------------------------------- + +AC_MSG_CHECKING([unsigned char]) +AC_TRY_COMPILE([#include <stdio.h>],[ + unsigned char c = 'c'; +], tcl_ok=supported, tcl_ok=notsupported) + +AC_MSG_RESULT($tcl_ok) +if test $tcl_ok = supported; then + AC_DEFINE(UCHAR_SUPPORTED) +fi + +#-------------------------------------------------------------------- +# Check whether there is an strcasecmp function on this system. +# This is a bit tricky because under SCO it's in -lsocket and +# under Sequent Dynix it's in -linet. +#-------------------------------------------------------------------- + +AC_CHECK_FUNC(strcasecmp, tcl_ok=1, tcl_ok=0) +if test "$tcl_ok" = 0; then + AC_CHECK_LIB(socket, strcasecmp, tcl_ok=1, tcl_ok=0) +fi +if test "$tcl_ok" = 0; then + AC_CHECK_LIB(inet, strcasecmp, tcl_ok=1, tcl_ok=0) +fi +if test "$tcl_ok" = 0; then + AC_DEFINE(NO_STRCASECMP) +fi + +# Check for Tcl and Tk. +CYG_AC_PATH_TCLCONFIG +CYG_AC_LOAD_TCLCONFIG +CYG_AC_PATH_TKCONFIG +CYG_AC_LOAD_TKCONFIG +CYG_AC_PATH_TCLH +# FIXME: consider only doing this if --with-x given. +CYG_AC_PATH_TKH + +#-------------------------------------------------------------------- +# Find out the top level source directory of the Tix package. +#-------------------------------------------------------------------- +TIX_SRC_DIR=`cd ${srcdir}/../..; pwd` + +#-------------------------------------------------------------------- +# See if we should compile SAM +#-------------------------------------------------------------------- + +AC_ARG_ENABLE(sam, + [ --enable-sam build stand-alone modules], + [ok=$enableval], [ok=no]) + +if test "$ok" = "yes"; then + TIX_BUILD_SAM="yes" + TIX_SAM_TARGETS='$(SAM_TARGETS)' +else + TIX_BUILD_SAM="no" +fi + + TIX_SAM_INSTALL=_install_sam_lib_ + +IS_ITCL=0 +ITCL_BUILD_LIB_SPEC="" +ITK_BUILD_LIB_SPEC="" +TIX_EXE_FILE=tixwish +TCL_SAMEXE_FILE=satclsh +TK_SAMEXE_FILE=sawish +TIX_SAMEXE_FILE=satixwish + +#-------------------------------------------------------------------- +# Read in configuration information generated by Tcl for shared +# libraries, and arrange for it to be substituted into our +# Makefile. +#-------------------------------------------------------------------- + +CC=$TCL_CC +SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS +SHLIB_LD=$TCL_SHLIB_LD +SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS +SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX +SHLIB_VERSION=$TCL_SHLIB_VERSION + +DL_LIBS=$TCL_DL_LIBS +LD_FLAGS=$TCL_LD_FLAGS +TIX_LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS + +#-------------------------------------------------------------------- +# Read in configuration information generated by Tk and arrange +# for it to be substituted into our Makefile. +#-------------------------------------------------------------------- + +TIX_DEFS="$TK_DEFS $TCL_DEFS" + +# Note: in the following variable, it's important to use the absolute +# path name of the Tcl directory rather than "..": this is because +# AIX remembers this path and will attempt to use it at run-time to look +# up the Tcl library. + +TIX_BUILD_LOCATION="`pwd`" +if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}" + TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam${VERSION}" + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}" +else + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`" + TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`" + TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`" + TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`" + TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`" +fi + +#-------------------------------------------------------------------- +# See if we should compile shared library. +#-------------------------------------------------------------------- + +AC_ARG_ENABLE(shared, + [ --enable-shared build libtix as a shared library], + [ok=$enableval], [ok=no]) + +if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then + TIX_SHLIB_CFLAGS="${SHLIB_CFLAGS}" + TIX_RANLIB=":" + + # The main Tix library + # + eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" + TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + + # The Tcl SAM library + # + VERSION=8.1 + eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}" + TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}" + + # The Tk SAM library + # + VERSION=8.1 + eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}" + TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}" + + # The Tix SAM library + # + VERSION=${BIN_VERSION} + eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" + TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" + +else + TIX_SHLIB_CFLAGS="" + TIX_RANLIB='$(RANLIB)' + + # The main Tix library + # + eval "TIX_LIB_FILE=libtix${TCL_UNSHARED_LIB_SUFFIX}" + TIX_MAKE_LIB="ar cr ${TIX_LIB_FILE} \${OBJS}" + + # The Tcl SAM library + + VERSION=8.1 + eval "TCL_SAM_FILE=libtclsam${TCL_UNSHARED_LIB_SUFFIX}" + TCL_MAKE_SAM="ar cr ${TCL_SAM_FILE} \${TCL_SAM_OBJS}" + + # The Tk SAM library + # + VERSION=8.1 + eval "TK_SAM_FILE=libtksam${TCL_UNSHARED_LIB_SUFFIX}" + TK_MAKE_SAM="ar cr ${TK_SAM_FILE} \${TK_SAM_OBJS}" + + # The Tix SAM library + # + VERSION=${BIN_VERSION} + eval "TIX_SAM_FILE=libtixsam${TCL_UNSHARED_LIB_SUFFIX}" + TIX_MAKE_SAM="ar cr ${TIX_SAM_FILE} \${TIX_SAM_OBJS}" +fi + +TIX_LIB_FULL_PATH="`pwd`/${TIX_LIB_FILE}" + +#-------------------------------------------------------------------- +# Check for the existence of the -lsocket and -lnsl libraries. +# The order here is important, so that they end up in the right +# order in the command line generated by make. Here are some +# special considerations: +# 1. Use "connect" and "accept" to check for -lsocket, and +# "gethostbyname" to check for -lnsl. +# 2. Use each function name only once: can't redo a check because +# autoconf caches the results of the last check and won't redo it. +# 3. Use -lnsl and -lsocket only if they supply procedures that +# aren't already present in the normal libraries. This is because +# IRIX 5.2 has libraries, but they aren't needed and they're +# bogus: they goof up name resolution if used. +# 4. On some SVR4 systems, can't use -lsocket without -lnsl too. +# To get around this problem, check for both libraries together +# if -lsocket doesn't work by itself. +#-------------------------------------------------------------------- + +checked=0 +for i in $TK_LIBS; do + if test "$i" = "-lsocket"; then + checked=1 + fi +done + +if test "$checked" = "0"; then + tcl_checkBoth=0 + AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1) + if test "$tcl_checkSocket" = 1; then + AC_CHECK_LIB(socket, main, TK_LIBS="$TK_LIBS -lsocket", + tcl_checkBoth=1) + fi + if test "$tcl_checkBoth" = 1; then + tk_oldLibs=$TK_LIBS + TK_LIBS="$TK_LIBS -lsocket -lnsl" + AC_CHECK_FUNC(accept, tcl_checkNsl=0, [TK_LIBS=$tk_oldLibs]) + fi + AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, + [TK_LIBS="$TK_LIBS -lnsl"])) +fi + +#---------------------------------------------------------------------- +# Substitution strings exported by TIX +#---------------------------------------------------------------------- +AC_SUBST(CC) +AC_SUBST(RANLIB) +AC_SUBST(TIX_RANLIB) +AC_SUBST(SHLIB_CFLAGS) +AC_SUBST(SHLIB_LD) +AC_SUBST(SHLIB_LD_LIBS) +AC_SUBST(SHLIB_SUFFIX) +AC_SUBST(SHLIB_VERSION) +AC_SUBST(DL_LIBS) +AC_SUBST(LD_FLAGS) +AC_SUBST(TCL_BUILD_LIB_SPEC) +AC_SUBST(TCL_LIBS) +AC_SUBST(TCL_VERSION) +AC_SUBST(TCL_SRC_DIR) +AC_SUBST(TCL_BIN_DIR) +AC_SUBST(TCL_LIB_FULL_PATH) +AC_SUBST(TK_BUILD_LIB_SPEC) +AC_SUBST(TK_LIBS) +AC_SUBST(TK_VERSION) +AC_SUBST(TK_SRC_DIR) +AC_SUBST(TK_BIN_DIR) +AC_SUBST(TK_XINCLUDES) +AC_SUBST(TK_LIB_FULL_PATH) +AC_SUBST(TIX_LD_SEARCH_FLAGS) +AC_SUBST(TIX_MAJOR_VERSION) +AC_SUBST(TIX_MINOR_VERSION) +AC_SUBST(TIX_VERSION) +AC_SUBST(TIX_SRC_DIR) +AC_SUBST(TIX_SHLIB_CFLAGS) +AC_SUBST(TIX_MAKE_LIB) +AC_SUBST(TIX_LIB_FILE) +AC_SUBST(TIX_BUILD_LIB_SPEC) +AC_SUBST(TIX_LIB_SPEC) +AC_SUBST(TIX_EXE_FILE) +AC_SUBST(TIX_SAM_TARGETS) +AC_SUBST(TIX_SAM_INSTALL) +AC_SUBST(TIX_LIB_FULL_PATH) +AC_SUBST(TCL_SAM_FILE) +AC_SUBST(TCL_MAKE_SAM) +AC_SUBST(TK_SAM_FILE) +AC_SUBST(TK_MAKE_SAM) +AC_SUBST(TIX_SAM_FILE) +AC_SUBST(TIX_MAKE_SAM) +AC_SUBST(TIX_DEFS) +AC_SUBST(ITCL_BUILD_LIB_SPEC) +AC_SUBST(ITCL_LIB_FULL_PATH) +AC_SUBST(ITK_BUILD_LIB_SPEC) +AC_SUBST(TCL_SAMEXE_FILE) +AC_SUBST(TK_SAMEXE_FILE) +AC_SUBST(TIX_SAMEXE_FILE) +AC_SUBST(TCL_BUILD_SAM_SPEC) +AC_SUBST(TK_BUILD_SAM_SPEC) +AC_SUBST(TIX_BUILD_SAM_SPEC) +AC_SUBST(TIX_BUILD_LOCATION) + +# The "binary version" of Tix (see docs/Pkg.txt) +TIX_VERSION_PKG=${BIN_VERSION} +AC_SUBST(TIX_VERSION_PKG) + +TIXSAM_PKG_FILE="[[file join [file dirname \$dir] ${TIX_SAM_FILE}]]" +if test "$TIX_BUILD_SAM" = "yes"; then + TIX_SAM_PACKAGE_IFNEEDED="package ifneeded Tixsam ${TIX_VERSION_PKG} [[list load \"${TIXSAM_PKG_FILE}\" Tixsam]]" +fi + +# The package file, usually a shared library +TIX_PKG_FILE="[[file join [file dirname \$dir] ${TIX_LIB_FILE}]]" +AC_SUBST(TIX_PKG_FILE) +AC_SUBST(TIX_SAM_PACKAGE_IFNEEDED) + +AC_OUTPUT(Makefile pkgIndex.tcl ../../tixConfig.sh) + diff --git a/tix/unix/tk8.3/pkgIndex.tcl.in b/tix/unix/tk8.3/pkgIndex.tcl.in new file mode 100644 index 00000000000..fc82f9db9b6 --- /dev/null +++ b/tix/unix/tk8.3/pkgIndex.tcl.in @@ -0,0 +1,4 @@ +# Tcl package index file, version 1.0 + +package ifneeded Tix @TIX_VERSION_PKG@ [list load "@TIX_PKG_FILE@" Tix] +@TIX_SAM_PACKAGE_IFNEEDED@ diff --git a/tix/unix/tk8.3/tixAppInit.c b/tix/unix/tk8.3/tixAppInit.c new file mode 100644 index 00000000000..69621043b2d --- /dev/null +++ b/tix/unix/tk8.3/tixAppInit.c @@ -0,0 +1,112 @@ +/* + * tixAppInit.c -- + * + * Provides a default version of the Tcl_AppInit procedure for + * use in wish and similar Tk-based applications. + * + * Copyright (c) 1995 Ioi K Lam + * 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. + */ + +#include <tk.h> +#include <tix.h> + +/* + * The following variable is a special hack that is needed in order for + * Sun shared libraries to be used for Tcl. + */ + +extern int matherr(); +int *tclDummyMathPtr = (int *) matherr; + +/* + *---------------------------------------------------------------------- + * + * main -- + * + * This is the main program for the application. + * + * Results: + * None: Tk_Main never returns here, so this procedure never + * returns either. + * + * Side effects: + * Whatever the application does. + * + *---------------------------------------------------------------------- + */ + +int +main(argc, argv) + int argc; /* Number of command-line arguments. */ + char **argv; /* Values of command-line arguments. */ +{ + Tk_Main(argc, argv, Tcl_AppInit); + return 0; /* Needed only to prevent compiler warning. */ +} + +/* + *---------------------------------------------------------------------- + * + * Tcl_AppInit -- + * + * This procedure performs application-specific initialization. + * Most applications, especially those that incorporate additional + * packages, will have their own version of this procedure. + * + * Results: + * Returns a standard Tcl completion code, and leaves an error + * message in interp->result if an error occurs. + * + * Side effects: + * Depends on the startup script. + * + *---------------------------------------------------------------------- + */ + +int +Tcl_AppInit(interp) + Tcl_Interp *interp; /* Interpreter for application. */ +{ + if (Tcl_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + if (Tk_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticPackage(interp, "Tk", Tk_Init, (Tcl_PackageInitProc *) NULL); + if (Tix_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + Tcl_StaticPackage(interp, "Tix", Tix_Init, (Tcl_PackageInitProc *) NULL); + + /* + * Call the init procedures for included packages. Each call should + * look like this: + * + * if (Mod_Init(interp) == TCL_ERROR) { + * return TCL_ERROR; + * } + * + * where "Mod" is the name of the module. + */ + + /* + * Call Tcl_CreateCommand for application-specific commands, if + * they weren't already created by the init procedures called above. + */ + + /* + * Specify a user-specific startup file to invoke if the application + * is run interactively. Typically the startup file is "~/.apprc" + * where "app" is the name of the application. If this line is deleted + * then no user-specific startup file will be run under any conditions. + */ + Tix_SetRcFileName(interp, "~/.tixwishrc"); + + return TCL_OK; +} diff --git a/tix/win/Makefile.in b/tix/win/Makefile.in index 3797c8581e0..93957a44682 100644 --- a/tix/win/Makefile.in +++ b/tix/win/Makefile.in @@ -10,10 +10,11 @@ CC = @CC@ CFLAGS = @CFLAGS@ NM = @NM@ AS = @AS@ -LD = @LD@ DLLTOOL = @DLLTOOL@ WINDRES = @WINDRES@ OBJEXT = @OBJEXT@ +CYGWIN = @CYGWIN@ +GCC = @GCC@ # makefile.vc -- # @@ -203,6 +204,48 @@ CONSOLE_OBJ = tkConsole81.$(OBJEXT) endif +ifeq ($(TCL_VER),8.3) + +TMPDIR = tcl8.3 +TCLDIR = ../../tcl8.1 +TCLSRCDIR = $(srcdir)/../../tcl8.1 +TKDIR = ../../tk8.1 +TKSRCDIR = $(srcdir)/../../tk8.1 + +ifeq ($(CYGWIN),yes) +TCLLIB = libcygtcl83.a +TKLIB = libcygtk83.a +TIXLIB = $(TMPDIR)/libtix4183.a +TIXLIBNAME = libtix4183.a +TIXDLL = $(TMPDIR)/cygtix4183.dll +TIXDLLNAME = cygtix4183.dll +else +ifeq ($(GCC),yes) +TCLLIB = librhtcl83.a +TKLIB = librhtk83.a +TIXLIB = $(TMPDIR)/libtix4183.a +TIXLIBNAME = libtix4183.a +TIXDLL = $(TMPDIR)/tix4183.dll +TIXDLLNAME = tix4183.dll +else +TCLLIB = rhtcl83.lib +TKLIB = rhtk83.lib +TIXRAWLIBNAME = $(TMPDIR)/tix4183.lib +TIXLIB = $(TMPDIR)/libtix4183.a +TIXLIBNAME = libtix4183.a +TIXDLL = $(TMPDIR)/tix4183.dll +TIXDLLNAME = tix4183.dll +endif +endif + +TIXWISH = $(TMPDIR)/tix4183.exe +TIXWISHNAME = tix4183.exe + +CONSOLE_OBJ = tkConsole81.$(OBJEXT) + +endif + + ifeq ($(TCL_VER),2.2i) TMPDIR = itcl2.2 @@ -247,19 +290,12 @@ ROOT = .. # uncomment the following two lines to compile with TCL_MEM_DEBUG #DEBUGDEFINES =-DTCL_MEM_DEBUG -# Make sure the VC++ tools are at the head of the path -#PATH=$(TOOLS32)\bin;$(PATH) - TCLLIBDIR = $(TCLDIR)/win TKLIBDIR = $(TKDIR)/win WINDIR = $(ROOT)/win GENERICDIR = $(ROOT)/generic XLIBDIR = $(ROOT)/xlib -cc32 = $(TOOLS32)\bin\cl -I$(TOOLS32)\include -rc32 = $(TOOLS32)\bin\rc -link32 = $(TOOLS32)\bin\link - #---------------------------------------------------------------------- # You shouldn't normally modify anything below this line #---------------------------------------------------------------------- @@ -274,10 +310,11 @@ TK_DEFINES = \ -nologo $(DEBUGDEFINES) WISHOBJS = \ - $(TMPDIR)/tixWinMain.$(OBJEXT) + $(TMPDIR)/tixWinMain.$(OBJEXT) \ + $(TMPDIR)/$(CONSOLE_OBJ) \ + $(TMPDIR)/tixwishres.$(OBJEXT) TIXOBJS = \ - $(TMPDIR)/$(CONSOLE_OBJ) \ $(TMPDIR)/tixClass.$(OBJEXT) \ $(TMPDIR)/tixCmds.$(OBJEXT) \ $(TMPDIR)/tixCompat.$(OBJEXT) \ @@ -325,13 +362,6 @@ CP = copy all: $(TIXDLL) $(TIXWISH) -$(TMPDIR)/tixcyg.def: $(TIXOBJS) - echo 'EXPORTS' > tmp.def - for o in $(TIXOBJS); do \ - $(NM) --extern-only --defined-only $$o | sed -e 's/[^ ]* [^ ]* //' -e 's/^_//' | fgrep -v DllEntryPoint | fgrep -v DllMain | fgrep -v impure_ptr | fgrep -v _real@ >> tmp.def; \ - done - mv tmp.def $(TMPDIR)/tixcyg.def - # USE THESE IF YOU DO NOT WANT TO LINK TO ON MSVCRT.DLL #XGUILIBS = $(guilibs) #XCVARS = $(cvars) @@ -342,35 +372,33 @@ XCVARS = $(cvarsdll) # (ToDo) $(TIXDLL) doesn't have resources to define its icon, etc. # -ifeq ($(OBJEXT),o) +ifeq ($(GCC),yes) -$(TIXDLL): $(TIXOBJS) $(TMPDIR)/tixcyg.def - $(CC) -s -nostartfiles -Wl,--base-file,tix.base -Wl,--dll -o $(TIXDLLNAME) $(TIXOBJS) $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) -lcygwin -ladvapi32 -luser32 -lgdi32 -lcomdlg32 -lkernel32 -Wl,--subsystem,windows -Wl,-e,_DllMain@12 -Wl,--image-base,0x66600000 - $(DLLTOOL) --as=$(AS) --dllname $(TIXDLLNAME) --def $(TMPDIR)/tixcyg.def --base-file tix.base --output-exp tix.exp - $(CC) -s -nostartfiles -Wl,--base-file,tix.base -Wl,tix.exp -Wl,-dll -o $(TIXDLLNAME) $(TIXOBJS) $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) -lcygwin -ladvapi32 -luser32 -lgdi32 -lcomdlg32 -lkernel32 -Wl,--subsystem,windows -Wl,-e,_DllMain@12 -Wl,--image-base,0x66600000 - $(DLLTOOL) --as=$(AS) --dllname $(TIXDLLNAME) --def $(TMPDIR)/tixcyg.def --base-file tix.base --output-exp tix.exp - $(CC) -nostartfiles -Wl,tix.exp -Wl,--dll -o $(TIXDLLNAME) $(TIXOBJS) $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) -lcygwin -ladvapi32 -luser32 -lgdi32 -lcomdlg32 -lkernel32 -Wl,--subsystem,windows -Wl,-e,_DllMain@12 -Wl,--image-base,0x66600000 +$(TIXDLL): $(TIXOBJS) + $(CC) -shared -s -nostartfiles -o $(TIXDLLNAME) $(TIXOBJS) \ + $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) -lgdi32 \ + -mwindows -e _DllMain@12 -Wl,--image-base,0x66600000 \ + -Wl,--out-implib,$(TIXLIB) cp $(TIXDLLNAME) $(TIXDLL) -$(TIXLIB): $(TMPDIR)/tixcyg.def - $(DLLTOOL) --as=$(AS) --dllname $(TIXDLLNAME) --def $(TMPDIR)/tixcyg.def --output-lib $(TIXLIB) +$(TIXLIB): $(TIXDLL) -$(TIXWISH): $(WISHOBJS) $(TIXOBJS) $(TIXLIB) $(TMPDIR)/tixwishres.$(OBJEXT) - $(CC) -mwindows $(WISHOBJS) $(TMPDIR)/tixwishres.$(OBJEXT) $(TIXLIB) \ +$(TIXWISH): $(WISHOBJS) $(TIXLIB) + $(CC) -mwindows $(WISHOBJS) $(TIXLIB) \ $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) \ -o $(TIXWISH) else -$(TIXDLL): $(TIXOBJS) $(TMPDIR)/tixcyg.def +$(TIXDLL): $(TIXOBJS) link -debug -dll -out:$(TIXDLL) $(TKLIBDIR)/$(TKLIB) \ - $(TCLLIBDIR)/$(TCLLIB) $(TIXOBJS) -def:$(TMPDIR)/tixcyg.def \ + $(TCLLIBDIR)/$(TCLLIB) $(TIXOBJS) \ gdi32.lib user32.lib mv $(TIXRAWLIBNAME) $(TIXLIB) $(TIXLIB): $(TIXDLL) -$(TIXWISH): $(WISHOBJS) $(TIXOBJS) $(TIXLIB) $(TMPDIR)/tixwishres.$(OBJEXT) - link -DEBUG $(WISHOBJS) $(TMPDIR)/tixwishres.$(OBJEXT) $(TIXLIB) \ +$(TIXWISH): $(WISHOBJS) $(TIXLIB) + link -DEBUG $(WISHOBJS) $(TIXLIB) \ $(TKLIBDIR)/$(TKLIB) $(TCLLIBDIR)/$(TCLLIB) \ -OUT:$(TIXWISH) user32.lib endif @@ -381,12 +409,12 @@ endif # $(TMPDIR)/testMain.$(OBJEXT): $(ROOT)/win/tixWinMain.c - $(CC) -c $(TK_INCLUDES) -DSTATIC_BUILD -DTK_TEST $(CFLAGS) -o $@ $? + $(CC) $(TK_INCLUDES) -DSTATIC_BUILD -DTK_TEST $(CFLAGS) -c -o $@ $? $(TMPDIR)/tixWinMain.$(OBJEXT): $(ROOT)/win/tixWinMain.c - $(CC) -c $(TK_INCLUDES) -DSTATIC_BUILD $(CFLAGS) -o $@ $? + $(CC) $(TK_INCLUDES) -DSTATIC_BUILD $(CFLAGS) -c -o $@ $? -ifeq ($(OBJEXT),o) +ifeq ($(GCC),yes) $(TMPDIR)/tixwishres.$(OBJEXT): $(ROOT)/win/rc/tixwish.rc $(WINDRES) --include $(srcdir)/rc --include $(srcdir)/../generic --define VS_VERSION_INFO=1 $(srcdir)/rc/tixwish.rc $(TMPDIR)/tixwishres.$(OBJEXT) @@ -402,13 +430,13 @@ endif # .c.$(OBJEXT): - $(CC) -c $(CFLAGS) -DDLL_BUILD -DBUILD_tix $(TK_INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) -DDLL_BUILD -DBUILD_tix $(TK_INCLUDES) -c -o $@ $< $(TMPDIR)/%.$(OBJEXT): %.c - $(CC) -c $(CFLAGS) -DDLL_BUILD -DBUILD_tix $(TK_INCLUDES) -c -o $@ $< + $(CC) $(CFLAGS) -DDLL_BUILD -DBUILD_tix $(TK_INCLUDES) -c -o $@ $< clean: - rm -f $(TMPDIR)/*.$(OBJEXT) $(TMPDIR)/*.exp $(TMPDIR)/*.def + rm -f $(TMPDIR)/*.$(OBJEXT) $(TMPDIR)/*.exp rm -f $(TIXLIB) $(TIXDLL) $(TIXDLLNAME) $(TIXWISH) Makefile: $(srcdir)/Makefile.in config.status diff --git a/tix/win/configure b/tix/win/configure index 0ded7defc70..837bd83749a 100755 --- a/tix/win/configure +++ b/tix/win/configure @@ -36,6 +36,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -150,6 +151,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -320,6 +322,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -485,12 +492,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # 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" +if test -z "$sitefile"; then + 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 fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -529,11 +540,57 @@ else fi +ac_aux_dir= +for ac_dir in ../.. $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 + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in ../.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:571: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:537: checking for $ac_word" >&5 +echo "configure:594: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -563,7 +620,7 @@ 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:567: checking for $ac_word" >&5 +echo "configure:624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -614,7 +671,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:618: checking for $ac_word" >&5 +echo "configure:675: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -646,7 +703,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:650: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -657,12 +714,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 661 "configure" +#line 718 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -688,12 +745,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:692: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:697: checking whether we are using GNU C" >&5 +echo "configure:754: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -702,7 +759,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -721,7 +778,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:725: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:782: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -753,13 +810,13 @@ else fi echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:757: checking for object suffix" >&5 +echo "configure:814: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -776,34 +833,402 @@ echo "$ac_t""$ac_cv_objext" 1>&6 OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext -NM=${NM-nm} +echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +echo "configure:838: checking for Cygwin environment" >&5 +if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 843 "configure" +#include "confdefs.h" + +int main() { + +#ifndef __CYGWIN__ +#define __CYGWIN__ __CYGWIN32__ +#endif +return __CYGWIN__; +; return 0; } +EOF +if { (eval echo configure:854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_cygwin=no +fi +rm -f conftest* +rm -f conftest* +fi + +echo "$ac_t""$ac_cv_cygwin" 1>&6 +CYGWIN= +test "$ac_cv_cygwin" = yes && CYGWIN=yes +CYGWIN=$ac_cv_cygwin -AS=${AS-as} -LD=${LD-ld} -DLLTOOL=${DLLTOOL-dlltool} +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:875: checking build system type" >&5 -WINDRES=${WINDRES-windres} +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac -ac_aux_dir= -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 - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + +# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:901: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RANLIB"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:933: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + RANLIB=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args. +set dummy ${ac_tool_prefix}nm; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:968: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$NM"; then + ac_cv_prog_NM="$NM" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM="${ac_tool_prefix}nm" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +NM="$ac_cv_prog_NM" +if test -n "$NM"; then + echo "$ac_t""$NM" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_NM"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "nm", so it can be a program name with args. +set dummy nm; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1000: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$NM"; then + ac_cv_prog_NM="$NM" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_NM="nm" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_NM" && ac_cv_prog_NM=":" +fi +fi +NM="$ac_cv_prog_NM" +if test -n "$NM"; then + echo "$ac_t""$NM" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + NM=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1035: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="${ac_tool_prefix}as" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_AS"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1067: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="as" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AS" && ac_cv_prog_AS=":" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + AS=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1102: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +DLLTOOL="$ac_cv_prog_DLLTOOL" +if test -n "$DLLTOOL"; then + echo "$ac_t""$DLLTOOL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_DLLTOOL"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1134: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DLLTOOL="dlltool" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL=":" +fi +fi +DLLTOOL="$ac_cv_prog_DLLTOOL" +if test -n "$DLLTOOL"; then + echo "$ac_t""$DLLTOOL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + DLLTOOL=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1169: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +WINDRES="$ac_cv_prog_WINDRES" +if test -n "$WINDRES"; then + echo "$ac_t""$WINDRES" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_WINDRES"; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1201: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_WINDRES="windres" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES=":" +fi +fi +WINDRES="$ac_cv_prog_WINDRES" +if test -n "$WINDRES"; then + echo "$ac_t""$WINDRES" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +else + WINDRES=":" +fi +fi + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -817,7 +1242,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:821: checking for a BSD compatible install" >&5 +echo "configure:1246: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -882,7 +1307,7 @@ if test "${with_tclconfig+set}" = set; then fi echo $ac_n "checking for Tcl configuration script""... $ac_c" 1>&6 -echo "configure:886: checking for Tcl configuration script" >&5 +echo "configure:1311: checking for Tcl configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -902,6 +1327,10 @@ else ac_cv_c_tclconfig=`(cd $srcdir/$i/unix; pwd)` break fi + if test -f $srcdir/$i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $srcdir/$i/win; pwd)` + break + fi done fi if test x"${ac_cv_c_tclconfig}" = x ; then @@ -917,6 +1346,10 @@ else ac_cv_c_tclconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tclConfig.sh ; then + ac_cv_c_tclconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -931,7 +1364,7 @@ fi if test x"${ac_cv_c_tclconfig}" = x ; then TCLCONFIG="" - echo "configure: warning: Can't find Tcl configuration definitions" 1>&2 + { echo "configure: error: Can't find Tcl configuration definitions" 1>&2; exit 1; } else no_tcl="" TCLCONFIG=${ac_cv_c_tclconfig}/tclConfig.sh @@ -959,6 +1392,7 @@ fi + @@ -973,7 +1407,7 @@ if test "${with_tkconfig+set}" = set; then fi echo $ac_n "checking for Tk configuration script""... $ac_c" 1>&6 -echo "configure:977: checking for Tk configuration script" >&5 +echo "configure:1411: checking for Tk configuration script" >&5 if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -993,6 +1427,10 @@ else ac_cv_c_tkconfig=`(cd $srcdir/$i/unix; pwd)` break fi + if test -f $srcdir/$i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $srcdir/$i/win; pwd)` + break + fi done fi if test x"${ac_cv_c_tkconfig}" = x ; then @@ -1008,6 +1446,10 @@ else ac_cv_c_tkconfig=`(cd $i/unix; pwd)` break fi + if test -f $i/win/tkConfig.sh ; then + ac_cv_c_tkconfig=`(cd $i/win; pwd)` + break + fi done fi @@ -1022,7 +1464,7 @@ fi if test x"${ac_cv_c_tkconfig}" = x ; then TKCONFIG="" - echo "configure: warning: Can't find Tk configuration definitions" 1>&2 + { echo "configure: error: Can't find Tk configuration definitions" 1>&2; exit 1; } else no_tk="" TKCONFIG=${ac_cv_c_tkconfig}/tkConfig.sh @@ -1050,7 +1492,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1054: checking how to run the C preprocessor" >&5 +echo "configure:1496: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1065,13 +1507,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1069 "configure" +#line 1511 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1082,13 +1524,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1086 "configure" +#line 1528 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1099,13 +1541,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1103 "configure" +#line 1545 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1133,7 +1575,7 @@ echo "$ac_t""$CPP" 1>&6 dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tcl=true echo $ac_n "checking for Tcl headers in the source tree""... $ac_c" 1>&6 -echo "configure:1137: checking for Tcl headers in the source tree" >&5 +echo "configure:1579: checking for Tcl headers in the source tree" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" @@ -1190,17 +1632,17 @@ if test x"${ac_cv_c_tclh}" = x ; then echo "$ac_t""none" 1>&6 ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcl.h""... $ac_c" 1>&6 -echo "configure:1194: checking for tcl.h" >&5 +echo "configure:1636: checking for tcl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1199 "configure" +#line 1641 "configure" #include "confdefs.h" #include <tcl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1264,7 +1706,7 @@ fi dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.." no_tk=true echo $ac_n "checking for Tk headers in the source tree""... $ac_c" 1>&6 -echo "configure:1268: checking for Tk headers in the source tree" >&5 +echo "configure:1710: checking for Tk headers in the source tree" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then withval="$with_tkinclude" @@ -1523,11 +1965,23 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g s%@CC@%$CC%g s%@OBJEXT@%$OBJEXT%g +s%@CYGWIN@%$CYGWIN%g +s%@GCC@%$GCC%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@RANLIB@%$RANLIB%g s%@NM@%$NM%g s%@AS@%$AS%g -s%@LD@%$LD%g s%@DLLTOOL@%$DLLTOOL%g s%@WINDRES@%$WINDRES%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g @@ -1545,6 +1999,7 @@ s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g s%@TCL_RANLIB@%$TCL_RANLIB%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g +s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g s%@TKCONFIG@%$TKCONFIG%g s%@TK_VERSION@%$TK_VERSION%g diff --git a/tix/win/configure.in b/tix/win/configure.in index 571b3416dda..9c24ae2cf0b 100644 --- a/tix/win/configure.in +++ b/tix/win/configure.in @@ -1,19 +1,22 @@ dnl This whole file is CYGNUS LOCAL AC_INIT(../generic/tixInit.c) +AC_CONFIG_AUX_DIR(../..) +AC_CANONICAL_HOST AC_PROG_CC AC_OBJEXT -NM=${NM-nm} -AC_SUBST(NM) -AS=${AS-as} -AC_SUBST(AS) -LD=${LD-ld} -AC_SUBST(LD) -DLLTOOL=${DLLTOOL-dlltool} -AC_SUBST(DLLTOOL) -WINDRES=${WINDRES-windres} -AC_SUBST(WINDRES) +AC_CYGWIN +CYGWIN=$ac_cv_cygwin +AC_SUBST(CYGWIN) +AC_SUBST(GCC) + +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(NM, nm, :) +AC_CHECK_TOOL(AS, as, :) +AC_CHECK_TOOL(DLLTOOL, dlltool, :) +AC_CHECK_TOOL(WINDRES, windres, :) + AC_PROG_INSTALL # Check for Tcl and Tk. |