Mercurial > pidgin.yaz
comparison configure.ac @ 6710:3a08f08edbf5
[gaim-migrate @ 7236]
tclConfig.sh detection improvements for debian and other bustinated
systems. Misleading configure output fix for Tk detection.
committer: Tailor Script <tailor@pidgin.im>
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Tue, 02 Sep 2003 20:26:13 +0000 |
parents | 4c9fb525be47 |
children | 7d6a401049e4 |
comparison
equal
deleted
inserted
replaced
6709:4c9fb525be47 | 6710:3a08f08edbf5 |
---|---|
574 | 574 |
575 dnl Check for Tcl | 575 dnl Check for Tcl |
576 if test "$enable_tcl" = yes; then | 576 if test "$enable_tcl" = yes; then |
577 AC_MSG_CHECKING([for tclConfig.sh]) | 577 AC_MSG_CHECKING([for tclConfig.sh]) |
578 TCLCONFIG=no | 578 TCLCONFIG=no |
579 for dir in $with_tclconfig /usr/lib /usr/local/lib; do | 579 TCLCONFIGDIRS="/usr/lib \ |
580 /usr/lib/tcl8.4 \ | |
581 /usr/lib/tcl8.3 \ | |
582 /usr/lib/tcl8.2 \ | |
583 /usr/local/lib" | |
584 for dir in $with_tclconfig $TCLCONFIGDIRS; do | |
580 if test -f $dir/tclConfig.sh; then | 585 if test -f $dir/tclConfig.sh; then |
581 TCLCONFIG=$dir/tclConfig.sh | 586 TCLCONFIG=$dir/tclConfig.sh |
582 AC_MSG_RESULT([yes ($TCLCONFIG)]) | 587 AC_MSG_RESULT([yes ($TCLCONFIG)]) |
583 fi | 588 fi |
584 done | 589 done |
636 AC_TRY_LINK([#include <tk.h>], [Tcl_Interp *interp; Tcl_Init(interp); Tk_Init(interp);], | 641 AC_TRY_LINK([#include <tk.h>], [Tcl_Interp *interp; Tcl_Init(interp); Tk_Init(interp);], |
637 [AC_MSG_RESULT([yes]);enable_tk=yes], | 642 [AC_MSG_RESULT([yes]);enable_tk=yes], |
638 [AC_MSG_RESULT([no]);enable_tk=no]) | 643 [AC_MSG_RESULT([no]);enable_tk=no]) |
639 LIBS="$oldLIBS" | 644 LIBS="$oldLIBS" |
640 fi | 645 fi |
646 else | |
647 enable_tk=no | |
641 fi | 648 fi |
642 | 649 |
643 if test "$enable_tk" = yes; then | 650 if test "$enable_tk" = yes; then |
644 AM_CONDITIONAL(USE_TK, true) | 651 AM_CONDITIONAL(USE_TK, true) |
645 AC_DEFINE(HAVE_TK, [1], [Compile with support for the Tk toolkit]) | 652 AC_DEFINE(HAVE_TK, [1], [Compile with support for the Tk toolkit]) |