From 38ea300a20224b953f2102a8ab1ffb5cef49b480 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 20 Apr 2012 17:58:49 +0000 Subject: [PATCH] 2012-04-20 Pedro Alves gdb/ * acx_configure_dir.m4 (ACX_CONFIGURE_DIR): Handle absolute $srcdir. * configure: Regenerate. gdb/gdbserver/ * configure: Regenerate. --- gdb/ChangeLog | 6 ++++++ gdb/acx_configure_dir.m4 | 7 ++++++- gdb/configure | 7 ++++++- gdb/gdbserver/ChangeLog | 4 ++++ gdb/gdbserver/configure | 7 ++++++- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 31a8b5a020..9d8244a2c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-04-20 Pedro Alves + + * acx_configure_dir.m4 (ACX_CONFIGURE_DIR): Handle absolute + $srcdir. + * configure: Regenerate. + 2012-04-20 Sergio Durigan Junior * cp-support.h: Include `gdb_vecs.h'. Delete `const_char_ptr' VEC diff --git a/gdb/acx_configure_dir.m4 b/gdb/acx_configure_dir.m4 index 57a64a62f4..e431875147 100644 --- a/gdb/acx_configure_dir.m4 +++ b/gdb/acx_configure_dir.m4 @@ -89,7 +89,12 @@ AC_DEFUN([ACX_CONFIGURE_DIR], _AS_ECHO([$ac_msg]) AS_MKDIR_P(["$ac_dir"]) - ac_srcdir=../$srcdir/$in_src + case $srcdir in + [[\\/]]* | ?:[[\\/]]* ) + ac_srcdir=$srcdir/$in_src ;; + *) # Relative name. + ac_srcdir=../$srcdir/$in_src ;; + esac cd "$ac_dir" diff --git a/gdb/configure b/gdb/configure index dd1c80a110..54c2399080 100755 --- a/gdb/configure +++ b/gdb/configure @@ -4648,7 +4648,12 @@ fi $as_echo "$ac_msg" >&6 as_dir="$ac_dir"; as_fn_mkdir_p - ac_srcdir=../$srcdir/$in_src + case $srcdir in + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir/$in_src ;; + *) # Relative name. + ac_srcdir=../$srcdir/$in_src ;; + esac cd "$ac_dir" diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 7b48e194fd..d584b29e7c 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2012-04-20 Pedro Alves + + * configure: Regenerate. + 2012-04-19 Pedro Alves * Makefile.in (GNULIB_BUILDDIR): New. diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 5ab18856ef..63e25c239e 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -4391,7 +4391,12 @@ done $as_echo "$ac_msg" >&6 as_dir="$ac_dir"; as_fn_mkdir_p - ac_srcdir=../$srcdir/$in_src + case $srcdir in + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir/$in_src ;; + *) # Relative name. + ac_srcdir=../$srcdir/$in_src ;; + esac cd "$ac_dir" -- 2.34.1