Make all fish that use universal variables binaries include iconv

darcs-hash:20090203002620-ac50b-6be533cd1bf7dd043d96547b2c2f3ab4cda30e10.gz
This commit is contained in:
axel 2009-02-03 10:26:20 +10:00
parent 7e1ac2d806
commit 41015691db

View file

@ -519,8 +519,8 @@ if test x$local_gettext != xno; then
AC_SEARCH_LIBS( gettext, intl,,) AC_SEARCH_LIBS( gettext, intl,,)
fi 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=$LIBS LIBS_FISH=$LIBS
LIBS=$LIBS_COMMON LIBS=$LIBS_COMMON
@ -545,6 +545,7 @@ LIBS="$LIBS_SHARED"
if test x$local_gettext != xno; then if test x$local_gettext != xno; then
AC_SEARCH_LIBS( gettext, intl,,) AC_SEARCH_LIBS( gettext, intl,,)
fi fi
AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
LIBS_FISH_PAGER=$LIBS LIBS_FISH_PAGER=$LIBS
LIBS=$LIBS_COMMON LIBS=$LIBS_COMMON
@ -557,6 +558,7 @@ LIBS="$LIBS_SHARED"
if test x$local_gettext != xno; then if test x$local_gettext != xno; then
AC_SEARCH_LIBS( gettext, intl,,) AC_SEARCH_LIBS( gettext, intl,,)
fi fi
AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
LIBS_FISHD=$LIBS LIBS_FISHD=$LIBS
LIBS=$LIBS_COMMON LIBS=$LIBS_COMMON