From 98a5ad6147c32e6a2e5a4f584081071acdd00b9b Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 15 Jul 2009 17:37:52 +0200 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o --- configure | 3 ++- configure.in | 3 ++- intl/Makefile.in | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 769dc09..f2729e5 100755 --- 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 d11faec..acbcec6 100644 --- 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 36592c1..47f6f62 100644 --- 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 -- 1.8.3.1