Message ID | c08bf880c77b7c43256a275e1102308a829d0ee8.1584516715.git.congdanhqx@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | configure: respect --without-<package> flags | expand |
On 2020-03-18 at 07:38:02, Đoàn Trần Công Danh wrote: > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> > --- > configure.ac | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 7468eb6bc8..20a11e1f32 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -544,9 +544,15 @@ GIT_STASH_FLAGS($OPENSSLDIR) > > AC_CHECK_LIB([crypto], [SHA1_Init], > [NEEDS_SSL_WITH_CRYPTO=], > -[AC_CHECK_LIB([ssl], [SHA1_Init], > - [NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=], > - [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) > +[ > +if "x$NO_OPENSSL" = xYesPlease; then > + AC_MSG_ERROR([Disabled OpenSSL is required for SHA1]) I don't see this in the original. Wouldn't we want to fall back to the default in this case, which would be SHA1DC?
On 2020-03-18 11:22:13+0000, "brian m. carlson" <sandals@crustytoothpaste.net> wrote: > On 2020-03-18 at 07:38:02, Đoàn Trần Công Danh wrote: > > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> > > --- > > configure.ac | 12 +++++++++--- > > 1 file changed, 9 insertions(+), 3 deletions(-) > > > > diff --git a/configure.ac b/configure.ac > > index 7468eb6bc8..20a11e1f32 100644 > > --- a/configure.ac > > +++ b/configure.ac > > @@ -544,9 +544,15 @@ GIT_STASH_FLAGS($OPENSSLDIR) > > > > AC_CHECK_LIB([crypto], [SHA1_Init], > > [NEEDS_SSL_WITH_CRYPTO=], > > -[AC_CHECK_LIB([ssl], [SHA1_Init], > > - [NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=], > > - [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) > > +[ > > +if "x$NO_OPENSSL" = xYesPlease; then > > + AC_MSG_ERROR([Disabled OpenSSL is required for SHA1]) > > I don't see this in the original. Wouldn't we want to fall back to the > default in this case, which would be SHA1DC? This block of code will be run into in macOS only. Really, I wasn't sure what should be done in this case (I mentioned in the cover letter). Should we set: NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease in this case instead?
diff --git a/configure.ac b/configure.ac index 7468eb6bc8..20a11e1f32 100644 --- a/configure.ac +++ b/configure.ac @@ -544,9 +544,15 @@ GIT_STASH_FLAGS($OPENSSLDIR) AC_CHECK_LIB([crypto], [SHA1_Init], [NEEDS_SSL_WITH_CRYPTO=], -[AC_CHECK_LIB([ssl], [SHA1_Init], - [NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=], - [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) +[ +if "x$NO_OPENSSL" = xYesPlease; then + AC_MSG_ERROR([Disabled OpenSSL is required for SHA1]) +else + AC_CHECK_LIB([ssl], [SHA1_Init], + [NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=], + [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease]) +fi +]) GIT_UNSTASH_FLAGS($OPENSSLDIR)
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- configure.ac | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)