[commit: base] master: Don't try to detect iconv or libcharset if we are on Windows (b52d685)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b52d6856a99dd98a8b5428c6d4327107d140d107

>---------------------------------------------------------------

commit b52d6856a99dd98a8b5428c6d4327107d140d107
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Sep 25 16:20:35 2011 +0100

    Don't try to detect iconv or libcharset if we are on Windows
    
    We don't use iconv or libcharset on Windows, but if configure finds
    them then it can cause problems. So we don't even try looking if
    we are on Windows.
    
    See http://www.haskell.org/pipermail/cvs-ghc/2011-September/065980.html
    
    Patch from Bill Tutt.

>---------------------------------------------------------------

 configure.ac |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1db0c26..071e42a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,13 @@ FP_CHECK_CONSTS([SIGINT], [
 dnl ** can we open files in binary mode?
 FP_CHECK_CONST([O_BINARY], [#include <fcntl.h>], [0])
 
+# We don't use iconv or libcharset on Windows, but if configure finds
+# them then it can cause problems. So we don't even try looking if
+# we are on Windows.
+# See http://www.haskell.org/pipermail/cvs-ghc/2011-September/065980.html
+if test "$WINDOWS" = "NO"
+then
+
 # We can't just use AC_SEARCH_LIBS for this, as on OpenBSD the iconv.h
 # header needs to be included as iconv_open is #define'd to something
 # else. We therefore use our own FP_SEARCH_LIBS_PROTO, which allows us
@@ -152,10 +159,7 @@ FP_SEARCH_LIBS_PROTO(iconv,
                       iconv_close(cd);],
                      iconv,
                      [EXTRA_LIBS="$EXTRA_LIBS $ac_lib"],
-                     [if test "$WINDOWS" = "NO"
-                      then
-                          AC_MSG_ERROR([iconv is required on non-Windows platforms])
-                      fi])
+                     [AC_MSG_ERROR([iconv is required on non-Windows platforms])])
 
 # If possible, we use libcharset instead of nl_langinfo(CODESET) to
 # determine the current locale's character encoding.
@@ -167,6 +171,8 @@ FP_SEARCH_LIBS_PROTO(
     [AC_DEFINE([HAVE_LIBCHARSET], [1], [Define to 1 if you have libcharset.])
      EXTRA_LIBS="$EXTRA_LIBS $ac_lib"])
 
+fi
+
 # Hack - md5.h needs HsFFI.h.  Is there a better way to do this?
 CFLAGS="-I../../includes $CFLAGS"
 AC_CHECK_SIZEOF([struct MD5Context], ,[#include "include/md5.h"])