Disable compiling polyfills in not MSYS2 env

This commit is contained in:
Naoki Ikeguchi 2022-01-14 00:33:18 +09:00 committed by Andrew Gaul
parent 807ea52ba7
commit b2c659c0a6
2 changed files with 15 additions and 5 deletions

View File

@ -232,6 +232,9 @@ AM_CONDITIONAL([USE_SSL_GNUTLS], [test "$auth_lib" = gnutls -o "$auth_lib" = net
AM_CONDITIONAL([USE_GNUTLS_NETTLE], [test "$auth_lib" = nettle])
AM_CONDITIONAL([USE_SSL_NSS], [test "$auth_lib" = nss])
AC_CANONICAL_HOST
AM_CONDITIONAL([MSYS], [test "$host_os" = "msys"])
dnl ----------------------------------------------
dnl check functions
dnl ----------------------------------------------

View File

@ -53,9 +53,7 @@ s3fs_SOURCES = \
addhead.cpp \
sighandlers.cpp \
autolock.cpp \
common_auth.cpp \
strptime.cpp \
strcasestr.cpp
common_auth.cpp
if USE_SSL_OPENSSL
s3fs_SOURCES += openssl_auth.cpp
endif
@ -65,6 +63,9 @@ endif
if USE_SSL_NSS
s3fs_SOURCES += nss_auth.cpp
endif
if MSYS
s3fs_SOURCES += strptime.cpp strcasestr.cpp
endif
s3fs_LDADD = $(DEPS_LIBS)
@ -73,7 +74,7 @@ noinst_PROGRAMS = \
test_page_list \
test_string_util
test_curl_util_SOURCES = common_auth.cpp curl_util.cpp string_util.cpp test_curl_util.cpp s3fs_global.cpp s3fs_logger.cpp strptime.cpp strcasestr.cpp
test_curl_util_SOURCES = common_auth.cpp curl_util.cpp string_util.cpp test_curl_util.cpp s3fs_global.cpp s3fs_logger.cpp
if USE_SSL_OPENSSL
test_curl_util_SOURCES += openssl_auth.cpp
endif
@ -83,6 +84,9 @@ endif
if USE_SSL_NSS
test_curl_util_SOURCES += nss_auth.cpp
endif
if MSYS
test_curl_util_SOURCES += strptime.cpp strcasestr.cpp
endif
test_curl_util_LDADD = $(DEPS_LIBS)
@ -94,7 +98,10 @@ test_page_list_SOURCES = \
test_page_list.cpp \
strptime.cpp
test_string_util_SOURCES = string_util.cpp test_string_util.cpp s3fs_logger.cpp strptime.cpp
test_string_util_SOURCES = string_util.cpp test_string_util.cpp s3fs_logger.cpp
if MSYS
test_string_util_SOURCES += strptime.cpp
endif
TESTS = \
test_curl_util \