I18n fixes.

diff --git a/acconfig.h b/acconfig.h
index ccbb40c842764212d0fe77cbbe3d345b4578fe3f..d8b432aad887d2adf2550ac67e95f05a67aceb1d 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -32,6 +32,9 @@
 /* The location of the semantic parser (bison.hairy).  */
 #undef XPFILE1
 
 /* The location of the semantic parser (bison.hairy).  */
 #undef XPFILE1
 

+/* The location of the local directory.  */
+#undef LOCALEDIR
+

 /* Define as 1 if realloc must be declared even if <stdlib.h> is
    included.  */
 #undef NEED_DECLARATION_REALLOC
 /* Define as 1 if realloc must be declared even if <stdlib.h> is
    included.  */
 #undef NEED_DECLARATION_REALLOC

diff --git a/src/Makefile.am b/src/Makefile.am
index 260846b1196785c6d15fd739bdde51f0bfd20e90..2284284a347255024146031d27c572540db9ff4c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,8 @@ bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c      \
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 

-bison_LDADD = @ALLOCA@
+bison_LDADD = @INTLLIBS@ @ALLOCA@
+INCLUDES = -I../intl -I$(top_srcdir)/intl

 
 noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
  symtab.h system.h types.h getopt.h
 
 noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h        \
  symtab.h system.h types.h getopt.h

diff --git a/src/system.h b/src/system.h
index 56c4ef3a73d906b748696bc50f2a4f2154cb7148..9469cea3da2a5dc3bbf77e286a8c20f8683eae5d 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -62,7 +62,8 @@
 #endif
 #define N_(Text) Text
 
 #endif
 #define N_(Text) Text
 

-/* In the meantime, waiting for Automake.  */
+#ifndef LOCALEDIR

 #define LOCALEDIR "/usr/local/share/locale"
 #define LOCALEDIR "/usr/local/share/locale"

+#endif

 
 #endif  /* BISON_SYSTEM_H */
 
 #endif  /* BISON_SYSTEM_H */