--- scan.c.orig	Mon Feb 20 18:45:51 2006
+++ scan.c	Thu Aug 24 09:55:38 2006
@@ -4179,9 +4179,19 @@
 
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
-#ifndef __cplusplus
+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __THROW /* this is a gnuism */
+extern int isatty YY_PARAMS(( int )) __THROW;
+#else
 extern int isatty YY_PARAMS(( int ));
-#endif /* __cplusplus */
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
 #endif /* !YY_NEVER_INTERACTIVE */
 #endif /* !YY_ALWAYS_INTERACTIVE */
 
--- skel.c.orig	Mon Feb 20 18:45:41 2006
+++ skel.c	Thu Aug 24 09:55:38 2006
@@ -2206,9 +2206,19 @@
   "[[",
   "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
   "    [[",
-  "#ifndef __cplusplus",
+  "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
+  "#ifdef __cplusplus",
+  "extern \"C\" {",
+  "#endif",
+  "#ifdef __THROW /* this is a gnuism */",
+  "extern int isatty M4_YY_PARAMS( int ) __THROW;",
+  "#else",
   "extern int isatty M4_YY_PARAMS( int );",
-  "#endif /* __cplusplus */",
+  "#endif",
+  "#ifdef __cplusplus",
+  "}",
+  "#endif",
+  "#endif",
   "    ]])",
   "]])",
   "%endif",
--- Makefile.in.orig	Mon Feb 20 18:45:12 2006
+++ Makefile.in	Thu Aug 24 09:56:18 2006
@@ -291,7 +291,7 @@
 
 
 localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
 
 # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
 #