From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Aug 2023 16:37:23 +0000 (-0700)
Subject: Merge branch 'ah/autoconf-fixes'
X-Git-Tag: v2.42.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99acb0fa54775a383cab70a6e662e45180dee3f0;p=thirdparty%2Fgit.git

Merge branch 'ah/autoconf-fixes'

"./configure --with-expat=no" did not work as a way to refuse use
of the expat library on a system with the library installed, which
has been corrected.

* ah/autoconf-fixes:
  configure.ac: always save NO_ICONV to config.status
  configure.ac: don't overwrite NO_CURL option
  configure.ac: don't overwrite NO_EXPAT option
---

99acb0fa54775a383cab70a6e662e45180dee3f0