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

Use proper library path and libs for ICU

This commit is contained in:
Dagobert Michelsen 2016-08-21 14:14:18 +02:00 committed by Tim Rühsen
parent 126d2dca9c
commit 7983f86820
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -168,7 +168,7 @@ if test "$enable_runtime" = "libicu" -o "$enable_builtin" = "libicu"; then
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[[#include <unicode/ustring.h>]], [[#include <unicode/ustring.h>]],
[[u_strToUTF8(NULL, 0, NULL, NULL, 0, NULL);]])], [[u_strToUTF8(NULL, 0, NULL, NULL, 0, NULL);]])],
[HAVE_LIBICU=yes; AC_MSG_RESULT([yes])], [HAVE_LIBICU=yes; LIBICU_LIBS="-licuuc"; AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no]); AC_MSG_ERROR(You requested libicu but it is not installed.)]) [AC_MSG_RESULT([no]); AC_MSG_ERROR(You requested libicu but it is not installed.)])
LIBS=$OLDLIBS LIBS=$OLDLIBS
]) ])

4
src/Makefile.am
View File

@ -11,7 +11,7 @@ libpsl_la_CPPFLAGS = -I$(top_srcdir)/include
# include ABI version information # include ABI version information
libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION) libpsl_la_LDFLAGS = -version-info $(LIBPSL_SO_VERSION)
if WITH_LIBICU if WITH_LIBICU
libpsl_la_LDFLAGS += -licuuc libpsl_la_LDFLAGS += $(LIBICU_LIBS)
endif endif
if WITH_LIBIDN2 if WITH_LIBIDN2
libpsl_la_LDFLAGS += -lidn2 -lunistring libpsl_la_LDFLAGS += -lidn2 -lunistring
@ -24,7 +24,7 @@ noinst_PROGRAMS = psl2c
psl2c_SOURCES = psl2c.c lookup_string_in_fixed_set.c psl2c_SOURCES = psl2c.c lookup_string_in_fixed_set.c
psl2c_CPPFLAGS = -I$(top_srcdir)/include -DMAKE_DAFSA=\"$(top_srcdir)/src/psl-make-dafsa\" psl2c_CPPFLAGS = -I$(top_srcdir)/include -DMAKE_DAFSA=\"$(top_srcdir)/src/psl-make-dafsa\"
if BUILTIN_GENERATOR_LIBICU if BUILTIN_GENERATOR_LIBICU
psl2c_LDADD = -licuuc psl2c_LDADD = $(LIBICU_LIBS)
endif endif
if BUILTIN_GENERATOR_LIBIDN2 if BUILTIN_GENERATOR_LIBIDN2
psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring psl2c_LDADD = @LTLIBICONV@ -lidn2 -lunistring