diff --git a/configure.in b/configure.in index 2a7c3d882..ef11f9040 100644 --- a/configure.in +++ b/configure.in @@ -279,7 +279,7 @@ AC_ARG_WITH(libass, [ --without-libass disable libass (default=enable)], AC_ARG_ENABLE(libass, [ --disable-libass disable internal libass support (default=enabled)],libass_internal_disabled="(disabled)") AC_ARG_VAR([ICONV_CFLAGS], [CFLAGS to use for iconv (default: CPPFLAGS)]) -AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: -liconv)]) +AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: LDFLAGS -liconv)]) if test -z "ICONV_LDFLAGS"; then ICONV_LDFLAGS="-liconv"; @@ -289,7 +289,10 @@ if test "$with_libass" != "no"; then if test "$enable_libass" != "no"; then AC_CHECK_HEADER(iconv.h, [ICONV_CFLAGS="$ICONV_CFLAGS"; with_iconv="yes"], with_iconv="no") + aegisub_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $ICONV_LDFLAGS" AC_CHECK_LIB([iconv], [iconv_open],[ICONV_LDFLAGS="$ICONV_LIBS"; with_iconv="yes"], with_iconv="no") + LDFLAGS="$aegisub_save_LDFLAGS" if test "$with_iconv" = "yes"; then LIBASS_LIBS="-L../libass -lass_aegisub"