Fix intl/ build: add E/Q/V macros, process intl/libgnuintl.h

These were found necessary to build on FreeBSD 6.4.

Signed-off-by: Matthias Andree <matthias.andree@gmx.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/configure b/configure
index 769dc0997292c3f69f22a4f4acc602017bb980b6..f2729e51a0ea7fd1c743d34f615950b8d4695273 100755 (executable)
--- a/configure
+++ b/configure
@@ -16592,7 +16592,8 @@ for i in MCONFIG Makefile e2fsprogs.spec \
        lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
        misc/Makefile ext2ed/Makefile e2fsck/Makefile \
        debugfs/Makefile tests/Makefile tests/progs/Makefile \
-       resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+       resize/Makefile doc/Makefile intl/Makefile \
+       intl/libgnuintl.h po/Makefile.in ; do
        if test -d `dirname ${srcdir}/$i` ; then
                outlist="$outlist $i"
        fi

diff --git a/configure.in b/configure.in
index d11faecd0c7d8f51d69eb797218419063da1bff5..acbcec62d5fd54d637800f08c1beb0840dd801e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1062,7 +1062,8 @@ for i in MCONFIG Makefile e2fsprogs.spec \
        lib/e2p/e2p.pc lib/blkid/blkid.pc lib/ext2fs/ext2fs.pc \
        misc/Makefile ext2ed/Makefile e2fsck/Makefile \
        debugfs/Makefile tests/Makefile tests/progs/Makefile \
-       resize/Makefile doc/Makefile intl/Makefile po/Makefile.in ; do
+       resize/Makefile doc/Makefile intl/Makefile \
+       intl/libgnuintl.h po/Makefile.in ; do
        if test -d `dirname ${srcdir}/$i` ; then
                outlist="$outlist $i"
        fi

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 36592c1b30efe42dfdd2920a2315c1fe02f7fb7d..47f6f629565e500373616ab5601fbeb247b17318 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -43,6 +43,22 @@ INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
+@SET_MAKE@
+
+@ifGNUmake@ V =
+@ifGNUmake@ ifeq ($(strip $(V)),)
+@ifGNUmake@ #  E = @echo
+@ifGNUmake@ #  Q = @
+@ifGNUmake@    E = @E@
+@ifGNUmake@    Q = @Q@
+@ifGNUmake@ else
+@ifGNUmake@    E = @\#
+@ifGNUmake@    Q =
+@ifGNUmake@ endif
+
+@ifNotGNUmake@ E = @E@
+@ifNotGNUmake@ Q = @Q@
+
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
 AR = ar