Better integration with gnulib.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1a10fd5fdac44d332f62782176e4e5626ab3782b..cf81144e490fec605a1fea4de8edc5cabec0b4a9 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-29  Bruno Haible  <bruno@clisp.org>
+
+       * localcharset.c: Include configmake.h in order to get LIBDIR defined.
+
 2006-08-18  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in (MKDIR_P): New variable. Needed by $(mkdir_p) with

diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 18b627dd51d245c6def7feec26548e6727a9c1ab..4f5e4ea412df49233e08758ff15a03b38e6287d3 100644 (file)
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -67,6 +67,11 @@
 # define relocate(pathname) (pathname)
 #endif
 
+/* Get LIBDIR.  */
+#ifndef LIBDIR
+# include "configmake.h"
+#endif
+
 #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__
   /* Win32, Cygwin, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')