From: Bruno Haible <bruno@clisp.org>
Date: Mon, 4 Feb 2002 13:37:31 +0000 (+0000)
Subject: Fix for VPATH builds.
X-Git-Tag: v0.11.1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e54357669bd7b199f1f6fc665415c3531f7dd834;p=thirdparty%2Fgettext.git

Fix for VPATH builds.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3e1d618ba..74fbed78e 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-02  Bruno Haible  <bruno@clisp.org>
+
+	* fnmatch.m4 (gt_FUNC_FNMATCH): Ensure directory lib exists.
+
 2002-02-04  Bruno Haible  <bruno@clisp.org>
 
 	* javacomp.m4 (gt_JAVACOMP): Use changequote to protect brackets.
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 36ab3dcd9..1266cb1da 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -1,4 +1,4 @@
-# fnmatch.m4 serial 1 (gettext-0.11)
+# fnmatch.m4 serial 2 (gettext-0.11.1)
 dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -37,6 +37,7 @@ AC_DEFUN([gt_FUNC_FNMATCH],
   if test $gt_cv_func_fnmatch_works = yes; then
     rm -f lib/fnmatch.h
   else
+    test -d lib || mkdir lib
     echo '#include "pfnmatch.h"' > lib/fnmatch.h
     dnl We must choose a different name for our function, since on ELF systems
     dnl a broken fnmatch() in libc.so would override our fnmatch() in
diff --git a/src/ChangeLog b/src/ChangeLog
index 5fb4106cc..b54a9ff3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-02  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (INCLUDES): Add -I../lib. Needed for builds with
+	builddir != srcdir on platforms that don't have fnmatch and stdbool.h.
+
 2002-01-31  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11 released.
diff --git a/src/Makefile.am b/src/Makefile.am
index dd9e94435..1e4983295 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ localedir = $(datadir)/locale
 jardir = $(datadir)/gettext
 projectsdir = $(pkgdatadir)/projects
 
-INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl \
+INCLUDES = -I. -I$(srcdir) -I.. -I../lib -I$(top_srcdir)/lib -I../intl \
 -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 -DLIBDIR=\"$(libdir)\" -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 5cf32fbaf..309b0d917 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-02  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (INCLUDES): Add -I../lib. Needed for builds with
+	builddir != srcdir on platforms that don't have stdbool.h.
+
 2002-01-31  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.11 released.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0dccbcfd8..e4c299fc0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,7 +112,7 @@ xg-test1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
 	  $(top_srcdir)/src/gettext.c
 
 # Three auxiliary programs used by the tests.
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
+INCLUDES = -I.. -I../lib -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
 LDADD_yes = ../intl/libintl.la