From f430d026592b27e57a347198cffbb7bbbbe8b391 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Dec 2011 21:21:12 +0000 Subject: [PATCH] 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 Originally committed to SVN as r6075. --- aegisub/configure.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/aegisub/configure.in b/aegisub/configure.in index a1b36368a..808453315 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -424,9 +424,7 @@ 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],[ +AC_AGI_COMPILE([iconv (const)], [iconv_const], [$ICONV_CFLAGS], [$ICONV_LDFLAGS],[ #include int main(void) { iconv_t cd = iconv_open("UTF-16", "UTF-8"); @@ -437,9 +435,8 @@ int main(void) { return 0; } ]) - if test "$agi_cv_with_iconv_const" = "yes"; then - AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if your version if iconv is const (annoying!)]) - fi +if test "$agi_cv_with_iconv_const" = "yes"; then + AC_DEFINE(AGI_ICONV_CONST, 1, [Enable if iconv expects the in argument to be const]) fi