This is the mail archive of the
sid@sourceware.org
mailing list for the SID project.
sid-20110801 Patch to fix tcl / tk in build tree detection
- From: John Wehle <john at feith dot com>
- To: sid at sources dot redhat dot com
- Date: Thu, 27 Oct 2011 00:15:42 -0400 (EDT)
- Subject: sid-20110801 Patch to fix tcl / tk in build tree detection
Currently using --tksm with SID on FreeBSD complains that various
tcl / tk components are not found due to AC_CHECK_HEADERS in
sid/component/tcl/configure failing to find tcl.h and tk.h when
building using the tcl / tk in the build tree.
The enclosed patch has been tested on FreeBSD with sid configured for
tomi Borealis (a processor under development by Venray Technology).
ChangeLog:
Thu Oct 27 00:03:25 EDT 2011 John Wehle (john@feith.com)
* Makefile.in: Handle tk before sid.
* sid/component/tcl/configure.in and configure: Update
CPPFLAGS when using tcl or tk in the build tree so that
the later call to AC_CHECK_HEADERS will work.
-- John
------------------------8<------------------------------8<---------------
--- Makefile.in.ORIGINAL 2011-09-19 02:50:52.000000000 -0400
+++ Makefile.in 2011-10-26 02:30:01.000000000 -0400
@@ -918,6 +918,7 @@ configure-host: \
maybe-configure-libiconv \
maybe-configure-m4 \
maybe-configure-readline \
+ maybe-configure-tk \
maybe-configure-sid \
maybe-configure-sim \
maybe-configure-texinfo \
@@ -925,7 +926,6 @@ configure-host: \
maybe-configure-gdb \
maybe-configure-expect \
maybe-configure-guile \
- maybe-configure-tk \
maybe-configure-libtermcap \
maybe-configure-utils \
maybe-configure-gnattools \
@@ -1053,6 +1053,7 @@ all-host: maybe-all-libiberty
all-host: maybe-all-libiconv
all-host: maybe-all-m4
all-host: maybe-all-readline
+all-host: maybe-all-tk
all-host: maybe-all-sid
all-host: maybe-all-sim
all-host: maybe-all-texinfo
@@ -1062,7 +1063,6 @@ all-host: maybe-all-zlib
all-host: maybe-all-gdb
all-host: maybe-all-expect
all-host: maybe-all-guile
-all-host: maybe-all-tk
all-host: maybe-all-libtermcap
all-host: maybe-all-utils
all-host: maybe-all-gnattools
@@ -1145,6 +1145,7 @@ info-host: maybe-info-libiberty
info-host: maybe-info-libiconv
info-host: maybe-info-m4
info-host: maybe-info-readline
+info-host: maybe-info-tk
info-host: maybe-info-sid
info-host: maybe-info-sim
info-host: maybe-info-texinfo
@@ -1152,7 +1153,6 @@ info-host: maybe-info-zlib
info-host: maybe-info-gdb
info-host: maybe-info-expect
info-host: maybe-info-guile
-info-host: maybe-info-tk
info-host: maybe-info-libtermcap
info-host: maybe-info-utils
info-host: maybe-info-gnattools
@@ -1222,6 +1222,7 @@ dvi-host: maybe-dvi-libiberty
dvi-host: maybe-dvi-libiconv
dvi-host: maybe-dvi-m4
dvi-host: maybe-dvi-readline
+dvi-host: maybe-dvi-tk
dvi-host: maybe-dvi-sid
dvi-host: maybe-dvi-sim
dvi-host: maybe-dvi-texinfo
@@ -1229,7 +1230,6 @@ dvi-host: maybe-dvi-zlib
dvi-host: maybe-dvi-gdb
dvi-host: maybe-dvi-expect
dvi-host: maybe-dvi-guile
-dvi-host: maybe-dvi-tk
dvi-host: maybe-dvi-libtermcap
dvi-host: maybe-dvi-utils
dvi-host: maybe-dvi-gnattools
@@ -1299,6 +1299,7 @@ pdf-host: maybe-pdf-libiberty
pdf-host: maybe-pdf-libiconv
pdf-host: maybe-pdf-m4
pdf-host: maybe-pdf-readline
+pdf-host: maybe-pdf-tk
pdf-host: maybe-pdf-sid
pdf-host: maybe-pdf-sim
pdf-host: maybe-pdf-texinfo
@@ -1306,7 +1307,6 @@ pdf-host: maybe-pdf-zlib
pdf-host: maybe-pdf-gdb
pdf-host: maybe-pdf-expect
pdf-host: maybe-pdf-guile
-pdf-host: maybe-pdf-tk
pdf-host: maybe-pdf-libtermcap
pdf-host: maybe-pdf-utils
pdf-host: maybe-pdf-gnattools
@@ -1376,6 +1376,7 @@ html-host: maybe-html-libiberty
html-host: maybe-html-libiconv
html-host: maybe-html-m4
html-host: maybe-html-readline
+html-host: maybe-html-tk
html-host: maybe-html-sid
html-host: maybe-html-sim
html-host: maybe-html-texinfo
@@ -1383,7 +1384,6 @@ html-host: maybe-html-zlib
html-host: maybe-html-gdb
html-host: maybe-html-expect
html-host: maybe-html-guile
-html-host: maybe-html-tk
html-host: maybe-html-libtermcap
html-host: maybe-html-utils
html-host: maybe-html-gnattools
@@ -1453,6 +1453,7 @@ TAGS-host: maybe-TAGS-libiberty
TAGS-host: maybe-TAGS-libiconv
TAGS-host: maybe-TAGS-m4
TAGS-host: maybe-TAGS-readline
+TAGS-host: maybe-TAGS-tk
TAGS-host: maybe-TAGS-sid
TAGS-host: maybe-TAGS-sim
TAGS-host: maybe-TAGS-texinfo
@@ -1460,7 +1461,6 @@ TAGS-host: maybe-TAGS-zlib
TAGS-host: maybe-TAGS-gdb
TAGS-host: maybe-TAGS-expect
TAGS-host: maybe-TAGS-guile
-TAGS-host: maybe-TAGS-tk
TAGS-host: maybe-TAGS-libtermcap
TAGS-host: maybe-TAGS-utils
TAGS-host: maybe-TAGS-gnattools
@@ -1530,6 +1530,7 @@ install-info-host: maybe-install-info-li
install-info-host: maybe-install-info-libiconv
install-info-host: maybe-install-info-m4
install-info-host: maybe-install-info-readline
+install-info-host: maybe-install-info-tk
install-info-host: maybe-install-info-sid
install-info-host: maybe-install-info-sim
install-info-host: maybe-install-info-texinfo
@@ -1537,7 +1538,6 @@ install-info-host: maybe-install-info-zl
install-info-host: maybe-install-info-gdb
install-info-host: maybe-install-info-expect
install-info-host: maybe-install-info-guile
-install-info-host: maybe-install-info-tk
install-info-host: maybe-install-info-libtermcap
install-info-host: maybe-install-info-utils
install-info-host: maybe-install-info-gnattools
@@ -1607,6 +1607,7 @@ install-pdf-host: maybe-install-pdf-libi
install-pdf-host: maybe-install-pdf-libiconv
install-pdf-host: maybe-install-pdf-m4
install-pdf-host: maybe-install-pdf-readline
+install-pdf-host: maybe-install-pdf-tk
install-pdf-host: maybe-install-pdf-sid
install-pdf-host: maybe-install-pdf-sim
install-pdf-host: maybe-install-pdf-texinfo
@@ -1614,7 +1615,6 @@ install-pdf-host: maybe-install-pdf-zlib
install-pdf-host: maybe-install-pdf-gdb
install-pdf-host: maybe-install-pdf-expect
install-pdf-host: maybe-install-pdf-guile
-install-pdf-host: maybe-install-pdf-tk
install-pdf-host: maybe-install-pdf-libtermcap
install-pdf-host: maybe-install-pdf-utils
install-pdf-host: maybe-install-pdf-gnattools
@@ -1684,6 +1684,7 @@ install-html-host: maybe-install-html-li
install-html-host: maybe-install-html-libiconv
install-html-host: maybe-install-html-m4
install-html-host: maybe-install-html-readline
+install-html-host: maybe-install-html-tk
install-html-host: maybe-install-html-sid
install-html-host: maybe-install-html-sim
install-html-host: maybe-install-html-texinfo
@@ -1691,7 +1692,6 @@ install-html-host: maybe-install-html-zl
install-html-host: maybe-install-html-gdb
install-html-host: maybe-install-html-expect
install-html-host: maybe-install-html-guile
-install-html-host: maybe-install-html-tk
install-html-host: maybe-install-html-libtermcap
install-html-host: maybe-install-html-utils
install-html-host: maybe-install-html-gnattools
@@ -1761,6 +1761,7 @@ installcheck-host: maybe-installcheck-li
installcheck-host: maybe-installcheck-libiconv
installcheck-host: maybe-installcheck-m4
installcheck-host: maybe-installcheck-readline
+installcheck-host: maybe-installcheck-tk
installcheck-host: maybe-installcheck-sid
installcheck-host: maybe-installcheck-sim
installcheck-host: maybe-installcheck-texinfo
@@ -1768,7 +1769,6 @@ installcheck-host: maybe-installcheck-zl
installcheck-host: maybe-installcheck-gdb
installcheck-host: maybe-installcheck-expect
installcheck-host: maybe-installcheck-guile
-installcheck-host: maybe-installcheck-tk
installcheck-host: maybe-installcheck-libtermcap
installcheck-host: maybe-installcheck-utils
installcheck-host: maybe-installcheck-gnattools
@@ -1838,6 +1838,7 @@ mostlyclean-host: maybe-mostlyclean-libi
mostlyclean-host: maybe-mostlyclean-libiconv
mostlyclean-host: maybe-mostlyclean-m4
mostlyclean-host: maybe-mostlyclean-readline
+mostlyclean-host: maybe-mostlyclean-tk
mostlyclean-host: maybe-mostlyclean-sid
mostlyclean-host: maybe-mostlyclean-sim
mostlyclean-host: maybe-mostlyclean-texinfo
@@ -1845,7 +1846,6 @@ mostlyclean-host: maybe-mostlyclean-zlib
mostlyclean-host: maybe-mostlyclean-gdb
mostlyclean-host: maybe-mostlyclean-expect
mostlyclean-host: maybe-mostlyclean-guile
-mostlyclean-host: maybe-mostlyclean-tk
mostlyclean-host: maybe-mostlyclean-libtermcap
mostlyclean-host: maybe-mostlyclean-utils
mostlyclean-host: maybe-mostlyclean-gnattools
@@ -1915,6 +1915,7 @@ clean-host: maybe-clean-libiberty
clean-host: maybe-clean-libiconv
clean-host: maybe-clean-m4
clean-host: maybe-clean-readline
+clean-host: maybe-clean-tk
clean-host: maybe-clean-sid
clean-host: maybe-clean-sim
clean-host: maybe-clean-texinfo
@@ -1922,7 +1923,6 @@ clean-host: maybe-clean-zlib
clean-host: maybe-clean-gdb
clean-host: maybe-clean-expect
clean-host: maybe-clean-guile
-clean-host: maybe-clean-tk
clean-host: maybe-clean-libtermcap
clean-host: maybe-clean-utils
clean-host: maybe-clean-gnattools
@@ -1992,6 +1992,7 @@ distclean-host: maybe-distclean-libibert
distclean-host: maybe-distclean-libiconv
distclean-host: maybe-distclean-m4
distclean-host: maybe-distclean-readline
+distclean-host: maybe-distclean-tk
distclean-host: maybe-distclean-sid
distclean-host: maybe-distclean-sim
distclean-host: maybe-distclean-texinfo
@@ -1999,7 +2000,6 @@ distclean-host: maybe-distclean-zlib
distclean-host: maybe-distclean-gdb
distclean-host: maybe-distclean-expect
distclean-host: maybe-distclean-guile
-distclean-host: maybe-distclean-tk
distclean-host: maybe-distclean-libtermcap
distclean-host: maybe-distclean-utils
distclean-host: maybe-distclean-gnattools
@@ -2069,6 +2069,7 @@ maintainer-clean-host: maybe-maintainer-
maintainer-clean-host: maybe-maintainer-clean-libiconv
maintainer-clean-host: maybe-maintainer-clean-m4
maintainer-clean-host: maybe-maintainer-clean-readline
+maintainer-clean-host: maybe-maintainer-clean-tk
maintainer-clean-host: maybe-maintainer-clean-sid
maintainer-clean-host: maybe-maintainer-clean-sim
maintainer-clean-host: maybe-maintainer-clean-texinfo
@@ -2076,7 +2077,6 @@ maintainer-clean-host: maybe-maintainer-
maintainer-clean-host: maybe-maintainer-clean-gdb
maintainer-clean-host: maybe-maintainer-clean-expect
maintainer-clean-host: maybe-maintainer-clean-guile
-maintainer-clean-host: maybe-maintainer-clean-tk
maintainer-clean-host: maybe-maintainer-clean-libtermcap
maintainer-clean-host: maybe-maintainer-clean-utils
maintainer-clean-host: maybe-maintainer-clean-gnattools
@@ -2201,6 +2201,7 @@ check-host: \
maybe-check-libiconv \
maybe-check-m4 \
maybe-check-readline \
+ maybe-check-tk \
maybe-check-sid \
maybe-check-sim \
maybe-check-texinfo \
@@ -2208,7 +2209,6 @@ check-host: \
maybe-check-gdb \
maybe-check-expect \
maybe-check-guile \
- maybe-check-tk \
maybe-check-libtermcap \
maybe-check-utils \
maybe-check-gnattools \
@@ -2304,6 +2304,7 @@ install-host-nogcc: \
maybe-install-libiconv \
maybe-install-m4 \
maybe-install-readline \
+ maybe-install-tk \
maybe-install-sid \
maybe-install-sim \
maybe-install-texinfo \
@@ -2311,7 +2312,6 @@ install-host-nogcc: \
maybe-install-gdb \
maybe-install-expect \
maybe-install-guile \
- maybe-install-tk \
maybe-install-libtermcap \
maybe-install-utils \
maybe-install-gnattools \
@@ -2350,6 +2350,7 @@ install-host: \
maybe-install-libiconv \
maybe-install-m4 \
maybe-install-readline \
+ maybe-install-tk \
maybe-install-sid \
maybe-install-sim \
maybe-install-texinfo \
@@ -2357,7 +2358,6 @@ install-host: \
maybe-install-gdb \
maybe-install-expect \
maybe-install-guile \
- maybe-install-tk \
maybe-install-libtermcap \
maybe-install-utils \
maybe-install-gnattools \
@@ -2446,6 +2446,7 @@ install-strip-host: \
maybe-install-strip-libiconv \
maybe-install-strip-m4 \
maybe-install-strip-readline \
+ maybe-install-strip-tk \
maybe-install-strip-sid \
maybe-install-strip-sim \
maybe-install-strip-texinfo \
@@ -2453,7 +2454,6 @@ install-strip-host: \
maybe-install-strip-gdb \
maybe-install-strip-expect \
maybe-install-strip-guile \
- maybe-install-strip-tk \
maybe-install-strip-libtermcap \
maybe-install-strip-utils \
maybe-install-strip-gnattools \
--- sid/component/tcl/configure.in.ORIGINAL 2011-09-19 02:50:04.000000000 -0400
+++ sid/component/tcl/configure.in 2011-10-26 00:53:47.000000000 -0400
@@ -41,6 +41,7 @@ then
if test -d ../../../tcl; then
with_tcl_include="-I$srcdir/../../../tcl/generic"
with_tcl_lib="-L../../../tcl/$tcl_hostdir -ltcl8${tcl_libdot}4"
+ CPPFLAGS="$CPPFLAGS $with_tcl_include"
fi
AC_MSG_RESULT($with_tcl_lib)
fi
@@ -51,6 +52,7 @@ then
if test -d ../../../tk; then
with_tk_include="-I$srcdir/../../../tk/generic -I$srcdir/../../../tk/xlib"
with_tk_lib="-L../../../tk/$tcl_hostdir -ltk8${tcl_libdot}4"
+ CPPFLAGS="$CPPFLAGS $with_tk_include"
fi
AC_MSG_RESULT($with_tk_lib)
fi
--- sid/component/tcl/configure.ORIGINAL 2011-09-19 02:50:04.000000000 -0400
+++ sid/component/tcl/configure 2011-10-26 00:54:13.000000000 -0400
@@ -21304,6 +21304,7 @@ echo $ECHO_N "checking tcl in build tree
if test -d ../../../tcl; then
with_tcl_include="-I$srcdir/../../../tcl/generic"
with_tcl_lib="-L../../../tcl/$tcl_hostdir -ltcl8${tcl_libdot}4"
+ CPPFLAGS="$CPPFLAGS $with_tcl_include"
fi
{ echo "$as_me:$LINENO: result: $with_tcl_lib" >&5
echo "${ECHO_T}$with_tcl_lib" >&6; }
@@ -21316,6 +21317,7 @@ echo $ECHO_N "checking tk in build tree.
if test -d ../../../tk; then
with_tk_include="-I$srcdir/../../../tk/generic -I$srcdir/../../../tk/xlib"
with_tk_lib="-L../../../tk/$tcl_hostdir -ltk8${tcl_libdot}4"
+ CPPFLAGS="$CPPFLAGS $with_tk_include"
fi
{ echo "$as_me:$LINENO: result: $with_tk_lib" >&5
echo "${ECHO_T}$with_tk_lib" >&6; }
-------------------------------------------------------------------------