gdb/
	* common/Makefile.in: Inherit CC.
	* common/configure.ac (GDB_INCLUDE): Include dir intl.
	* common/configure: Regenerate.

diff --git a/gdb/common/Makefile.in b/gdb/common/Makefile.in
index 9230b87..23117a9 100644
--- a/gdb/common/Makefile.in
+++ b/gdb/common/Makefile.in
@@ -26,6 +26,7 @@ COMMON_CPU_OBJ = @COMMON_CPU_OBJ@
 # CFLAGS is specifically reserved for setting from the command line
 # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
 CFLAGS = @CFLAGS@
+CC = @CC@
 
 BFD_DIR = ../../bfd
 BFD_SRC = $(srcdir)/$(BFD_DIR)
diff --git a/gdb/common/configure b/gdb/common/configure
index 957dcc3..38b26ec 100755
--- a/gdb/common/configure
+++ b/gdb/common/configure
@@ -2966,7 +2966,7 @@ if test x"$enable_gdbserver" = xyes; then
   GDB_INCLUDE="-I\$(srcdir)/../gdbserver/"
 else
   GDB_FLAGS=""
-  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR)"
+  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR) -I../../intl/"
 fi
 
 
diff --git a/gdb/common/configure.ac b/gdb/common/configure.ac
index 1ef85fe..b31a3e9 100644
--- a/gdb/common/configure.ac
+++ b/gdb/common/configure.ac
@@ -63,7 +63,7 @@ if test x"$enable_gdbserver" = xyes; then
   GDB_INCLUDE="-I\$(srcdir)/../gdbserver/"
 else
   GDB_FLAGS=""
-  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR)"
+  GDB_INCLUDE="-I\$(srcdir)/../ -I\$(BFD_DIR) -I../../intl/"
 fi
 
 AC_SUBST(GDB_FLAGS)