anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 18:43:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not setup building of 3rdparty/libiconv

Browse Source 
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.
This commit is contained in:
Jean-Marc Lasgouttes 2015-12-30 21:44:59 +01:00
parent 42f1f58418
commit a69d649626
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3rdparty/libiconv/Makefile.am vendored
View File

@ -3,7 +3,8 @@ include $(top_srcdir)/config/common.am
# This is prepared for compilation, but currently only used for packaging, # This is prepared for compilation, but currently only used for packaging,
# because configure support for compilation is still missing. # because configure support for compilation is still missing.
noinst_LIBRARIES = liblyxiconv.a # We do not build right now
#noinst_LIBRARIES = liblyxiconv.a
EXTRA_DIST = \ EXTRA_DIST = \
CMakeLists.txt \ CMakeLists.txt \
@ -32,7 +33,11 @@ EXTRA_DIST = \
1.14/libcharset/lib/ref-add.sin \ 1.14/libcharset/lib/ref-add.sin \
1.14/libcharset/lib/ref-del.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/include/export.h \
1.14/lib/aliases2.h \ 1.14/lib/aliases2.h \
1.14/lib/aliases_aix.h \ 1.14/lib/aliases_aix.h \