From 6dbb9e070d5332ac99d881a07346e5e8fba1bb1a Mon Sep 17 00:00:00 2001
From: axel <axel@liljencrantz.se>
Date: Mon, 23 Feb 2009 05:16:49 +1000
Subject: [PATCH] Hopefully make iconv detection work on OS X with non-gnu
 iconv implementation

darcs-hash:20090222191649-ac50b-4f7010fdbf662b71cb7c4c99d2ae6e00c7cccb83.gz
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 600e52b5c..720c5daea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,9 @@ if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
+# Check for libiconv_open if we can't find iconv_open. Silly OS X does
+# weird macro magic for the sole purpose of amusing me.
+AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
 
 LIBS_FISH=$LIBS
 LIBS=$LIBS_COMMON