mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-21 17:51:03 +00:00
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.
This commit is contained in:
parent
42f1f58418
commit
a69d649626
9
3rdparty/libiconv/Makefile.am
vendored
9
3rdparty/libiconv/Makefile.am
vendored
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user