rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

12 files changed, 0 insertions, 2982 deletions

diff --git a/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch b/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
deleted file mode 100644
index d1dbd07341..0000000000
--- a/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-This patch is based on the following:
-
-http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
-
-diff -urN e2fsprogs-1.38.orig/configure.in e2fsprogs-1.38/configure.in
---- e2fsprogs-1.38.orig/configure.in	2005-04-06 20:44:15.000000000 +0200
-+++ e2fsprogs-1.38/configure.in	2008-10-16 23:44:10.000000000 +0200
-@@ -518,6 +518,7 @@
- AC_CHECK_TOOL(RANLIB, ranlib, :)
- AC_CHECK_TOOL(STRIP, strip, :)
- AC_PROG_INSTALL
-+AC_PROG_MKDIR_P
- # See if we need a separate native compiler.
- if test $cross_compiling = no; then
-   BUILD_CC="$CC"
-diff -urN e2fsprogs-1.38.orig/debugfs/Makefile.in e2fsprogs-1.38/debugfs/Makefile.in
---- e2fsprogs-1.38.orig/debugfs/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/debugfs/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -48,8 +48,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir)
- 
- install: $(PROGS) $(MANPAGES) installdirs
-diff -urN e2fsprogs-1.38.orig/doc/Makefile.in e2fsprogs-1.38/doc/Makefile.in
---- e2fsprogs-1.38.orig/doc/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/doc/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -20,8 +20,8 @@
- 
- install-doc-libs:
- 	@$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
--	@echo "	MKINSTALLDIRS $(infodir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
-+	@echo "	MKDIR_P $(infodir)"
-+	@$(MKDIR_P) $(DESTDIR)$(infodir)
- 	@for i in libext2fs.info* ; do \
- 		echo "	INSTALL_DATA $(infodir)/$$i" ; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
-diff -urN e2fsprogs-1.38.orig/e2fsck/Makefile.in e2fsprogs-1.38/e2fsck/Makefile.in
---- e2fsprogs-1.38.orig/e2fsck/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/e2fsck/Makefile.in	2008-10-16 23:44:55.000000000 +0200
-@@ -151,8 +151,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir)
- 
- install: $(PROGS) $(MANPAGES) installdirs
-diff -urN e2fsprogs-1.38.orig/intl/Makefile.in e2fsprogs-1.38/intl/Makefile.in
---- e2fsprogs-1.38.orig/intl/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/intl/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -39,8 +39,8 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-+MKDIR_P = @MKDIR_P@
-+mkdir_p = @MKDIR_P@
- 
- l = @INTL_LIBTOOL_SUFFIX_PREFIX@
- 
-diff -urN e2fsprogs-1.38.orig/lib/blkid/Makefile.in e2fsprogs-1.38/lib/blkid/Makefile.in
---- e2fsprogs-1.38.orig/lib/blkid/Makefile.in	2005-06-29 19:39:54.000000000 +0200
-+++ e2fsprogs-1.38/lib/blkid/Makefile.in	2008-10-16 23:45:16.000000000 +0200
-@@ -129,8 +129,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/blkid"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/blkid"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all installdirs 
-diff -urN e2fsprogs-1.38.orig/lib/e2p/Makefile.in e2fsprogs-1.38/lib/e2p/Makefile.in
---- e2fsprogs-1.38.orig/lib/e2p/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/e2p/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -73,8 +73,8 @@
- 	./tst_ostype
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/e2p"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/e2p"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all installdirs 
-diff -urN e2fsprogs-1.38.orig/lib/et/Makefile.in e2fsprogs-1.38/lib/et/Makefile.in
---- e2fsprogs-1.38.orig/lib/et/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/et/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -74,8 +74,8 @@
- 	$(TAGS) $(SRCS)
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
- 		$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
- 		$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
-diff -urN e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in e2fsprogs-1.38/lib/ext2fs/Makefile.in
---- e2fsprogs-1.38.orig/lib/ext2fs/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/ext2fs/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -230,8 +230,8 @@
- @SWAPFS_CMT@	LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_byteswap
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/ext2fs"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
- 
- install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
-diff -urN e2fsprogs-1.38.orig/lib/Makefile.elf-lib e2fsprogs-1.38/lib/Makefile.elf-lib
---- e2fsprogs-1.38.orig/lib/Makefile.elf-lib	2004-12-15 17:30:39.000000000 +0100
-+++ e2fsprogs-1.38/lib/Makefile.elf-lib	2008-10-16 23:44:10.000000000 +0200
-@@ -35,8 +35,8 @@
- 	@$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
- 
- installdirs-elf-lib::
--	@echo "	MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
-+	@echo "	MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
-+	@$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \
- 		$(DESTDIR)$(libdir)
- 
- installdirs:: installdirs-elf-lib
-diff -urN e2fsprogs-1.38.orig/lib/ss/Makefile.in e2fsprogs-1.38/lib/ss/Makefile.in
---- e2fsprogs-1.38.orig/lib/ss/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/ss/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -125,8 +125,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir) \
- 		$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
- 		$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
- 
-diff -urN e2fsprogs-1.38.orig/lib/uuid/Makefile.in e2fsprogs-1.38/lib/uuid/Makefile.in
---- e2fsprogs-1.38.orig/lib/uuid/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/lib/uuid/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -126,8 +126,8 @@
- 	@cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
- 
- installdirs::
--	@echo "	MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(libdir)  \
-+	@echo "	MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(libdir)  \
- 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
- 		$(DESTDIR)$(libdir)/pkgconfig
- 
-diff -urN e2fsprogs-1.38.orig/MCONFIG.in e2fsprogs-1.38/MCONFIG.in
---- e2fsprogs-1.38.orig/MCONFIG.in	2005-02-04 16:43:57.000000000 +0100
-+++ e2fsprogs-1.38/MCONFIG.in	2008-10-16 23:44:10.000000000 +0200
-@@ -59,7 +59,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKDIR_P = @MKDIR_P@
- 
- #
- # Library definitions
-diff -urN e2fsprogs-1.38.orig/misc/Makefile.in e2fsprogs-1.38/misc/Makefile.in
---- e2fsprogs-1.38.orig/misc/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/misc/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -215,8 +215,8 @@
- 	@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
-+	@echo "	MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
-+	@$(MKDIR_P) $(DESTDIR)$(sbindir) \
- 		$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
- 		$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(libdir)
- 
-diff -urN e2fsprogs-1.38.orig/po/Makefile.in.in e2fsprogs-1.38/po/Makefile.in.in
---- e2fsprogs-1.38.orig/po/Makefile.in.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/po/Makefile.in.in	2008-10-16 23:44:10.000000000 +0200
-@@ -25,11 +25,10 @@
- datadir = @datadir@
- localedir = $(datadir)/locale
- gettextsrcdir = $(datadir)/gettext/po
-+mkdir_p = @MKDIR_P@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
-@@ -147,7 +146,7 @@
- install-exec:
- install-data: install-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	  for file in $(DISTFILES.common) Makevars.template; do \
- 	    $(INSTALL_DATA) $(srcdir)/$$file \
- 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-@@ -160,13 +159,13 @@
- 	fi
- install-data-no: all
- install-data-yes: all
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
- 	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
- 	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-@@ -206,19 +205,19 @@
- installdirs-exec:
- installdirs-data: installdirs-data-@USE_NLS@
- 	if test "$(PACKAGE)" = "gettext-tools"; then \
--	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- 	else \
- 	  : ; \
- 	fi
- installdirs-data-no:
- installdirs-data-yes:
--	$(mkinstalldirs) $(DESTDIR)$(datadir)
-+	$(mkdir_p) $(DESTDIR)$(datadir)
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
--	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-+	  $(mkdir_p) $(DESTDIR)$$dir; \
- 	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
- 	    if test -n "$$lc"; then \
- 	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-diff -urN e2fsprogs-1.38.orig/resize/Makefile.in e2fsprogs-1.38/resize/Makefile.in
---- e2fsprogs-1.38.orig/resize/Makefile.in	2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/resize/Makefile.in	2008-10-16 23:44:10.000000000 +0200
-@@ -56,8 +56,8 @@
- 	@$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) 
- 
- installdirs:
--	@echo "	MKINSTALLDIRS $(root_sbindir) $(man8dir)"
--	@$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+	@echo "	MKDIR_P $(root_sbindir) $(man8dir)"
-+	@$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- 		$(DESTDIR)$(man8dir)
- 
- install: $(PROGS) $(MANPAGES) installdirs
diff --git a/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch b/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
deleted file mode 100644
index 979f0d1f08..0000000000
--- a/packages/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- e2fsprogs-1.38/misc/Makefile.in.orig	2005-11-08 23:56:06.000000000 +0100
-+++ e2fsprogs-1.38/misc/Makefile.in	2005-11-08 23:59:15.000000000 +0100
-@@ -230,17 +230,13 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- 	done
- 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext2
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2)
- 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext3
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3)
- 	@echo "	LINK $(root_sbindir)/e2label"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
--		$(DESTDIR)$(root_sbindir)/e2label
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label)
- 	@echo "	LINK $(root_sbindir)/findfs"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
--		$(DESTDIR)$(root_sbindir)/findfs
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs)
- 	@for i in $(UPROGS); do \
- 		echo "	INSTALL $(bindir)/$$i"; \
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
-@@ -259,11 +255,9 @@
- 	@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
- 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- 	@echo "	LINK mkfs.ext2.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext2.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
- 	@echo "	LINK mkfs.ext3.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext3.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
- 	@for i in $(UMANPAGES); do \
- 		$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
- 		echo "	INSTALL_DATA $(man1dir)/$$i"; \
---- e2fsprogs-1.38/lib/uuid/Makefile.in.orig	2005-11-08 23:54:17.000000000 +0100
-+++ e2fsprogs-1.38/lib/uuid/Makefile.in	2005-11-08 23:55:51.000000000 +0100
-@@ -146,9 +146,9 @@
- 	@$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
- 		$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- 	@echo "	LINK $(man3dir)/uuid_generate_random.3"
--	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
-+	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
- 	@echo "	LINK $(man3dir)/uuid_generate_time.3"
--	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
-+	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
- 	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- 	@$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
- 
---- e2fsprogs-1.38/e2fsck/Makefile.in.orig	2005-11-08 23:53:07.000000000 +0100
-+++ e2fsprogs-1.38/e2fsck/Makefile.in	2005-11-08 23:53:43.000000000 +0100
-@@ -161,11 +161,9 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- 	done
- 	@echo "	LINK $(root_sbindir)/fsck.ext2"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext2
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
- 	@echo "	LINK $(root_sbindir)/fsck.ext3"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext3
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
- 	@for i in $(MANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \
- 			$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
-@@ -174,11 +172,9 @@
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
- 	done
- 	@echo "	LINK $(man8dir)/fsck.ext2.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext2.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
- 	@echo "	LINK $(man8dir)/fsck.ext3.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext3.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
- 
- install-strip: install
- 	@for i in $(PROGS); do \
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
deleted file mode 100644
index 388c519d0c..0000000000
--- a/packages/e2fsprogs/e2fsprogs-native_1.38.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-PR = "r2"
-
-SRC_URI += "file://no-hardlinks.patch;patch=1 \
-	    file://mkinstalldirs.patch;patch=1 \
-	   "
-
-EXTRA_OECONF = ""
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-PACKAGES = ""
-DEPENDS = ""
-
-do_stage () {
-        oe_runmake install
-}
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
deleted file mode 100644
index f2c3898dbe..0000000000
--- a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-PR = "r1"
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF = ""
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-PACKAGES = ""
-DEPENDS = ""
-
-do_stage () {
-        oe_runmake install
-}
diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc
deleted file mode 100644
index eb094470c4..0000000000
--- a/packages/e2fsprogs/e2fsprogs.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-HOMEPAGE = "http://e2fsprogs.sf.net"
-LICENSE = "GPL"
-SECTION = "base"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
-
-S = "${WORKDIR}/e2fsprogs-${PV}"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
-
-PARALLEL_MAKE = ""
diff --git a/packages/e2fsprogs/e2fsprogs/compile-subst.patch b/packages/e2fsprogs/e2fsprogs/compile-subst.patch
deleted file mode 100644
index ccac8ea062..0000000000
--- a/packages/e2fsprogs/e2fsprogs/compile-subst.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- e2fsprogs-1.33/util/subst.c~compile-subst
-+++ e2fsprogs-1.33/util/subst.c
-@@ -10,7 +10,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <ctype.h>
-+//#include <ctype.h>
- 
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
diff --git a/packages/e2fsprogs/e2fsprogs/configure.patch b/packages/e2fsprogs/e2fsprogs/configure.patch
deleted file mode 100644
index b00e5ea702..0000000000
--- a/packages/e2fsprogs/e2fsprogs/configure.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- e2fsprogs-1.33/./lib/uuid/configure.in~configure
-+++ e2fsprogs-1.33/./lib/uuid/configure.in
-@@ -2,9 +2,11 @@
- dnl  Not used now, for the future when uuid is separated out into its 
- dnl own package.
- dnl
--AC_INIT(gen_uuid.c)
--AC_PREREQ(2.12)
-+AC_INIT
-+AC_CONFIG_SRCDIR([gen_uuid.c])
-+AC_PREREQ(2.57)
- 
- AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
- AC_CHECK_FUNCS(srandom)
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
---- e2fsprogs-1.33/./configure.in~configure
-+++ e2fsprogs-1.33/./configure.in
-@@ -1,5 +1,6 @@
--AC_INIT(version.h)
--AC_PREREQ(2.12)
-+AC_INIT
-+AC_CONFIG_SRCDIR([version.h])
-+AC_PREREQ(2.57)
- MCONFIG=./MCONFIG
- AC_SUBST_FILE(MCONFIG)
- BINARY_TYPE=bin
-@@ -537,10 +538,7 @@
- dnl is not decleared.
- AC_MSG_CHECKING(whether d_reclen declared in dirent)
- AC_CACHE_VAL(e2fsprogs_cv_have_d_reclen_dirent,
--	AC_TRY_COMPILE(
--[#include <dirent.h>], [struct dirent de; de.d_reclen = 0; ],
--	[e2fsprogs_cv_have_d_reclen_dirent=yes],
--	[e2fsprogs_cv_have_d_reclen_dirent=no]))
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dirent.h>]], [[struct dirent de; de.d_reclen = 0; ]])],[e2fsprogs_cv_have_d_reclen_dirent=yes],[e2fsprogs_cv_have_d_reclen_dirent=no]))
- AC_MSG_RESULT($e2fsprogs_cv_have_d_reclen_dirent)
- if test "$e2fsprogs_cv_have_d_reclen_dirent" = yes; then
-    AC_DEFINE(HAVE_RECLEN_DIRENT)
-@@ -548,10 +546,7 @@
- dnl Check to see if ssize_t was decleared
- AC_MSG_CHECKING(whether ssize_t declared)
- AC_CACHE_VAL(e2fsprogs_cv_have_ssize_t,
--	AC_TRY_COMPILE(
--[#include <sys/types.h>], [ssize_t a = 0; ],
--	[e2fsprogs_cv_have_ssize_t=yes],
--	[e2fsprogs_cv_have_ssize_t=no]))
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[ssize_t a = 0; ]])],[e2fsprogs_cv_have_ssize_t=yes],[e2fsprogs_cv_have_ssize_t=no]))
- AC_MSG_RESULT($e2fsprogs_cv_have_ssize_t)
- if test "$e2fsprogs_cv_have_ssize_t" = yes; then
-    AC_DEFINE(HAVE_TYPE_SSIZE_T)
-@@ -565,10 +560,7 @@
- dnl
- AC_MSG_CHECKING(whether llseek declared in unistd.h)
- AC_CACHE_VAL(e2fsprogs_cv_have_llseek_prototype,
--	AC_TRY_COMPILE(
--[#include <unistd.h>], [extern int llseek(int);],
--	[e2fsprogs_cv_have_llseek_prototype=no],
--	[e2fsprogs_cv_have_llseek_prototype=yes]))
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[extern int llseek(int);]])],[e2fsprogs_cv_have_llseek_prototype=no],[e2fsprogs_cv_have_llseek_prototype=yes]))
- AC_MSG_RESULT($e2fsprogs_cv_have_llseek_prototype)
- if test "$e2fsprogs_cv_have_llseek_prototype" = yes; then
-    AC_DEFINE(HAVE_LLSEEK_PROTOTYPE)
-@@ -584,12 +576,9 @@
- dnl
- AC_MSG_CHECKING(whether lseek64 declared in unistd.h)
- AC_CACHE_VAL(e2fsprogs_cv_have_lseek64_prototype,
--	AC_TRY_COMPILE(
--[#define _LARGEFILE_SOURCE
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _LARGEFILE_SOURCE
- #define _LARGEFILE64_SOURCE
--#include <unistd.h>], [extern int lseek64(int);],
--	[e2fsprogs_cv_have_lseek64_prototype=no],
--	[e2fsprogs_cv_have_lseek64_prototype=yes]))
-+#include <unistd.h>]], [[extern int lseek64(int);]])],[e2fsprogs_cv_have_lseek64_prototype=no],[e2fsprogs_cv_have_lseek64_prototype=yes]))
- AC_MSG_RESULT($e2fsprogs_cv_have_lseek64_prototype)
- if test "$e2fsprogs_cv_have_lseek64_prototype" = yes; then
-    AC_DEFINE(HAVE_LSEEK64_PROTOTYPE)
-@@ -624,18 +613,12 @@
- dnl
- AC_MSG_CHECKING(whether struct stat has a st_flags field)
- AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags,
--	AC_TRY_COMPILE([#include <sys/stat.h>],
--		[struct stat stat; stat.st_flags = 0;],
--		[e2fsprogs_cv_struct_st_flags=yes],
--		[e2fsprogs_cv_struct_st_flags=no]))
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags = 0;]])],[e2fsprogs_cv_struct_st_flags=yes],[e2fsprogs_cv_struct_st_flags=no]))
- AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags)
- if test "$e2fsprogs_cv_struct_st_flags" = yes; then
-   AC_MSG_CHECKING(whether st_flags field is useful)
-   AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags_immut,
--	AC_TRY_COMPILE([#include <sys/stat.h>],
--		[struct stat stat; stat.st_flags |= UF_IMMUTABLE;],
--		[e2fsprogs_cv_struct_st_flags_immut=yes],
--		[e2fsprogs_cv_struct_st_flags_immut=no]))
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags |= UF_IMMUTABLE;]])],[e2fsprogs_cv_struct_st_flags_immut=yes],[e2fsprogs_cv_struct_st_flags_immut=no]))
-   AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut)
-   if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
- 	  AC_DEFINE(HAVE_STAT_FLAGS)
-@@ -747,8 +730,7 @@
- AC_MSG_CHECKING([whether linker accepts -static])
- AC_CACHE_VAL(ac_cv_e2fsprogs_use_static,
- [SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
--AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
-- ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[fflush(stdout);]])],[ac_cv_e2fsprogs_use_static=yes],[ac_cv_e2fsprogs_use_static=no])
- LDFLAGS=$SAVE_LDFLAGS])
- dnl
- dnl Regardless of how the test turns out, Solaris doesn't handle -static
-@@ -804,4 +786,5 @@
- 		outlist="$outlist $i"
- 	fi
- done
--AC_OUTPUT($outlist)
-+AC_CONFIG_FILES([$outlist])
-+AC_OUTPUT
diff --git a/packages/e2fsprogs/e2fsprogs/ldflags.patch b/packages/e2fsprogs/e2fsprogs/ldflags.patch
deleted file mode 100644
index 0a7ed4ed74..0000000000
--- a/packages/e2fsprogs/e2fsprogs/ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- e2fsprogs-1.34/lib/uuid/Makefile.in~ldflags
-+++ e2fsprogs-1.34/lib/uuid/Makefile.in
-@@ -94,7 +94,7 @@
- 	$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
- 
- uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
--	$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
-+	$(CC) $(ALL_CFLAGS) -DDEBUG $(ALL_LDFLAGS) -o uuid_time $(srcdir)/uuid_time.c \
- 		$(LIBUUID)
- 
- libuuid.3: $(DEP_SUBSTITUTE) $(srcdir)/libuuid.3.in
---- e2fsprogs-1.34/lib/evms/Makefile.in~ldflags
-+++ e2fsprogs-1.34/lib/evms/Makefile.in
-@@ -36,7 +36,7 @@
- 
- $(ELF_LIB): $(OBJS)
- 	$(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) \
--		$(OBJS) $(ELF_OTHER_LIBS)
-+		$(OBJS) $(ELF_OTHER_LIBS) $(ALL_LDFLAGS)
- 
- installdirs:: 
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) 
diff --git a/packages/e2fsprogs/e2fsprogs/ln.patch b/packages/e2fsprogs/e2fsprogs/ln.patch
deleted file mode 100644
index 247def8b36..0000000000
--- a/packages/e2fsprogs/e2fsprogs/ln.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -urNd e2fsprogs-1.32/e2fsck/Makefile.in e2fsprogs-1.32-new/e2fsck/Makefile.in
---- e2fsprogs-1.32/e2fsck/Makefile.in	2002-10-31 02:49:21.000000000 -0600
-+++ e2fsprogs-1.32-new/e2fsck/Makefile.in	2002-11-29 11:06:39.000000000 -0600
-@@ -145,9 +145,9 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- 		$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
- 	done
--	$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(LN_S) -f ./e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext2
--	$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
-+	$(LN_S) -f ./e2fsck \
- 			$(DESTDIR)$(root_sbindir)/fsck.ext3
- 	for i in $(MANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \
-@@ -155,8 +155,8 @@
- 		done; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
- 	done
--	$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
--	$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
-+	$(LN_S) -f ./e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
-+	$(LN_S) -f ./e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
- 
- uninstall:
- 	for i in $(PROGS); do \
-diff -urNd e2fsprogs-1.32/misc/Makefile.in e2fsprogs-1.32-new/misc/Makefile.in
---- e2fsprogs-1.32/misc/Makefile.in	2002-10-31 02:49:21.000000000 -0600
-+++ e2fsprogs-1.32-new/misc/Makefile.in	2002-11-29 11:05:25.000000000 -0600
-@@ -154,13 +154,13 @@
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- 		$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
- 	done
--	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(LN_S) -f ./mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext2
--	$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
-+	$(LN_S) -f ./mke2fs \
- 		$(DESTDIR)$(root_sbindir)/mkfs.ext3
--	$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-+	$(LN_S) -f ./tune2fs \
- 		$(DESTDIR)$(root_sbindir)/e2label
--	$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-+	$(LN_S) -f ./tune2fs \
- 		$(DESTDIR)$(root_sbindir)/findfs
- 	for i in $(UPROGS); do \
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
-@@ -174,8 +174,8 @@
- 	done
- 	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
- 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
--	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
--	$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
-+	$(LN_S) -f ./mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
-+	$(LN_S) -f ./mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
- 	for i in $(UMANPAGES); do \
- 		$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
diff --git a/packages/e2fsprogs/e2fsprogs/m4.patch b/packages/e2fsprogs/e2fsprogs/m4.patch
deleted file mode 100644
index 2a9b2a64f1..0000000000
--- a/packages/e2fsprogs/e2fsprogs/m4.patch
+++ /dev/null
@@ -1,2155 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- /dev/null
-+++ e2fsprogs-libs-1.34/m4/codeset.m4
-@@ -0,0 +1,23 @@
-+# codeset.m4 serial AM1 (gettext-0.10.40)
-+dnl Copyright (C) 2000-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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Bruno Haible.
-+
-+AC_DEFUN([AM_LANGINFO_CODESET],
-+[
-+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-+    [AC_TRY_LINK([#include <langinfo.h>],
-+      [char* cs = nl_langinfo(CODESET);],
-+      am_cv_langinfo_codeset=yes,
-+      am_cv_langinfo_codeset=no)
-+    ])
-+  if test $am_cv_langinfo_codeset = yes; then
-+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-+  fi
-+])
---- /dev/null
-+++ e2fsprogs-libs-1.34/m4/gettext.m4
-@@ -0,0 +1,587 @@
-+# gettext.m4 serial 17 (gettext-0.11.5)
-+dnl Copyright (C) 1995-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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+dnl
-+dnl This file can can be used in projects which are not available under
-+dnl the GNU General Public License or the GNU Library General Public
-+dnl License but which still want to provide support for the GNU gettext
-+dnl functionality.
-+dnl Please note that the actual code of the GNU gettext library is covered
-+dnl by the GNU Library General Public License, and the rest of the GNU
-+dnl gettext package package is covered by the GNU General Public License.
-+dnl They are *not* in the public domain.
-+
-+dnl Authors:
-+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-+
-+dnl Macro to add for using GNU gettext.
-+
-+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-+dnl    default (if it is not specified or empty) is 'no-libtool'.
-+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-+dnl    $(top_builddir)/intl/libintl.a will be created.
-+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-+dnl    implementations (in libc or libintl) without the ngettext() function
-+dnl    will be ignored.  If NEEDSYMBOL is specified and is
-+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-+dnl INTLDIR is used to find the intl libraries.  If empty,
-+dnl    the value `$(top_builddir)/intl/' is used.
-+dnl
-+dnl The result of the configuration is one of three cases:
-+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-+dnl    and used.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 2) GNU gettext has been found in the system's C library.
-+dnl    Catalog format: GNU --> install in $(datadir)
-+dnl    Catalog extension: .mo after installation, .gmo in source tree
-+dnl 3) No internationalization, always use English msgid.
-+dnl    Catalog format: none
-+dnl    Catalog extension: none
-+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-+dnl The use of .gmo is historical (it was needed to avoid overwriting the
-+dnl GNU format catalogs when building on a platform with an X/Open gettext),
-+dnl but we keep it in order not to force irrelevant filename changes on the
-+dnl maintainers.
-+dnl
-+AC_DEFUN([AM_GNU_GETTEXT],
-+[
-+  dnl Argument checking.
-+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-+])])])])])
-+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-+])])])])
-+  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-+  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-+
-+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-+  ifelse(gt_included_intl, yes, [
-+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-+  ])
-+
-+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-+  AC_REQUIRE([AC_LIB_RPATH])
-+
-+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-+  dnl Ideally we would do this search only after the
-+  dnl      if test "$USE_NLS" = "yes"; then
-+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-+  dnl the configure script would need to contain the same shell code
-+  dnl again, outside any 'if'. There are two solutions:
-+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-+  dnl documented, we avoid it.
-+  ifelse(gt_included_intl, yes, , [
-+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-+  ])
-+
-+  AC_MSG_CHECKING([whether NLS is requested])
-+  dnl Default is enabled NLS
-+  AC_ARG_ENABLE(nls,
-+    [  --disable-nls           do not use Native Language Support],
-+    USE_NLS=$enableval, USE_NLS=yes)
-+  AC_MSG_RESULT($USE_NLS)
-+  AC_SUBST(USE_NLS)