Thread

That --with-tcl thing...

Tom Ivar Helbekkmo <tih@hamartun.priv.no> — 1998-03-02T21:04:09Z

Congratulations on a job well done, guys!

Here's a little thing for the first round of patches, though: I have
figured out why --with-tcl didn't work, even after adding the missing
semicolon that was posted about.  Here's the patch to configure.in in
version 6.3 that will actually fix it all right (including letting you
use the previous versions of tcl and tk, since they do work).  Note
the test for TCL_INCDIR being the empty string, to avoid adding an
empty "-I" to the flags used when checking for tk.h.  Note also that
I've removed the simple tests for tcl.h and tk.h without specifying
include directories for them: the actual include directories need to
end up in TCL_INCDIR and TK_INCDIR in Makefile.global, because of the
way they are used in other Makefiles.

*** configure.in.orig	Mon Mar  2 06:33:14 1998
--- configure.in	Mon Mar  2 21:42:59 1998
***************
*** 239,246 ****
  AC_ARG_WITH(
     tcl,
     [   --with-tcl              use tcl ],
!    USE_TCL=true AC_MSG_RESULT(enabled),
!    USE_TCL=false AC_MSG_RESULT(disabled)
  )
  export USE_TCL
  USE_X=$USE_TCL
--- 239,246 ----
  AC_ARG_WITH(
     tcl,
     [   --with-tcl              use tcl ],
!    USE_TCL=true; AC_MSG_RESULT(enabled),
!    USE_TCL=false; AC_MSG_RESULT(disabled)
  )
  export USE_TCL
  USE_X=$USE_TCL
***************
*** 250,257 ****
  AC_ARG_WITH(
     perl,
     [   --with-perl             use perl ],
!    USE_PERL=true AC_MSG_RESULT(enabled),
!    USE_PERL=false AC_MSG_RESULT(disabled)
  )
  export USE_PERL
  
--- 250,257 ----
  AC_ARG_WITH(
     perl,
     [   --with-perl             use perl ],
!    USE_PERL=true; AC_MSG_RESULT(enabled),
!    USE_PERL=false; AC_MSG_RESULT(disabled)
  )
  export USE_PERL
  
***************
*** 563,570 ****
  if test "$USE_TCL" = "true"
  then
  TCL_INCDIR=no
! AC_CHECK_HEADER(tcl.h, TCL_INCDIR=)
! for f in /usr/include /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl8.0; do
  if test "$TCL_INCDIR" = "no"; then
  AC_CHECK_HEADER($f/tcl.h, TCL_INCDIR=$f)
  fi
--- 563,569 ----
  if test "$USE_TCL" = "true"
  then
  TCL_INCDIR=no
! for f in /usr/include /usr/include/tcl8.0 /usr/include/tcl7.6 /usr/local/include /usr/local/include/tcl8.0 /usr/local/include/tcl7.6; do
  if test "$TCL_INCDIR" = "no"; then
  AC_CHECK_HEADER($f/tcl.h, TCL_INCDIR=$f)
  fi
***************
*** 580,586 ****
  if test "$USE_TCL" = "true"
  then
  TCL_LIB=
! for f in tcl8.0 tcl80; do
  if test -z "$TCL_LIB"; then
  AC_CHECK_LIB($f, main, TCL_LIB=$f)
  fi
--- 579,585 ----
  if test "$USE_TCL" = "true"
  then
  TCL_LIB=
! for f in tcl8.0 tcl80 tcl7.6 tcl76; do
  if test -z "$TCL_LIB"; then
  AC_CHECK_LIB($f, main, TCL_LIB=$f)
  fi
***************
*** 606,616 ****
  ice_save_CPPFLAGS="$CPPFLAGS"
  ice_save_LDFLAGS="$LDFLAGS"
  
  CPPFLAGS="$CPPFLAGS $X_CFLAGS -I$TCL_INCDIR"
  
  TK_INCDIR=no
! AC_CHECK_HEADER(tk.h, TK_INCDIR=)
! for f in /usr/include /usr/include/tk8.0 /usr/local/include /usr/local/include/tk8.0; do
  if test "$TK_INCDIR" = "no"; then
  AC_CHECK_HEADER($f/tk.h, TK_INCDIR=$f)
  fi
--- 605,619 ----
  ice_save_CPPFLAGS="$CPPFLAGS"
  ice_save_LDFLAGS="$LDFLAGS"
  
+ if test "$TCL_INCDIR" = ""
+ then
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ else
  CPPFLAGS="$CPPFLAGS $X_CFLAGS -I$TCL_INCDIR"
+ fi
  
  TK_INCDIR=no
! for f in /usr/include /usr/include/tk8.0 /usr/include/tk4.2 /usr/local/include /usr/local/include/tk8.0 /usr/local/include/tk4.2; do
  if test "$TK_INCDIR" = "no"; then
  AC_CHECK_HEADER($f/tk.h, TK_INCDIR=$f)
  fi
***************
*** 631,637 ****
  if test "$USE_TCL" = "true"
  then
  TK_LIB=
! for f in tk8.0 tk80; do
  if test -z "$TK_LIB"; then
  AC_CHECK_LIB($f, main, TK_LIB=$f)
  fi
--- 634,640 ----
  if test "$USE_TCL" = "true"
  then
  TK_LIB=
! for f in tk8.0 tk80 tk4.2 tk42; do
  if test -z "$TK_LIB"; then
  AC_CHECK_LIB($f, main, TK_LIB=$f)
  fi

-tih
-- 
Popularity is the hallmark of mediocrity.  --Niles Crane, "Frasier"