aboutsummaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2009-05-07 08:36:43 +0000
committerPaolo Bonzini <bonzini@gcc.gnu.org>2009-05-07 08:36:43 +0000
commit1cee34299e29050d4b69807ee1bc0b5624ddfa7c (patch)
treea8db587a454ad0f7a287a58eba5cc30029107a87 /config
parent0d50d55aa181e8ae94c2b397c01dd25096f0ae35 (diff)
downloadgcc-1cee34299e29050d4b69807ee1bc0b5624ddfa7c.zip
gcc-1cee34299e29050d4b69807ee1bc0b5624ddfa7c.tar.gz
gcc-1cee34299e29050d4b69807ee1bc0b5624ddfa7c.tar.bz2
[multiple changes]
2009-05-07 Paolo Bonzini <bonzini@gnu.org> * config.guess: Sync with src. config: 2009-05-07 Paolo Bonzini Sync from src: 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. From-SVN: r147225
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog11
-rw-r--r--config/tcl.m414
2 files changed, 17 insertions, 8 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index d034202..d670de4 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,14 @@
+2009-05-07 Paolo Bonzini
+
+ Sync from src:
+ 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.
+
2009-04-09 Jakub Jelinek <jakub@redhat.com>
* lead-dot.m4: Change copyright header to refer to version
diff --git a/config/tcl.m4 b/config/tcl.m4
index be0129b..900a2ce 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -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