[Python-checkins] python/dist/src configure, 1.435,
1.436 configure.in, 1.445, 1.446 pyconfig.h.in, 1.88, 1.89
montanaro at users.sourceforge.net
montanaro at users.sourceforge.net
Fri Jan 16 23:04:15 EST 2004
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21141
Modified Files:
configure configure.in pyconfig.h.in
Log Message:
Remove support for DYNIX, IRIX 4, --with-sgi-dl, --with-dl-dld
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.435
retrieving revision 1.436
diff -C2 -d -r1.435 -r1.436
*** configure 17 Jan 2004 03:04:45 -0000 1.435
--- configure 17 Jan 2004 04:04:09 -0000 1.436
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.444 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.445 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.4.
***************
*** 872,877 ****
--with(out)-pymalloc disable/enable specialized mallocs
--with-wctype-functions use wctype.h functions
- --with-sgi-dl=DIRECTORY IRIX 4 dynamic linking
- --with-dl-dld=DL_DIR GNU dynamic linking
--with-fpectl enable SIGFPE catching
--with-libm=STRING math library
--- 872,875 ----
***************
*** 3011,3015 ****
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
! SunOS/4*|DYNIX/*|IRIX/4*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
--- 3009,3013 ----
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
! SunOS/4*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
***************
*** 9391,9395 ****
hp*|HP*) LDSHARED="ld -b";;
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
- DYNIX/ptx*) LDSHARED="ld -G";;
Darwin/1.3*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
--- 9389,9392 ----
***************
*** 9924,9932 ****
# Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
- # However on SGI IRIX 4, these exist but are broken.
# BeOS' sockets are stashed in libnet.
- case "$ac_sys_system" in
- IRIX*) ;;
- *)
echo "$as_me:$LINENO: checking for t_open in -lnsl" >&5
echo $ECHO_N "checking for t_open in -lnsl... $ECHO_C" >&6
--- 9921,9925 ----
***************
*** 10045,10050 ****
fi
# SVR4 sockets
! ;;
! esac
case "$ac_sys_system" in
BeOS*)
--- 10038,10042 ----
fi
# SVR4 sockets
!
case "$ac_sys_system" in
BeOS*)
***************
*** 12072,12138 ****
DLINCLDIR=.
- echo "$as_me:$LINENO: checking for --with-sgi-dl" >&5
- echo $ECHO_N "checking for --with-sgi-dl... $ECHO_C" >&6
-
- # Check whether --with-sgi-dl or --without-sgi-dl was given.
- if test "${with_sgi_dl+set}" = set; then
- withval="$with_sgi_dl"
-
- echo "$as_me:$LINENO: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
- echo --with-sgi-dl is unsupported, see README
- exit 1
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_SGI_DL 1
- _ACEOF
-
- DYNLOADFILE="dynload_dl.o"
- dldir=$withval
- if test ! -z "$dldir" -a -d "$dldir"
- then LDFLAGS="$LDFLAGS -L$dldir"
- else { { echo "$as_me:$LINENO: error: proper usage is --with-sgi-dl=DIRECTORY" >&5
- echo "$as_me: error: proper usage is --with-sgi-dl=DIRECTORY" >&2;}
- { (exit 1); exit 1; }; }
- fi
- DLINCLDIR=${dldir}
- LIBS="$LIBS -ldl -lmld"
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi;
-
- echo "$as_me:$LINENO: checking for --with-dl-dld" >&5
- echo $ECHO_N "checking for --with-dl-dld... $ECHO_C" >&6
-
- # Check whether --with-dl-dld or --without-dl-dld was given.
- if test "${with_dl_dld+set}" = set; then
- withval="$with_dl_dld"
-
- echo "$as_me:$LINENO: result: $withval" >&5
- echo "${ECHO_T}$withval" >&6
- echo --with-dl-dld is unsupported, see README
- exit 1
-
- cat >>confdefs.h <<\_ACEOF
- #define WITH_DL_DLD 1
- _ACEOF
-
- DYNLOADFILE="dynload_dl.o"
- dldir=`echo "$withval" | sed 's/,.*//'`
- dlddir=`echo "$withval" | sed 's/.*,//'`
- if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
- then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
- else { { echo "$as_me:$LINENO: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&5
- echo "$as_me: error: proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY" >&2;}
- { (exit 1); exit 1; }; }
- fi
- DLINCLDIR=${dldir}
- LIBS="$LIBS -ldl -ldld"
- else
- echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi;
-
# the dlopen() function means we might want to use dynload_shlib.o. some
# platforms, such as AIX, have dlopen(), but don't want to use it.
--- 12064,12067 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.445
retrieving revision 1.446
diff -C2 -d -r1.445 -r1.446
*** configure.in 17 Jan 2004 03:04:46 -0000 1.445
--- configure.in 17 Jan 2004 04:04:12 -0000 1.446
***************
*** 333,337 ****
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
! SunOS/4*|DYNIX/*|IRIX/4*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
--- 333,337 ----
# Check for unsupported systems
case $ac_sys_system/$ac_sys_release in
! SunOS/4*|Linux*/1*)
echo This system \($ac_sys_system/$ac_sys_release\) is no longer supported.
echo See README for details.
***************
*** 1247,1251 ****
hp*|HP*) LDSHARED="ld -b";;
OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";;
- DYNIX/ptx*) LDSHARED="ld -G";;
Darwin/1.3*)
LDSHARED='$(CC) $(LDFLAGS) -bundle'
--- 1247,1250 ----
***************
*** 1444,1456 ****
# Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
- # However on SGI IRIX 4, these exist but are broken.
# BeOS' sockets are stashed in libnet.
- case "$ac_sys_system" in
- IRIX*) ;;
- *)
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
! ;;
! esac
case "$ac_sys_system" in
BeOS*)
--- 1443,1450 ----
# Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
# BeOS' sockets are stashed in libnet.
AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
!
case "$ac_sys_system" in
BeOS*)
***************
*** 1959,2011 ****
DLINCLDIR=.
- AC_MSG_CHECKING(for --with-sgi-dl)
- AC_ARG_WITH(sgi-dl,
- AC_HELP_STRING(--with-sgi-dl=DIRECTORY, IRIX 4 dynamic linking),
- [
- AC_MSG_RESULT($withval)
- echo --with-sgi-dl is unsupported, see README
- exit 1
- AC_DEFINE(WITH_SGI_DL, 1,
- [Define if you want to use SGI (IRIX 4) dynamic linking.
- This requires the "dl" library by Jack Jansen,
- ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
- Do not bother on IRIX 5, it already has dynamic linking using SunOS
- style shared libraries])
- DYNLOADFILE="dynload_dl.o"
- dldir=$withval
- if test ! -z "$dldir" -a -d "$dldir"
- then LDFLAGS="$LDFLAGS -L$dldir"
- else AC_MSG_ERROR([proper usage is --with-sgi-dl=DIRECTORY])
- fi
- DLINCLDIR=${dldir}
- LIBS="$LIBS -ldl -lmld"], AC_MSG_RESULT(no))
-
- AC_MSG_CHECKING(for --with-dl-dld)
- AC_ARG_WITH(dl-dld,
- AC_HELP_STRING(--with-dl-dld=DL_DIR, GNU dynamic linking),
- [
- AC_MSG_RESULT($withval)
- echo --with-dl-dld is unsupported, see README
- exit 1
- AC_DEFINE(WITH_DL_DLD, 1,
- [Define if you want to emulate SGI (IRIX 4) dynamic linking.
- This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
- Sequent Symmetry (Dynix), and Atari ST.
- This requires the 'dl-dld' library,
- ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z,
- as well as the 'GNU dld' library,
- ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
- Do not bother on SunOS 4 or 5, they already have dynamic linking using
- shared libraries.])
- DYNLOADFILE="dynload_dl.o"
- dldir=`echo "$withval" | sed 's/,.*//'`
- dlddir=`echo "$withval" | sed 's/.*,//'`
- if test ! -z "$dldir" -a -d "$dldir" -a ! -z "$dlddir" -a -d "$dlddir"
- then LDFLAGS="$LDFLAGS -L$dldir -L$dlddir"
- else AC_MSG_ERROR([proper usage is --with-dl-dld=DL_DIRECTORY,DLD_DIRECTORY])
- fi
- DLINCLDIR=${dldir}
- LIBS="$LIBS -ldl -ldld"], AC_MSG_RESULT(no))
-
# the dlopen() function means we might want to use dynload_shlib.o. some
# platforms, such as AIX, have dlopen(), but don't want to use it.
--- 1953,1956 ----
Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** pyconfig.h.in 17 Jan 2004 00:16:12 -0000 1.88
--- pyconfig.h.in 17 Jan 2004 04:04:12 -0000 1.89
***************
*** 773,784 ****
#undef WINDOW_HAS_FLAGS
- /* Define if you want to emulate SGI (IRIX 4) dynamic linking. This is
- rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4), Sequent Symmetry
- (Dynix), and Atari ST. This requires the 'dl-dld' library,
- ftp://ftp.cwi.nl/pub/dynload/dl-dld-1.1.tar.Z, as well as the 'GNU dld'
- library, ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z. Do not bother on
- SunOS 4 or 5, they already have dynamic linking using shared libraries. */
- #undef WITH_DL_DLD
-
/* Define if you want documentation strings in extension modules */
#undef WITH_DOC_STRINGS
--- 773,776 ----
***************
*** 799,808 ****
#undef WITH_PYMALLOC
- /* Define if you want to use SGI (IRIX 4) dynamic linking. This requires the
- "dl" library by Jack Jansen, ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z. Do
- not bother on IRIX 5, it already has dynamic linking using SunOS style
- shared libraries */
- #undef WITH_SGI_DL
-
/* Define if you want to compile in rudimentary thread support */
#undef WITH_THREAD
--- 791,794 ----
More information about the Python-checkins
mailing list