From e1a59d307e4384484f1721abe40d243b6472de34 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 9 Jan 2011 01:37:34 +0000
Subject: [PATCH]  * 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.
---
 aegisub/configure.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/aegisub/configure.in b/aegisub/configure.in
index 26bdc1b41..8b89a097b 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -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