libidn: remove private libtool copy, don't build docs, translations and examples

SVN-Revision: 24369

diff --git a/libs/libidn/Makefile b/libs/libidn/Makefile
index 6f143ed18324bd705268dc46db37fbddda8184f3..da0043f89b2b987c7fe07808e840c0a81883157f 100644 (file)
--- a/libs/libidn/Makefile
+++ b/libs/libidn/Makefile
@@ -16,6 +16,8 @@ PKG_SOURCE_URL:=@GNU/libidn
 PKG_MD5SUM:=66f115347439f56386f37a3ad92c1da2
 
 PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=GNUmakefile aclocal.m4 m4/libtool.m4 build-aux/ltmain.sh
+
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/libs/libidn/patches/001-remove-libtool.patch b/libs/libidn/patches/001-remove-libtool.patch
new file mode 100644 (file)
index 0000000..942094d
--- /dev/null
+++ b/libs/libidn/patches/001-remove-libtool.patch
@@ -0,0 +1,10 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1080,7 +1080,6 @@ m4_include([m4/intlmacosx.m4])
+ m4_include([m4/lib-ld.m4])
+ m4_include([m4/lib-link.m4])
+ m4_include([m4/lib-prefix.m4])
+-m4_include([m4/libtool.m4])
+ m4_include([m4/longlong.m4])
+ m4_include([m4/ltoptions.m4])
+ m4_include([m4/ltsugar.m4])

diff --git a/libs/libidn/patches/002-disable-po-docs-examples.patch b/libs/libidn/patches/002-disable-po-docs-examples.patch
new file mode 100644 (file)
index 0000000..817749e
--- /dev/null
+++ b/libs/libidn/patches/002-disable-po-docs-examples.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,7 +16,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples \
++SUBDIRS = gl lib/gl lib src \
+       java csharp
+ 
+ EXTRA_DIST = cfg.mk maint.mk .clcopying
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,8 +46,6 @@ gl_EARLY
+ AC_PROG_LIBTOOL
+ AM_MISSING_PROG(PERL, perl, $missing_dir)
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
+-AM_GNU_GETTEXT(external)
+-AM_GNU_GETTEXT_VERSION(0.17)
+ AM_ICONV
+ AM_PATH_LISPDIR
+