Skip to content

Commit 1b02fd7

Browse files
committed
Re-generate configure script using preferred version of autoconf.
Signed-off-by: Soumendra Ganguly <soumendraganguly@gmail.com>
1 parent 089cb17 commit 1b02fd7

File tree

5 files changed

+73
-11
lines changed

5 files changed

+73
-11
lines changed

Modules/clinic/posixmodule.c.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Modules/posixmodule.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7212,9 +7212,9 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid)
72127212
#endif
72137213

72147214
#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_LOGIN_TTY) || defined(HAVE_DEV_PTMX)
7215-
#if defined(HAVE_PTY_H)
7215+
#ifdef HAVE_PTY_H
72167216
#include <pty.h>
7217-
#if defined(HAVE_UTMP_H)
7217+
#ifdef HAVE_UTMP_H
72187218
#include <utmp.h>
72197219
#endif /* HAVE_UTMP_H */
72207220
#elif defined(HAVE_LIBUTIL_H)

configure

+61-2
Original file line numberDiff line numberDiff line change
@@ -8467,7 +8467,7 @@ for ac_header in \
84678467
sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \
84688468
sys/statvfs.h sys/sys_domain.h sys/syscall.h sys/sysmacros.h sys/termio.h sys/time.h sys/times.h \
84698469
sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sys/xattr.h sysexits.h syslog.h \
8470-
termios.h util.h utime.h \
8470+
termios.h util.h utime.h utmp.h \
84718471

84728472
do :
84738473
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -15757,7 +15757,7 @@ fi
1575715757

1575815758

1575915759

15760-
# check for openpty and forkpty
15760+
# check for openpty, login_tty, and forkpty
1576115761

1576215762
for ac_func in openpty
1576315763
do :
@@ -15856,6 +15856,65 @@ fi
1585615856
fi
1585715857
done
1585815858

15859+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing login_tty" >&5
15860+
$as_echo_n "checking for library containing login_tty... " >&6; }
15861+
if ${ac_cv_search_login_tty+:} false; then :
15862+
$as_echo_n "(cached) " >&6
15863+
else
15864+
ac_func_search_save_LIBS=$LIBS
15865+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15866+
/* end confdefs.h. */
15867+
15868+
/* Override any GCC internal prototype to avoid an error.
15869+
Use char because int might match the return type of a GCC
15870+
builtin and then its argument prototype would still apply. */
15871+
#ifdef __cplusplus
15872+
extern "C"
15873+
#endif
15874+
char login_tty ();
15875+
int
15876+
main ()
15877+
{
15878+
return login_tty ();
15879+
;
15880+
return 0;
15881+
}
15882+
_ACEOF
15883+
for ac_lib in '' util; do
15884+
if test -z "$ac_lib"; then
15885+
ac_res="none required"
15886+
else
15887+
ac_res=-l$ac_lib
15888+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
15889+
fi
15890+
if ac_fn_c_try_link "$LINENO"; then :
15891+
ac_cv_search_login_tty=$ac_res
15892+
fi
15893+
rm -f core conftest.err conftest.$ac_objext \
15894+
conftest$ac_exeext
15895+
if ${ac_cv_search_login_tty+:} false; then :
15896+
break
15897+
fi
15898+
done
15899+
if ${ac_cv_search_login_tty+:} false; then :
15900+
15901+
else
15902+
ac_cv_search_login_tty=no
15903+
fi
15904+
rm conftest.$ac_ext
15905+
LIBS=$ac_func_search_save_LIBS
15906+
fi
15907+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_login_tty" >&5
15908+
$as_echo "$ac_cv_search_login_tty" >&6; }
15909+
ac_res=$ac_cv_search_login_tty
15910+
if test "$ac_res" != no; then :
15911+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
15912+
15913+
$as_echo "#define HAVE_LOGIN_TTY 1" >>confdefs.h
15914+
15915+
15916+
fi
15917+
1585915918
for ac_func in forkpty
1586015919
do :
1586115920
ac_fn_c_check_func "$LINENO" "forkpty" "ac_cv_func_forkpty"

configure.ac

+3-6
Original file line numberDiff line numberDiff line change
@@ -2256,7 +2256,7 @@ AC_CHECK_HEADERS([ \
22562256
sys/random.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/soundcard.h sys/stat.h \
22572257
sys/statvfs.h sys/sys_domain.h sys/syscall.h sys/sysmacros.h sys/termio.h sys/time.h sys/times.h \
22582258
sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h sys/xattr.h sysexits.h syslog.h \
2259-
termios.h util.h utime.h \
2259+
termios.h util.h utime.h utmp.h \
22602260
])
22612261
AC_HEADER_DIRENT
22622262
AC_HEADER_MAJOR
@@ -4315,11 +4315,8 @@ AC_CHECK_FUNCS(openpty,,
43154315
AC_CHECK_LIB(bsd,openpty, [AC_DEFINE(HAVE_OPENPTY) LIBS="$LIBS -lbsd"])
43164316
)
43174317
)
4318-
AC_CHECK_FUNCS(login_tty,,
4319-
AC_CHECK_LIB(util,login_tty,
4320-
[AC_DEFINE(HAVE_LOGIN_TTY) LIBS="$LIBS -lutil"],
4321-
AC_CHECK_LIB(bsd,login_tty, [AC_DEFINE(HAVE_LOGIN_TTY) LIBS="$LIBS -lbsd"])
4322-
)
4318+
AC_SEARCH_LIBS([login_tty], [util],
4319+
[AC_DEFINE([HAVE_LOGIN_TTY], [1], [Define to 1 if you have the `login_tty' function.])]
43234320
)
43244321
AC_CHECK_FUNCS(forkpty,,
43254322
AC_CHECK_LIB(util,forkpty,

pyconfig.h.in

+6
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,9 @@
715715
/* Define to 1 if you have the `log2' function. */
716716
#undef HAVE_LOG2
717717

718+
/* Define to 1 if you have the `login_tty' function. */
719+
#undef HAVE_LOGIN_TTY
720+
718721
/* Define to 1 if the system has the type `long double'. */
719722
#undef HAVE_LONG_DOUBLE
720723

@@ -1374,6 +1377,9 @@
13741377
/* Define to 1 if you have the <utime.h> header file. */
13751378
#undef HAVE_UTIME_H
13761379

1380+
/* Define to 1 if you have the <utmp.h> header file. */
1381+
#undef HAVE_UTMP_H
1382+
13771383
/* Define to 1 if you have the `uuid_create' function. */
13781384
#undef HAVE_UUID_CREATE
13791385

0 commit comments

Comments
 (0)