From: Bruno Haible <bruno@clisp.org>
Date: Tue, 29 Aug 2006 15:46:04 +0000 (+0000)
Subject: Better integration with gnulib.
X-Git-Tag: 0.16.x-branchpoint~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a059b6671ae2dd9dbb88bd9ec67de1b620b6ad80;p=thirdparty%2Fgettext.git

Better integration with gnulib.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1a10fd5fd..cf81144e4 100644
--- 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 18b627dd5..4f5e4ea41 100644
--- 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) == '\\')