mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Don't check if iconv is enabled before checking if its argument needs to be const as it's a required dep which is always enabled

Browse source 
Originally committed to SVN as r6075.
This commit is contained in:
Thomas Goyne 2011-12-22 21:21:12 +00:00
parent 848f123a98
commit f430d02659
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/configure.in
View file

@ -424,9 +424,7 @@ if test "$agi_cv_with_iconv" = "no" ; then
AC_MSG_FAILURE([Please install a working iconv library.]) AC_MSG_FAILURE([Please install a working iconv library.])
fi fi
if test "$agi_cv_with_iconv" = "yes"; then AC_AGI_COMPILE([iconv (const)], [iconv_const], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
AC_AGI_COMPILE([iconv (const)], [iconv_const], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[
#include <iconv.h> #include <iconv.h>
int main(void) { int main(void) {
iconv_t cd = iconv_open("UTF-16", "UTF-8"); iconv_t cd = iconv_open("UTF-16", "UTF-8");
@ -437,9 +435,8 @@ int main(void) {
return 0; return 0;
} ]) } ])
if test "$agi_cv_with_iconv_const" = "yes"; then if test "$agi_cv_with_iconv_const" = "yes"; then
AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if your version if iconv is const (annoying!)]) AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if iconv expects the in argument to be const])
fi
fi fi