diff options
Diffstat (limited to 'third_party/git/configure.ac')
| -rw-r--r-- | third_party/git/configure.ac | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/third_party/git/configure.ac b/third_party/git/configure.ac index 66aedb9288..a43b476402 100644 --- a/third_party/git/configure.ac +++ b/third_party/git/configure.ac @@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH], # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT) # ----------------------------------------------------- -# Set VAR to the value specified by --with-WITHNAME. +# Set VAR to the value specied by --with-WITHNAME. # No verification of arguments is performed, but warnings are issued # if either 'yes' or 'no' is specified. # HELP_TEXT is presented when --help is called. @@ -844,61 +844,12 @@ AC_MSG_CHECKING([for old iconv()]) AC_COMPILE_IFELSE([OLDICONVTEST_SRC], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_OLD_ICONV, 1) OLD_ICONV=UnfortunatelyYes]) GIT_UNSTASH_FLAGS($ICONVDIR) GIT_CONF_SUBST([OLD_ICONV]) -# -# Define ICONV_OMITS_BOM if you are on a system which -# iconv omits bom for utf-{16,32} -if test -z "$NO_ICONV"; then -AC_CACHE_CHECK([whether iconv omits bom for utf-16 and utf-32], - [ac_cv_iconv_omits_bom], -[ -old_LIBS="$LIBS" -if test -n "$NEEDS_LIBICONV"; then - LIBS="$LIBS -liconv" -fi - -AC_RUN_IFELSE( - [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT - #include <iconv.h> - #ifdef HAVE_OLD_ICONV - typedef const char *iconv_ibp; - #else - typedef char *iconv_ibp; - #endif - ], - [[ - int v; - iconv_t conv; - char in[] = "a"; iconv_ibp pin = in; - char out[20] = ""; char *pout = out; - size_t isz = sizeof in; - size_t osz = sizeof out; - - conv = iconv_open("UTF-16", "UTF-8"); - iconv(conv, &pin, &isz, &pout, &osz); - iconv_close(conv); - v = (unsigned char)(out[0]) + (unsigned char)(out[1]); - return v != 0xfe + 0xff; - ]])], - [ac_cv_iconv_omits_bom=no], - [ac_cv_iconv_omits_bom=yes]) - -LIBS="$old_LIBS" -]) -if test "x$ac_cv_iconv_omits_bom" = xyes; then - ICONV_OMITS_BOM=Yes -else - ICONV_OMITS_BOM= -fi -GIT_CONF_SUBST([ICONV_OMITS_BOM]) -fi - ## Checks for typedefs, structures, and compiler characteristics. AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) # |