From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 30 Dec 2015 20:44:59 +0000 (+0100)
Subject: Do not setup building of 3rdparty/libiconv
X-Git-Tag: 2.2.0beta1~275
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a69d6496268f13101eaeebda6452f1bfd2dfec48;p=lyx.git

Do not setup building of 3rdparty/libiconv

This causes build problems with automake < 1.14 because two files have the same name. This only works well when using subdir-objects, which we only do after 1.14.

We do not want to build libiconv on target which support autotools anyway, but rely on a built-in one.

This fixes building on oldish ubuntu 12.04.
---

diff --git a/3rdparty/libiconv/Makefile.am b/3rdparty/libiconv/Makefile.am
index 2a516a57e9..d965f380f1 100644
--- a/3rdparty/libiconv/Makefile.am
+++ b/3rdparty/libiconv/Makefile.am
@@ -3,7 +3,8 @@ include $(top_srcdir)/config/common.am
 # This is prepared for compilation, but currently only used for packaging,
 # because configure support for compilation is still missing.
 
-noinst_LIBRARIES = liblyxiconv.a
+# We do not build right now
+#noinst_LIBRARIES = liblyxiconv.a
 
 EXTRA_DIST = \
 	CMakeLists.txt \
@@ -32,7 +33,11 @@ EXTRA_DIST = \
 	1.14/libcharset/lib/ref-add.sin \
 	1.14/libcharset/lib/ref-del.sin
 
-liblyxiconv_a_SOURCES = \
+# If/when we decide to build, this will do in liblyxiconv_a_SOURCES
+# But for now it confuses automake < 1.14, where we do not use subdir-objects.
+# The issue here is that there are two relocatable.c files, and they would
+# create the same .o file.
+EXTRA_DIST += \
 	1.14/include/export.h \
 	1.14/lib/aliases2.h \
 	1.14/lib/aliases_aix.h \