Skip to content

Commit de000c6

Browse files
Fixup pyexpat detection
1 parent 1a8d41e commit de000c6

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

configure

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3735,6 +3735,11 @@ AS_VAR_IF([with_system_expat], [yes], [
37353735
AC_SUBST([LIBEXPAT_CFLAGS])
37363736
AC_SUBST([LIBEXPAT_INTERNAL])
37373737

3738+
AS_VAR_IF(
3739+
[ac_cv_header_sys_time_h], [yes],
3740+
[AS_VAR_SET([have_libexpat], [yes])]
3741+
)
3742+
37383743
dnl detect libffi
37393744
have_libffi=missing
37403745
AS_VAR_IF([ac_sys_system], [Darwin], [
@@ -7194,9 +7199,11 @@ PY_STDLIB_MOD([syslog], [], [test "$ac_cv_header_syslog_h" = yes])
71947199
PY_STDLIB_MOD([termios], [], [test "$ac_cv_header_termios_h" = yes])
71957200

71967201
dnl _elementtree loads libexpat via CAPI hook in pyexpat
7197-
PY_STDLIB_MOD([pyexpat], [], [], [$LIBEXPAT_CFLAGS], [$LIBEXPAT_LDFLAGS])
7202+
PY_STDLIB_MOD([pyexpat],
7203+
[], [test "$have_libexpat" = "yes"],
7204+
[$LIBEXPAT_CFLAGS], [$LIBEXPAT_LDFLAGS])
71987205
PY_STDLIB_MOD([_elementtree],
7199-
[], [test "$ac_cv_header_sys_time_h" = "yes"],
7206+
[], [test "$have_libexpat" = "yes"],
72007207
[$LIBEXPAT_CFLAGS], [])
72017208
PY_STDLIB_MOD_SIMPLE([_codecs_cn])
72027209
PY_STDLIB_MOD_SIMPLE([_codecs_hk])

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy