From 0f196ca1f992cc8c45653d7c7f3b3642b95e847a Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 29 Mar 2008 23:09:55 +0000 Subject: [PATCH] Add missing $ to ICONV_CFLAGS/ICONV_LDFLAGS, also change CFLAGS tp CPPCFLAGS for the header check. (this fixes the libass build) Originally committed to SVN as r2153. --- configure.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 516e30b9e..767e4802f 100644 --- a/configure.in +++ b/configure.in @@ -392,18 +392,18 @@ AC_ARG_ENABLE(libass, [ --disable-libass disable libass support (default AC_ARG_VAR([ICONV_CFLAGS], [CFLAGS to use for iconv (default: CPPFLAGS)]) AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: LDFLAGS -liconv)]) -if test -z "ICONV_LDFLAGS"; then +if test -z "$ICONV_LDFLAGS"; then ICONV_LDFLAGS="$LDFLAGS -liconv"; fi -if test -z "ICONV_CFLAGS"; then +if test -z "$ICONV_CFLAGS"; then ICONV_CFLAGS="$CPPFLAGS"; fi if test "$enable_libass" != "no"; then aegisub_save_CPPFLAGS="$CPPFLAGS" - CFLAGS="$ICONV_CFLAGS" + CPPFLAGS="$ICONV_CFLAGS" AC_CHECK_HEADER(iconv.h, [ICONV_CFLAGS="$ICONV_CFLAGS"; with_iconv="yes"], with_iconv="no") CPPFLAGS="$aegisub_save_CPPFLAGS"