1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
$NetBSD: patch-ak,v 1.8 2004/07/15 04:00:47 dmcmahill Exp $
--- aclocal.m4.orig Tue Jul 6 14:21:06 2004
+++ aclocal.m4
@@ -132,7 +132,11 @@ dnl TCL_LIB : flag to link against tcl
CHK_TCL_MAJ=$1
CHK_TCL_MIN=$2
TCL_LIB_OK=0
- AC_MSG_CHECKING([for tcl library tcl$1.$2])
+AC_MSG_CHECKING([for tcl library tcl$1.$2])
+if test -n "$TCL_CONFIG_SH" ; then
+ . $TCL_CONFIG_SH
+fi
+LDFLAGS="$LDFLAGS $TCL_LIBS"
dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ."
libexts="so so.1.0 sl dylib a"
libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN"
@@ -287,6 +291,10 @@ CHK_TK_MIN=$2
TK_LIB_OK=0
AC_MSG_CHECKING([for tk library tk$1.$2])
+if test -n "$TK_CONFIG_SH" ; then
+ . $TK_CONFIG_SH
+fi
+LDFLAGS="$LDFLAGS $TK_LIBS"
dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.* /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib "
libexts="so so.1.0 sl dylib a"
libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN"
@@ -384,7 +392,7 @@ dnl In addition, if the test was OK, the
if test $TCL_VERSION_OK = 1; then
AC_CHECK_TCL_LIB($TCL_MAJOR_VERSION,$TCL_MINOR_VERSION)
if test $TCL_LIB_OK = 1; then
- TCLTK_LIBS=" $TCL_LIB $TCLTK_LIBS"
+ TCLTK_LIBS=" $TCL_LIB $TCL_LIBS $TCLTK_LIBS"
break;
fi
fi
@@ -417,7 +425,7 @@ dnl In addition, if the test was OK, the
if test $TK_LIB_OK = 0; then
AC_MSG_ERROR([tk library not found])
else
- TCLTK_LIBS=$TK_LIB" $TCLTK_LIBS"
+ TCLTK_LIBS=" $TK_LIB $TK_LIBS $TCLTK_LIBS"
WITH_TKSCI=1
fi
])
|
