summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2018-10-09 13:22:01 +0200
committerTim Rühsen <tim.ruehsen@gmx.de>2018-10-09 15:40:48 +0200
commit5945dc00d20125c5d74354e0cd6250eb7ec61576 (patch)
tree977377869e00d690518d815e06ade40a0785cfe8
parent42cc349feba90ab37143937a9165d3d87a2a5927 (diff)
downloadgnutls-fix-makefile-on-solaris.tar.gz
Fix linking of libecore.a on Solarisfix-makefile-on-solaris
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rw-r--r--bootstrap.conf2
-rw-r--r--tests/suite/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index 3c9618b21f..32d64cd489 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -27,7 +27,7 @@ local_gl_dir=gl/override/
# Reproduce by: gnulib-tool --import --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lock-tests --avoid=lseek-tests --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files alloca byteswap c-ctype extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strndup strtok_r strverscmp sys_socket sys_stat time_r unistd vasprintf vsnprintf warnings
gnulib_modules="
-alloca byteswap c-ctype c-strcase extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strdup-posix strndup strtok_r strverscmp sys_socket sys_stat sys_types time_r unistd valgrind-tests vasprintf vsnprintf warnings
+alloca byteswap c-ctype c-strcase extensions func gendocs getline gettext-h gettimeofday hash-pjw-bare havelib iconv intprops lib-msvc-compat lib-symbol-versions maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in pmccabe2html read-file secure_getenv snprintf stdint strcase strdup-posix strndup strtok_r strverscmp sys_socket sys_stat sys_types time_r unistd valgrind-tests vasprintf vsnprintf warnings
"
unistring_modules="
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index f43fe90eee..c6c2de7fa7 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -38,7 +38,7 @@ AM_LDFLAGS = -no-install
LDADD = ../../lib/libgnutls.la \
../../gl/libgnu.la \
../libutils.la \
- $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB)
+ $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LTLIBICONV) $(LTLIBINTL)
prime_check_LDADD = $(LDADD) -lhogweed -lgmp