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.
This commit is contained in:
Amar Takhar 2008-03-29 23:09:55 +00:00
parent 0fb1fee1a8
commit 0f196ca1f9

View file

@ -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"