Defined locations of parser files in config.h instead of Makefile.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index a52a34a554418973e8c12a7198702b197b468acf..56c4ef3a73d906b748696bc50f2a4f2154cb7148 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -19,6 +19,10 @@
 #include <stdlib.h>
 #endif
 
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+
 #if (defined(VMS) || defined(MSDOS)) && !defined(HAVE_STRING_H)
 #define HAVE_STRING_H 1
 #endif
@@ -37,14 +41,18 @@
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
-#if HAVE_LOCALE_H
+#if defined(STDC_HEADERS) || defined(HAVE_CTYPE_H)
+#include <ctype.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#if !HAVE_SETLOCALE
+#ifndef HAVE_SETLOCALE
 # define setlocale(Category, Locale)
 #endif
 
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 # include <libintl.h>
 # define _(Text) gettext (Text)
 #else
@@ -55,7 +63,6 @@
 #define N_(Text) Text
 
 /* In the meantime, waiting for Automake.  */
-#define PACKAGE "bison"
 #define LOCALEDIR "/usr/local/share/locale"
 
 #endif  /* BISON_SYSTEM_H */