fix build when gettext autopoint is not there

6 files changed, 57 insertions, 2 deletions

diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 2848ac91c..3343ced39 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		findutils
 PKG_VERSION:=		4.4.2
-PKG_RELEASE:=		4
+PKG_RELEASE:=		5
 PKG_MD5SUM:=		351cc4adb07d54877fa15f75fb77d39f
 PKG_DESCR:=		utilities for finding files
 PKG_SECTION:=		utils
diff --git a/package/findutils/patches/patch-Makefile_am b/package/findutils/patches/patch-Makefile_am
new file mode 100644
index 000000000..40a1b3c5b
--- /dev/null
+++ b/package/findutils/patches/patch-Makefile_am
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/Makefile.am	2009-05-16 17:17:01.000000000 +0200
++++ findutils-4.4.2/Makefile.am	2014-04-23 16:03:42.290460470 +0200
+@@ -8,7 +8,7 @@ DISTCLEANFILES = tool-versions.txt
+ 
+ 
+ # "tests" is the gnulib unit test dir.
+-SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
++SUBDIRS = gnulib tests build-aux lib find xargs locate m4 
+ 
+ ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
+ 
diff --git a/package/findutils/patches/patch-configure_ac b/package/findutils/patches/patch-configure_ac
index 34c03d76f..e9c55722d 100644
--- a/package/findutils/patches/patch-configure_ac
+++ b/package/findutils/patches/patch-configure_ac
@@ -1,5 +1,5 @@
 --- findutils-4.4.2.orig/configure.ac	2009-05-16 17:27:39.000000000 +0200
-+++ findutils-4.4.2/configure.ac	2014-03-23 19:39:22.000000000 +0100
++++ findutils-4.4.2/configure.ac	2014-04-23 15:58:08.081495622 +0200
 @@ -77,8 +77,6 @@ AC_PROG_CPP
  dnl for gnulib
  gl_EARLY
@@ -9,3 +9,14 @@
  AC_PROG_INSTALL
  AC_PROG_RANLIB
  dnl AC_PROG_LIBTOOL
+@@ -204,10 +202,6 @@ AC_CHECK_MEMBER(struct dirent.d_type,,,[
+ 
+ jy_AC_ATTRIBUTE_NORETURN
+ 
+-dnl internationalization macros
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION(0.14.5)
+-
+ dnl regextype.c and regexprops.c are designed to be usable outside findutils,
+ dnl but findutils doesn't want to support all the regex types in gnulib,
+ dnl and wants to support an additional one (RE_SYNTAX_EMACS|RE_DOT_NEWLINE).
diff --git a/package/findutils/patches/patch-find_Makefile_am b/package/findutils/patches/patch-find_Makefile_am
new file mode 100644
index 000000000..a0fdf5855
--- /dev/null
+++ b/package/findutils/patches/patch-find_Makefile_am
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/find/Makefile.am	2009-05-16 17:17:01.000000000 +0200
++++ findutils-4.4.2/find/Makefile.am	2014-04-23 15:59:19.953700220 +0200
+@@ -26,7 +26,7 @@ endif
+ 
+ EXTRA_DIST = defs.h $(man_MANS)
+ INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
++LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @LIB_CLOCK_GETTIME@ @FINDLIBS@
+ man_MANS = find.1
+ SUBDIRS = . testsuite
+ 
diff --git a/package/findutils/patches/patch-locate_Makefile_am b/package/findutils/patches/patch-locate_Makefile_am
new file mode 100644
index 000000000..5ecedd78c
--- /dev/null
+++ b/package/findutils/patches/patch-locate_Makefile_am
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/locate/Makefile.am	2009-05-16 17:17:01.000000000 +0200
++++ findutils-4.4.2/locate/Makefile.am	2014-04-23 16:01:53.762138276 +0200
+@@ -19,7 +19,7 @@ code_SOURCES = code.c word_io.c
+ 
+ INCLUDES = -I$(top_srcdir)/lib -I../gnulib/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCATE_DB=\"$(LOCATE_DB)\" -DLOCALEDIR=\"$(localedir)\"
+ 
+-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
++LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a
+ 
+ $(PROGRAMS) $(LIBPROGRAMS): ../lib/libfind.a ../gnulib/lib/libgnulib.a
+ 
diff --git a/package/findutils/patches/patch-xargs_Makefile_am b/package/findutils/patches/patch-xargs_Makefile_am
new file mode 100644
index 000000000..0cff32335
--- /dev/null
+++ b/package/findutils/patches/patch-xargs_Makefile_am
@@ -0,0 +1,11 @@
+--- findutils-4.4.2.orig/xargs/Makefile.am	2009-05-16 17:17:01.000000000 +0200
++++ findutils-4.4.2/xargs/Makefile.am	2014-04-23 16:00:55.249971596 +0200
+@@ -3,7 +3,7 @@ localedir = $(datadir)/locale
+ bin_PROGRAMS = xargs
+ man_MANS = xargs.1
+ INCLUDES = -I.. -I../gnulib/lib -I$(top_srcdir)/gnulib/lib -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
++LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a
+ EXTRA_DIST = $(man_MANS)
+ SUBDIRS = . testsuite
+