Fix for VPATH builds.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3e1d618ba063f33d5f6c0fc293ff9c0912c77eeb..74fbed78ecd87eac519d94abe6ac5ac1427eeeda 100644 (file)
--- 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 36ab3dcd9ab5ee5a6f059b99529a7b15d2561a64..1266cb1da7ed21f13dadae9f470a1c8cf4b14b22 100644 (file)
--- 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 5fb4106ccf6d2978dab7fdbe4168dcc7f771c019..b54a9ff3e03f106238629e8b4d5a568b7fd3ad88 100644 (file)
--- 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 dd9e9443519e4ac2516b8b51bb9db8a842b8237e..1e4983295c5ccdad2470620af30452fa6b6fd1d0 100644 (file)
--- 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 5cf32fbafcbaa3a4db33009978855578831e18f1..309b0d91712e5564bf6dcb814a17ec7f3cbe5da5 100644 (file)
--- 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 0dccbcfd8c4d32c1df7ba6b9c1cb9b20cc64f293..e4c299fc0c759eb399efd8f1d709f23f012a9b8b 100644 (file)
--- 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