remove --with(out)-signal-module, since the signal module is non-optional
This commit is contained in:
parent
922175922c
commit
7d895ac953
|
@ -254,9 +254,6 @@ MODULE_OBJS= \
|
|||
Modules/main.o \
|
||||
Modules/gcmodule.o
|
||||
|
||||
# Used of signalmodule.o is not available
|
||||
SIGNAL_OBJS= @SIGNAL_OBJS@
|
||||
|
||||
IO_H= Modules/_io/_iomodule.h
|
||||
|
||||
IO_OBJS= \
|
||||
|
@ -448,7 +445,6 @@ LIBRARY_OBJS_OMIT_FROZEN= \
|
|||
$(OBJECT_OBJS) \
|
||||
$(PYTHON_OBJS) \
|
||||
$(MODULE_OBJS) \
|
||||
$(SIGNAL_OBJS) \
|
||||
$(MODOBJS)
|
||||
|
||||
LIBRARY_OBJS= \
|
||||
|
@ -598,7 +594,7 @@ $(LIBRARY): $(LIBRARY_OBJS)
|
|||
$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
|
||||
$(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
|
||||
$(AR) $(ARFLAGS) $@ $(MODOBJS)
|
||||
$(RANLIB) $@
|
||||
|
||||
|
@ -718,7 +714,6 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
|
|||
$(OBJECT_OBJS) \
|
||||
$(PYTHON_OBJS) \
|
||||
$(MODULE_OBJS) \
|
||||
$(SIGNAL_OBJS) \
|
||||
$(MODOBJS) \
|
||||
$(srcdir)/Modules/getbuildinfo.c
|
||||
$(CC) -c $(PY_CORE_CFLAGS) \
|
||||
|
|
|
@ -6,8 +6,5 @@
|
|||
# Threading
|
||||
@USE_THREAD_MODULE@_thread _threadmodule.c
|
||||
|
||||
# The signal module
|
||||
@USE_SIGNAL_MODULE@_signal signalmodule.c
|
||||
|
||||
# The rest of the modules previously listed in this file are built
|
||||
# by the setup.py script in Python 2.1 and later.
|
||||
|
|
|
@ -117,6 +117,7 @@ _operator _operator.c # operator.add() and similar goodies
|
|||
_collections _collectionsmodule.c # Container types
|
||||
itertools itertoolsmodule.c # Functions creating iterators for efficient looping
|
||||
atexit atexitmodule.c # Register functions to be run at interpreter-shutdown
|
||||
_signal signalmodule.c
|
||||
_stat _stat.c # stat.h interface
|
||||
time timemodule.c # -lm # time operations and variables
|
||||
|
||||
|
|
|
@ -645,8 +645,6 @@ DLINCLDIR
|
|||
THREADOBJ
|
||||
LDLAST
|
||||
USE_THREAD_MODULE
|
||||
SIGNAL_OBJS
|
||||
USE_SIGNAL_MODULE
|
||||
TCLTK_LIBS
|
||||
TCLTK_INCLUDES
|
||||
LIBFFI_INCLUDEDIR
|
||||
|
@ -828,7 +826,6 @@ enable_loadable_sqlite_extensions
|
|||
with_tcltk_includes
|
||||
with_tcltk_libs
|
||||
with_dbmliborder
|
||||
with_signal_module
|
||||
with_threads
|
||||
with_thread
|
||||
enable_ipv6
|
||||
|
@ -1532,7 +1529,6 @@ Optional Packages:
|
|||
order to check db backends for dbm. Valid value is a
|
||||
colon separated string with the backend names
|
||||
`ndbm', `gdbm' and `bdb'.
|
||||
--with-signal-module disable/enable signal module
|
||||
--with(out)-threads[=DIRECTORY]
|
||||
disable/enable thread support
|
||||
--with(out)-thread[=DIRECTORY]
|
||||
|
@ -9964,32 +9960,6 @@ fi
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
|
||||
$as_echo "$with_dbmliborder" >&6; }
|
||||
|
||||
# Determine if signalmodule should be used.
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-signal-module" >&5
|
||||
$as_echo_n "checking for --with-signal-module... " >&6; }
|
||||
|
||||
# Check whether --with-signal-module was given.
|
||||
if test "${with_signal_module+set}" = set; then :
|
||||
withval=$with_signal_module;
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$with_signal_module"
|
||||
then with_signal_module="yes"
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_signal_module" >&5
|
||||
$as_echo "$with_signal_module" >&6; }
|
||||
|
||||
if test "${with_signal_module}" = "yes"; then
|
||||
USE_SIGNAL_MODULE=""
|
||||
SIGNAL_OBJS=""
|
||||
else
|
||||
USE_SIGNAL_MODULE="#"
|
||||
SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"
|
||||
fi
|
||||
|
||||
# This is used to generate Setup.config
|
||||
|
||||
USE_THREAD_MODULE=""
|
||||
|
|
20
configure.ac
20
configure.ac
|
@ -2814,26 +2814,6 @@ else
|
|||
fi])
|
||||
AC_MSG_RESULT($with_dbmliborder)
|
||||
|
||||
# Determine if signalmodule should be used.
|
||||
AC_SUBST(USE_SIGNAL_MODULE)
|
||||
AC_SUBST(SIGNAL_OBJS)
|
||||
AC_MSG_CHECKING(for --with-signal-module)
|
||||
AC_ARG_WITH(signal-module,
|
||||
AS_HELP_STRING([--with-signal-module], [disable/enable signal module]))
|
||||
|
||||
if test -z "$with_signal_module"
|
||||
then with_signal_module="yes"
|
||||
fi
|
||||
AC_MSG_RESULT($with_signal_module)
|
||||
|
||||
if test "${with_signal_module}" = "yes"; then
|
||||
USE_SIGNAL_MODULE=""
|
||||
SIGNAL_OBJS=""
|
||||
else
|
||||
USE_SIGNAL_MODULE="#"
|
||||
SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"
|
||||
fi
|
||||
|
||||
# This is used to generate Setup.config
|
||||
AC_SUBST(USE_THREAD_MODULE)
|
||||
USE_THREAD_MODULE=""
|
||||
|
|
Loading…
Reference in New Issue