Fix icu linking by requesting the library searchpath from icu-config
This is not ideal as we don't like -L/usr/lib in our linker line. But this is only relevant to environments that don't have pkgconfig files for ICU... https://github.com/behdad/harfbuzz/pull/2
This commit is contained in:
parent
03adf38b22
commit
00b93f6610
|
@ -177,7 +177,7 @@ if test "$have_icu" != "true"; then
|
||||||
# necessarily want, like debugging and optimization flags
|
# necessarily want, like debugging and optimization flags
|
||||||
# See man (1) icu-config for more info.
|
# See man (1) icu-config for more info.
|
||||||
ICU_CFLAGS=`$ICU_CONFIG --cppflags`
|
ICU_CFLAGS=`$ICU_CONFIG --cppflags`
|
||||||
ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly`
|
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly`
|
||||||
AC_SUBST(ICU_CFLAGS)
|
AC_SUBST(ICU_CFLAGS)
|
||||||
AC_SUBST(ICU_LIBS)
|
AC_SUBST(ICU_LIBS)
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
|
@ -205,7 +205,7 @@ if test "$have_icu_le" != "true"; then
|
||||||
# necessarily want, like debugging and optimization flags
|
# necessarily want, like debugging and optimization flags
|
||||||
# See man (1) icu-config for more info.
|
# See man (1) icu-config for more info.
|
||||||
ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
|
ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
|
||||||
ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout`
|
ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-libsonly --ldflags-layout`
|
||||||
AC_SUBST(ICU_LE_CFLAGS)
|
AC_SUBST(ICU_LE_CFLAGS)
|
||||||
AC_SUBST(ICU_LE_LIBS)
|
AC_SUBST(ICU_LE_LIBS)
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
|
|
Loading…
Reference in New Issue