summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1999-03-16 03:02:55 +0000
committerBruce Momjian1999-03-16 03:02:55 +0000
commit0ab3c093564f683164652208677ed08b601c9c22 (patch)
treed13fcb916dff03306542e4c3c93652e6d97803b5
parentd4ff6c3093b9067f05671a5ff3b90e14daba2aa7 (diff)
Hmmm. It had to do with tcl/tk on FreeBSD. The configure scripts are
in different directories. The patch gave the option of specifying a dir for the tk script and if they were both in the same directory then it didn't mind being empty. It's small so I'm including it. It was tested with autoconf 2.12. Vince.
-rw-r--r--src/configure.in17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/configure.in b/src/configure.in
index a8ba1f46f33..c7f049749ee 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -301,6 +301,21 @@ AC_ARG_WITH(tclconfig,
]
)
+dnl We see if the path to the TK configuration scripts is specified.
+dnl This will overide the use of tclsh to find the paths to search.
+
+AC_ARG_WITH(tkconfig,
+ [ --with-tkconfig=DIR tkConfig.sh is in DIR],
+ [
+ case "$withval" in
+ "" | y | ye | yes | n | no)
+ AC_MSG_ERROR([*** You must supply an argument to the --with-tkconfig option.])
+ ;;
+ esac
+ TK_DIRS="$withval"
+ ]
+)
+
dnl We exclude perl support unless we override it with --with-perl
AC_MSG_CHECKING(setting USE_PERL)
AC_ARG_WITH(
@@ -927,7 +942,7 @@ then
then
library_dirs=`echo 'puts $auto_path' | $TCLSH`
fi
- library_dirs="$TCL_DIRS $library_dirs"
+ library_dirs="$TCL_DIRS $TK_DIRS $library_dirs"
for dir in $library_dirs; do
if test -d "$dir" -a -r "$dir/tclConfig.sh"; then
TCL_CONFIG_SH=$dir/tclConfig.sh