iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Make ICONV_CFLAGS/ICONV_LDFLAGS override the default flags like everything else. 

(required for OS X)

Originally committed to SVN as r2142.
This commit is contained in:
Amar Takhar 2008-03-25 20:03:26 +00:00
parent 84de9ed34e
commit bd836309be
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.in
View File

@ -366,19 +366,26 @@ 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)]) 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="-liconv"; ICONV_LDFLAGS="$LDFLAGS -liconv";
fi fi
if test -z "ICONV_CFLAGS"; then
ICONV_CFLAGS="$CPPFLAGS";
fi
if test "$enable_libass" != "no"; then if test "$enable_libass" != "no"; then
aegisub_save_CPPFLAGS="$CPPFLAGS"
CFLAGS="$ICONV_CFLAGS"
AC_CHECK_HEADER(iconv.h, [ICONV_CFLAGS="$ICONV_CFLAGS"; with_iconv="yes"], with_iconv="no") AC_CHECK_HEADER(iconv.h, [ICONV_CFLAGS="$ICONV_CFLAGS"; with_iconv="yes"], with_iconv="no")
CPPFLAGS="$aegisub_save_CPPFLAGS"
aegisub_save_LDFLAGS="$LDFLAGS" aegisub_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $ICONV_LDFLAGS" LDFLAGS="$ICONV_LDFLAGS"
AC_CHECK_LIB([iconv], [iconv_open],[ICONV_LDFLAGS="$ICONV_LIBS"; with_iconv="yes"], with_iconv="no") AC_CHECK_LIB([iconv], [iconv_open],[ICONV_LDFLAGS="$ICONV_LIBS"; with_iconv="yes"], with_iconv="no")
LDFLAGS="$aegisub_save_LDFLAGS" LDFLAGS="$aegisub_save_LDFLAGS"
if test "$with_iconv" = "yes"; then if test "$with_iconv" = "yes"; then
LIBASS_LIBS="-L../libass -lass_aegisub" LIBASS_LIBS="-L../libass -lass_aegisub"
LIBASS_CFLAGS="-I../libass" LIBASS_CFLAGS="-I../libass"