From 806ac9c5db2e4039f4b9b4da31c3effb0cd23184 Mon Sep 17 00:00:00 2001 From: Ben Hoskings Date: Tue, 14 Jul 2009 19:52:51 +1000 Subject: [PATCH] Commented libiconv configure checks to allow OS X builds. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7862b48..23b74fc 100644 --- a/configure.ac +++ b/configure.ac @@ -521,7 +521,7 @@ fi # 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])] )] ) +#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 @@ -547,7 +547,7 @@ LIBS="$LIBS_SHARED" 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])] ) +#AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) LIBS_FISH_PAGER=$LIBS LIBS=$LIBS_COMMON @@ -560,7 +560,7 @@ LIBS="$LIBS_SHARED" 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])] ) +#AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] ) LIBS_FISHD=$LIBS LIBS=$LIBS_COMMON