Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f428d05

Browse files
committed
Revise Tcl/Tk configuration. Make missing Tcl after --with-tcl an error,
add --without-tk option to disable Tk. We don't need the AC_PATH_XTRA test because tkConfig.sh already contains all the information about how to compile and link with X. Also make sure that libpq is up to date for libpgtcl. Remove executable bits from pgaccess.sh, but add it to pgaccess.
1 parent e353e73 commit f428d05

File tree

12 files changed

+643
-1583
lines changed

12 files changed

+643
-1583
lines changed

aclocal.m4

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.8 2000/09/21 20:17:41 petere Exp $
1+
dnl $Header: /cvsroot/pgsql/aclocal.m4,v 1.9 2000/09/25 22:22:52 petere Exp $
22
builtin([include], [config/ac_func_accept_argtypes.m4])
33
builtin([include], [config/c-compiler.m4])
44
builtin([include], [config/c-library.m4])
55
builtin([include], [config/cxx.m4])
66
builtin([include], [config/general.m4])
77
builtin([include], [config/programs.m4])
88
builtin([include], [config/python.m4])
9+
builtin([include], [config/tcl.m4])

config/tcl.m4

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# $Header: /cvsroot/pgsql/config/tcl.m4,v 1.1 2000/09/25 22:22:53 petere Exp $
2+
3+
# Autoconf macros to check for Tcl related things
4+
5+
6+
AC_DEFUN([PGAC_PATH_TCLSH],
7+
[AC_PATH_PROGS(TCLSH, [tclsh tcl])])
8+
9+
10+
# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])
11+
# ------------------------------------
12+
AC_DEFUN([PGAC_PATH_TCLCONFIGSH],
13+
[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
14+
AC_BEFORE([$0], [PGAC_PATH_TKCONFIGSH])[]dnl
15+
AC_MSG_CHECKING([for tclConfig.sh])
16+
# Let user override test
17+
if test -z "$TCL_CONFIG_SH"; then
18+
pgac_test_dirs="$1"
19+
20+
set X $pgac_test_dirs; shift
21+
if test $[#] -eq 0; then
22+
test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tclConfig.sh because no Tcl shell was found])
23+
set X `echo 'puts $auto_path' | $TCLSH`; shift
24+
fi
25+
26+
for pgac_dir; do
27+
if test -r "$pgac_dir/tclConfig.sh"; then
28+
TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
29+
break
30+
fi
31+
done
32+
fi
33+
34+
if test -z "$TCL_CONFIG_SH"; then
35+
AC_MSG_RESULT(no)
36+
AC_MSG_ERROR([file \`tclConfig.sh' is required for Tcl])
37+
else
38+
AC_MSG_RESULT([$TCL_CONFIG_SH])
39+
fi
40+
41+
AC_SUBST([TCL_CONFIG_SH])
42+
])# PGAC_PATH_TCLCONFIGSH
43+
44+
45+
# PGAC_PATH_TKCONFIGSH([SEARCH-PATH])
46+
# ------------------------------------
47+
AC_DEFUN([PGAC_PATH_TKCONFIGSH],
48+
[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
49+
AC_MSG_CHECKING([for tkConfig.sh])
50+
# Let user override test
51+
if test -z "$TK_CONFIG_SH"; then
52+
pgac_test_dirs="$1"
53+
54+
set X $pgac_test_dirs; shift
55+
if test $[#] -eq 0; then
56+
test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tkConfig.sh because no Tcl shell was found])
57+
set X `echo 'puts $auto_path' | $TCLSH`; shift
58+
fi
59+
60+
for pgac_dir; do
61+
if test -r "$pgac_dir/tkConfig.sh"; then
62+
TK_CONFIG_SH=$pgac_dir/tkConfig.sh
63+
break
64+
fi
65+
done
66+
fi
67+
68+
if test -z "$TK_CONFIG_SH"; then
69+
AC_MSG_RESULT(no)
70+
AC_MSG_ERROR([file \`tkConfig.sh' is required for Tk])
71+
else
72+
AC_MSG_RESULT([$TK_CONFIG_SH])
73+
fi
74+
75+
AC_SUBST([TK_CONFIG_SH])
76+
])# PGAC_PATH_TKCONFIGSH

0 commit comments

Comments
 (0)