walkero
/
libpsl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

add iconv Solaris compatibility

This commit is contained in:
Tim Rühsen 2015-01-23 16:13:19 +01:00
parent 910c4b37b6
commit 58a4f6c028
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -174,6 +174,10 @@ if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then
LIBS=$OLDLIBS LIBS=$OLDLIBS
fi fi
# AM_ICONV sets @LIBICONV@ and @LTLIBICONV@ for use in Makefile.am
# do not use AM_ICONV conditionally
AM_ICONV
AM_CONDITIONAL([WITH_LIBICU], test "x$enable_runtime" = "xlibicu") AM_CONDITIONAL([WITH_LIBICU], test "x$enable_runtime" = "xlibicu")
AM_CONDITIONAL([WITH_LIBIDN2], test "x$enable_runtime" = "xlibidn2") AM_CONDITIONAL([WITH_LIBIDN2], test "x$enable_runtime" = "xlibidn2")
AM_CONDITIONAL([WITH_LIBIDN], test "x$enable_runtime" = "xlibidn") AM_CONDITIONAL([WITH_LIBIDN], test "x$enable_runtime" = "xlibidn")

4
src/Makefile.am
View File

@ -27,10 +27,10 @@ if BUILTIN_GENERATOR_LIBICU
psl2c_LDADD = -licuuc psl2c_LDADD = -licuuc
endif endif
if BUILTIN_GENERATOR_LIBIDN2 if BUILTIN_GENERATOR_LIBIDN2
psl2c_LDADD = -lidn2 -lunistring psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring
endif endif
if BUILTIN_GENERATOR_LIBIDN if BUILTIN_GENERATOR_LIBIDN
psl2c_LDADD = -lidn -lunistring psl2c_LDADD = @LTLIBICONV@ -lidn -lunistring
endif endif
# Build rule for suffix.c # Build rule for suffix.c