* config/tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails.
(SC_PATH_TKCONFIG): Don't exit 0 if tkconfig fails. (SC_LOAD_TCLCONFIG): Quote all uses of TCL_BIN_DIR, it may contain "# no Tcl configs found". (SC_LOAD_TKCONFIG): Similarily for TK_BIN_DIR. * gdb/configure.ac (gdbkt): Check both no_tcl/no_tk first, before doing any further tcl/tk configury. Don't configure gdbtk if tcl or tk check fails. * gdb/aclocal.m4: Regenerate. * gdb/configure: Regenerate. * gdb/gdbtk/plugins/aclocal.m4: Regenerate. * gdb/gdbtk/plugins/configure: Regenerate.
This commit is contained in:
parent
43616e5526
commit
42ef1b8fd4
@ -1,3 +1,11 @@
|
||||
2009-02-02 Doug Evans <dje@google.com>
|
||||
|
||||
* tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails.
|
||||
(SC_PATH_TKCONFIG): Don't exit 0 if tkconfig fails.
|
||||
(SC_LOAD_TCLCONFIG): Quote all uses of TCL_BIN_DIR, it may contain
|
||||
"# no Tcl configs found".
|
||||
(SC_LOAD_TKCONFIG): Similarily for TK_BIN_DIR.
|
||||
|
||||
2008-11-21 Kai Tietz <kai.tietz@onevision.com>
|
||||
|
||||
Fix PR/25502
|
||||
|
@ -114,7 +114,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||
if test x"${ac_cv_c_tclconfig}" = x ; then
|
||||
TCL_BIN_DIR="# no Tcl configs found"
|
||||
AC_MSG_WARN([Can't find Tcl configuration definitions])
|
||||
exit 0
|
||||
else
|
||||
no_tcl=
|
||||
TCL_BIN_DIR=${ac_cv_c_tclconfig}
|
||||
@ -237,7 +236,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||
if test x"${ac_cv_c_tkconfig}" = x ; then
|
||||
TK_BIN_DIR="# no Tk configs found"
|
||||
AC_MSG_WARN([Can't find Tk configuration definitions])
|
||||
exit 0
|
||||
else
|
||||
no_tk=
|
||||
TK_BIN_DIR=${ac_cv_c_tkconfig}
|
||||
@ -285,7 +283,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
|
||||
# of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
|
||||
# instead of TCL_BUILD_LIB_SPEC since it will work with both an
|
||||
# installed and uninstalled version of Tcl.
|
||||
if test -f ${TCL_BIN_DIR}/Makefile ; then
|
||||
if test -f "${TCL_BIN_DIR}/Makefile" ; then
|
||||
TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
|
||||
TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
|
||||
TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
|
||||
@ -295,7 +293,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
|
||||
# against Tcl.framework installed in an arbitary location.
|
||||
case ${TCL_DEFS} in
|
||||
*TCL_FRAMEWORK*)
|
||||
if test -f ${TCL_BIN_DIR}/${TCL_LIB_FILE}; then
|
||||
if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then
|
||||
for i in "`cd ${TCL_BIN_DIR}; pwd`" \
|
||||
"`cd ${TCL_BIN_DIR}/../..; pwd`"; do
|
||||
if test "`basename "$i"`" = "${TCL_LIB_FILE}.framework"; then
|
||||
@ -304,7 +302,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test -f ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}; then
|
||||
if test -f "${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"; then
|
||||
TCL_STUB_LIB_SPEC="-L${TCL_BIN_DIR} ${TCL_STUB_LIB_FLAG}"
|
||||
TCL_STUB_LIB_PATH="${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"
|
||||
fi
|
||||
@ -368,7 +366,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [
|
||||
# of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
|
||||
# instead of TK_BUILD_LIB_SPEC since it will work with both an
|
||||
# installed and uninstalled version of Tcl.
|
||||
if test -f ${TK_BIN_DIR}/Makefile ; then
|
||||
if test -f "${TK_BIN_DIR}/Makefile" ; then
|
||||
TK_LIB_SPEC=${TK_BUILD_LIB_SPEC}
|
||||
TK_STUB_LIB_SPEC=${TK_BUILD_STUB_LIB_SPEC}
|
||||
TK_STUB_LIB_PATH=${TK_BUILD_STUB_LIB_PATH}
|
||||
@ -378,7 +376,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [
|
||||
# against Tk.framework installed in an arbitary location.
|
||||
case ${TK_DEFS} in
|
||||
*TK_FRAMEWORK*)
|
||||
if test -f ${TK_BIN_DIR}/${TK_LIB_FILE}; then
|
||||
if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
|
||||
for i in "`cd ${TK_BIN_DIR}; pwd`" \
|
||||
"`cd ${TK_BIN_DIR}/../..; pwd`"; do
|
||||
if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
|
||||
@ -387,7 +385,7 @@ AC_DEFUN([SC_LOAD_TKCONFIG], [
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test -f ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}; then
|
||||
if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then
|
||||
TK_STUB_LIB_SPEC="-L${TK_BIN_DIR} ${TK_STUB_LIB_FLAG}"
|
||||
TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user