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

* Fix iconv LDFLAGS for *bsd* 

* Minor style fix for $GL_LIBS test.
 * Fail if iconv isn't found.
 * Fix variable name for the ! subtitle-found case which was over-writing the audio variable.

Originally committed to SVN as r5154.
This commit is contained in:
Amar Takhar 2011-01-09 01:37:34 +00:00
parent 73bd4f2398
commit e1a59d307e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aegisub/configure.in
View File

@ -73,6 +73,7 @@ case "$target_or_host" in
*-*-*bsd*)
build_bsd="yes"
ICONV_CFLAGS="-I/usr/local/include"
ICONV_LDFLAGS="-L/usr/local/lib -liconv"
;;
*)
@ -364,7 +365,7 @@ AC_CHECK_HEADER([wchar.h],,[AC_MSG_FAILURE([aegisub requires wide character supp
## OpenGL
#########
AX_CHECK_GL
if test ! "$GL_LIBS"; then
if test -z "$GL_LIBS"; then
AC_MSG_FAILURE([aegisub requires GL support.])
fi
AC_SUBST(GL_CFLAGS)
@ -472,7 +473,7 @@ if test -z "$ICONV_CFLAGS"; then
ICONV_CFLAGS="$CPPFLAGS";
fi
AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
AC_AGI_COMPILE([iconv], [iconv], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
#include <iconv.h>
int main(void) {
iconv_t ic;
@ -484,6 +485,10 @@ int main(void) {
AC_SUBST(ICONV_LDFLAGS)
AC_SUBST(ICONV_CFLAGS)
if test "$agi_cv_with_iconv" = "no" ; then
AC_MSG_FAILURE([Please install a working iconv library.])
fi
if test "$agi_cv_with_iconv" = "yes"; then
AC_AGI_COMPILE([iconv (const)], [iconv_const], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
@ -1225,7 +1230,7 @@ if test -z "$default_provider_audio"; then
fi
if test -z "$default_provider_subtitle"; then
default_provider_audio="NONE"
default_provider_subtitle="NONE"
fi
if test -z "$default_player_audio"; then