mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Move iconv out of the libass check block and under 'program features' (in

Browse source 
preperation for asa support which requires iconv as well.)

Originally committed to SVN as r2171.
This commit is contained in:
Amar Takhar 2008-04-11 15:17:00 +00:00
parent 041820e259
commit b19daec0ae
1 changed files with 46 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
configure.in
View file

@ -169,8 +169,15 @@ AC_SUBST(OPENMP_CXXFLAGS)
############################## ##############################
# Program Support and Features # Program Support and Features
############################## ##############################
#################
## Wide Character
#################
AC_CHECK_HEADER([wchar.h],,[AC_MSG_FAILURE([aegisub requires wide character support])]) AC_CHECK_HEADER([wchar.h],,[AC_MSG_FAILURE([aegisub requires wide character support])])
#########
## OpenGL
#########
AX_CHECK_GL AX_CHECK_GL
if test ! "$GL_LIBS"; then if test ! "$GL_LIBS"; then
AC_MSG_FAILURE([aegisub requires GL support.]) AC_MSG_FAILURE([aegisub requires GL support.])
@ -188,6 +195,10 @@ if test "$agi_with_opengl" = "no"; then
AC_MSG_FAILURE([Please install a working OpenGL library.]) AC_MSG_FAILURE([Please install a working OpenGL library.])
fi fi
###########
## Freetype
###########
PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.7.0, PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.7.0,
AC_DEFINE(WITH_FREETYPE2, 1, [Enable FreeType 2 support.]), AC_DEFINE(WITH_FREETYPE2, 1, [Enable FreeType 2 support.]),
[AC_MSG_FAILURE([aegisub requires >= FreeType2 2.1.9])]) [AC_MSG_FAILURE([aegisub requires >= FreeType2 2.1.9])])
@ -206,6 +217,9 @@ if test "$agi_with_freetype" = "no"; then
fi fi
#############
## Fontconfig
#############
PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.4, PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.4,
AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.]), AC_DEFINE(WITH_FONTCONFIG, 1, [Enable FontConfig support.]),
[AC_MSG_FAILURE([aegisub requires >= fontconfig >= 2.4])]) [AC_MSG_FAILURE([aegisub requires >= fontconfig >= 2.4])])
@ -227,6 +241,38 @@ if test "$agi_with_fontconfig" = "no"; then
fi fi
########
## iconv
########
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 "$build_linux" = "yes"; then
ICONV_LDFLAGS="$LDFLAGS"
else
ICONV_LDFLAGS="$LDFLAGS -liconv";
fi
fi
if test -z "$ICONV_CFLAGS"; then
ICONV_CFLAGS="$CPPFLAGS";
fi
AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
#include <iconv.h>
int main(void) {
iconv_t ic;
ic = iconv_open ("UTF-8", "UTF-8");
if (!ic) return 1;
return 0;
} ])
AC_SUBST(ICONV_LDFLAGS)
AC_SUBST(ICONV_CFLAGS)
################# #################
# Audio Providers # Audio Providers
################# #################
@ -398,31 +444,7 @@ AM_CONDITIONAL([HAVE_FFMPEG], [test "$with_ffmpeg" != "no"])
AC_ARG_ENABLE(libass, [ --disable-libass disable libass support (default=enabled)],libass_disabled="(disabled)") AC_ARG_ENABLE(libass, [ --disable-libass disable libass support (default=enabled)],libass_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: LDFLAGS -liconv)])
if test -z "$ICONV_LDFLAGS"; then
if "$build_linux" = "yes"; then
ICONV_LDFLAGS="$LDFLAGS"
else
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
AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
#include <iconv.h>
int main(void) {
iconv_t ic;
ic = iconv_open ("UTF-8", "UTF-8");
if (!ic) return 1;
return 0;
} ])
if test "$agi_with_iconv" = "yes"; then if test "$agi_with_iconv" = "yes"; then
LIBASS_LIBS="-L../libass -lass_aegisub" LIBASS_LIBS="-L../libass -lass_aegisub"
LIBASS_CFLAGS="-I../libass" LIBASS_CFLAGS="-I../libass"
@ -439,8 +461,6 @@ else
with_libass="no" with_libass="no"
fi fi
AC_SUBST(ICONV_LDFLAGS)
AC_SUBST(ICONV_CFLAGS)
AC_SUBST(LIBASS_LIBS) AC_SUBST(LIBASS_LIBS)
AC_SUBST(LIBASS_CFLAGS) AC_SUBST(LIBASS_CFLAGS)
AM_CONDITIONAL([WITH_LIBASS], [test "$with_libass" = "yes"]) AM_CONDITIONAL([WITH_LIBASS], [test "$with_libass" = "yes"])