FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-34652 again: Remove lchmod from the default AC_CHECK_FUNCS list. … · python-emscripten/cpython@bed04b6 · GitHub

  1. python-emscripten
  2. cpython

Repository navigation

Commit bed04b6

Browse files
benjaminp
authored
bpo-34652 again: Remove lchmod from the default AC_CHECK_FUNCS list. (pythonGH-15758)
1 parent 4f0f9f0 commit bed04b6

3 files changed

Lines changed: 18 additions & 74 deletions

File tree

‎aclocal.m4‎

Lines changed: 3 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# PARTICULAR PURPOSE.
1313

1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
15-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
16-
# serial 11 (pkg-config-0.29.1)
17-
15+
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
16+
dnl serial 11 (pkg-config-0.29.1)
17+
dnl
1818
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1919
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
2020
dnl
@@ -288,73 +288,5 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
288288
AS_VAR_IF([$1], [""], [$5], [$4])dnl
289289
])dnl PKG_CHECK_VAR
290290

291-
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
292-
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
293-
dnl [DESCRIPTION], [DEFAULT])
294-
dnl ------------------------------------------
295-
dnl
296-
dnl Prepare a "--with-" configure option using the lowercase
297-
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
298-
dnl PKG_CHECK_MODULES in a single macro.
299-
AC_DEFUN([PKG_WITH_MODULES],
300-
[
301-
m4_pushdef([with_arg], m4_tolower([$1]))
302-
303-
m4_pushdef([description],
304-
[m4_default([$5], [build with ]with_arg[ support])])
305-
306-
m4_pushdef([def_arg], [m4_default([$6], [auto])])
307-
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
308-
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
309-
310-
m4_case(def_arg,
311-
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
312-
[m4_pushdef([with_without],[--with-]with_arg)])
313-
314-
AC_ARG_WITH(with_arg,
315-
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
316-
[AS_TR_SH([with_]with_arg)=def_arg])
317-
318-
AS_CASE([$AS_TR_SH([with_]with_arg)],
319-
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
320-
[auto],[PKG_CHECK_MODULES([$1],[$2],
321-
[m4_n([def_action_if_found]) $3],
322-
[m4_n([def_action_if_not_found]) $4])])
323-
324-
m4_popdef([with_arg])
325-
m4_popdef([description])
326-
m4_popdef([def_arg])
327-
328-
])dnl PKG_WITH_MODULES
329-
330-
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
331-
dnl [DESCRIPTION], [DEFAULT])
332-
dnl -----------------------------------------------
333-
dnl
334-
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
335-
dnl check._[VARIABLE-PREFIX] is exported as make variable.
336-
AC_DEFUN([PKG_HAVE_WITH_MODULES],
337-
[
338-
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
339-
340-
AM_CONDITIONAL([HAVE_][$1],
341-
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
342-
])dnl PKG_HAVE_WITH_MODULES
343-
344-
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
345-
dnl [DESCRIPTION], [DEFAULT])
346-
dnl ------------------------------------------------------
347-
dnl
348-
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
349-
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
350-
dnl and preprocessor variable.
351-
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
352-
[
353-
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
354-
355-
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
356-
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
357-
])dnl PKG_HAVE_DEFINE_WITH_MODULES
358-
359291
m4_include([m4/ax_c_float_words_bigendian.m4])
360292
m4_include([m4/ax_check_openssl.m4])

‎configure‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@ infodir
786786
docdir
787787
oldincludedir
788788
includedir
789+
runstatedir
789790
localstatedir
790791
sharedstatedir
791792
sysconfdir
@@ -899,6 +900,7 @@ datadir='${datarootdir}'
899900
sysconfdir='${prefix}/etc'
900901
sharedstatedir='${prefix}/com'
901902
localstatedir='${prefix}/var'
903+
runstatedir='${localstatedir}/run'
902904
includedir='${prefix}/include'
903905
oldincludedir='/usr/include'
904906
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1151,6 +1153,15 @@ do
11511153
| -silent | --silent | --silen | --sile | --sil)
11521154
silent=yes ;;
11531155

1156+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1157+
| --runstate | --runstat | --runsta | --runst | --runs \
1158+
| --run | --ru | --r)
1159+
ac_prev=runstatedir ;;
1160+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1161+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1162+
| --run=* | --ru=* | --r=*)
1163+
runstatedir=$ac_optarg ;;
1164+
11541165
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11551166
ac_prev=sbindir ;;
11561167
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1288,7 +1299,7 @@ fi
12881299
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12891300
datadir sysconfdir sharedstatedir localstatedir includedir \
12901301
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1291-
libdir localedir mandir
1302+
libdir localedir mandir runstatedir
12921303
do
12931304
eval ac_val=\$$ac_var
12941305
# Remove trailing slashes.
@@ -1441,6 +1452,7 @@ Fine tuning of the installation directories:
14411452
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14421453
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14431454
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1455+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14441456
--libdir=DIR object code libraries [EPREFIX/lib]
14451457
--includedir=DIR C header files [PREFIX/include]
14461458
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -11494,7 +11506,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
1149411506
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
1149511507
getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \
1149611508
if_nameindex \
11497-
initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
11509+
initgroups kill killpg lchown lockf linkat lstat lutimes mmap \
1149811510
memrchr mbrtowc mkdirat mkfifo \
1149911511
madvise mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
1150011512
posix_fallocate posix_fadvise posix_spawn posix_spawnp pread preadv preadv2 \

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3544,7 +3544,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
35443544
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
35453545
getpriority getresuid getresgid getpwent getpwnam_r getpwuid_r getspnam getspent getsid getwd \
35463546
if_nameindex \
3547-
initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
3547+
initgroups kill killpg lchown lockf linkat lstat lutimes mmap \
35483548
memrchr mbrtowc mkdirat mkfifo \
35493549
madvise mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
35503550
posix_fallocate posix_fadvise posix_spawn posix_spawnp pread preadv preadv2 \

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL