Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Henry <luhenry@microsoft.com>2018-03-29 00:05:55 +0300
committerGitHub <noreply@github.com>2018-03-29 00:05:55 +0300
commitff40ceff387e1b4a726a00a4e4d0e654afe1cd99 (patch)
tree7097c017a03b5275588ce995a0069bde3ef7b956 /support
parente3e1fe1c16f464108082fbd48ffed279e879bd41 (diff)
check for iconv only once (#7873)
It is enough to check for iconv dependencies once in the eglib/configure - just use the generated libtool library file to automatically add additional dependencies (if any). While here, make sue libeglib.a has libraries returned by LTLIBTOOL as a libtool dependency.
Diffstat (limited to 'support')
-rw-r--r--support/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/support/Makefile.am b/support/Makefile.am
index f34e7071305..c318c01902f 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -59,10 +59,10 @@ MPH_UNIX_SOURCE = \
if HOST_WIN32
MPH_SOURCE = $(MPH_C_SOURCE)
-MPH_LIBS = $(GLIB_LIBS) $(LIBICONV)
+MPH_LIBS = $(GLIB_LIBS)
else
MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
-MPH_LIBS = $(GLIB_LIBS) $(LIBICONV)
+MPH_LIBS = $(GLIB_LIBS)
endif
MINIZIP_SOURCE = \
@@ -125,7 +125,7 @@ libMonoSupportW_la_SOURCES = \
supportw.h
libMonoSupportW_la_LIBADD = \
- $(GLIB_LIBS) $(LIBICONV)
+ $(GLIB_LIBS)
#
# Use this target to refresh the values in map.[ch]