Skip to content

Commit 62ed6be

Browse files
authored
remove the dynload_next.c file (closes bpo-32386) (#4957)
1 parent 424315f commit 62ed6be

File tree

3 files changed

+15
-117
lines changed

3 files changed

+15
-117
lines changed

Python/dynload_next.c

Lines changed: 0 additions & 111 deletions
This file was deleted.

configure

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ infodir
778778
docdir
779779
oldincludedir
780780
includedir
781+
runstatedir
781782
localstatedir
782783
sharedstatedir
783784
sysconfdir
@@ -889,6 +890,7 @@ datadir='${datarootdir}'
889890
sysconfdir='${prefix}/etc'
890891
sharedstatedir='${prefix}/com'
891892
localstatedir='${prefix}/var'
893+
runstatedir='${localstatedir}/run'
892894
includedir='${prefix}/include'
893895
oldincludedir='/usr/include'
894896
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1141,6 +1143,15 @@ do
11411143
| -silent | --silent | --silen | --sile | --sil)
11421144
silent=yes ;;
11431145

1146+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1147+
| --runstate | --runstat | --runsta | --runst | --runs \
1148+
| --run | --ru | --r)
1149+
ac_prev=runstatedir ;;
1150+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1151+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1152+
| --run=* | --ru=* | --r=*)
1153+
runstatedir=$ac_optarg ;;
1154+
11441155
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11451156
ac_prev=sbindir ;;
11461157
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1278,7 +1289,7 @@ fi
12781289
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12791290
datadir sysconfdir sharedstatedir localstatedir includedir \
12801291
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1281-
libdir localedir mandir
1292+
libdir localedir mandir runstatedir
12821293
do
12831294
eval ac_val=\$$ac_var
12841295
# Remove trailing slashes.
@@ -1431,6 +1442,7 @@ Fine tuning of the installation directories:
14311442
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14321443
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14331444
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1445+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14341446
--libdir=DIR object code libraries [EPREFIX/lib]
14351447
--includedir=DIR C header files [PREFIX/include]
14361448
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -9125,7 +9137,7 @@ then
91259137
LDCXXSHARED='$(CXX) -shared'
91269138
else
91279139
LDSHARED='$(CC) -b'
9128-
LDCXXSHARED='$(CXX) -shared'
9140+
LDCXXSHARED='$(CXX) -b'
91299141
fi ;;
91309142
Darwin/1.3*)
91319143
LDSHARED='$(CC) -bundle'
@@ -9872,6 +9884,7 @@ fi
98729884

98739885

98749886

9887+
98759888
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
98769889
if test -n "$ac_tool_prefix"; then
98779890
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11099,8 +11112,6 @@ then
1109911112
fi
1110011113
;;
1110111114
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
11102-
# Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
11103-
Darwin/[0156]\..*) DYNLOADFILE="dynload_next.o";;
1110411115
*)
1110511116
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
1110611117
# out any dynamic loading

configure.ac

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3373,8 +3373,6 @@ then
33733373
fi
33743374
;;
33753375
hp*|HP*) DYNLOADFILE="dynload_hpux.o";;
3376-
# Use dynload_next.c only on 10.2 and below, which don't have native dlopen()
3377-
Darwin/@<:@0156@:>@\..*) DYNLOADFILE="dynload_next.o";;
33783376
*)
33793377
# use dynload_shlib.c and dlopen() if we have it; otherwise stub
33803378
# out any dynamic loading

0 commit comments

Comments
 (0)