[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.33,1.34 config.h.in,2.90,2.91 configure,1.206,1.207 configure.in,1.214,1.215

Guido van Rossum gvanrossum@users.sourceforge.net
Wed, 11 Apr 2001 13:56:21 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv11866

Modified Files:
	Makefile.pre.in config.h.in configure configure.in 
Log Message:
Unixware 7 support by Billy G. Allie (SF patch 413011)

Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** Makefile.pre.in	2001/04/10 23:03:35	1.33
--- Makefile.pre.in	2001/04/11 20:56:18	1.34
***************
*** 310,314 ****
  	$(RANLIB) $@
  
! # This rule is only here for DG/UX and BeOS!!!
  libpython$(VERSION).so:	$(LIBRARY)
  	case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
--- 310,314 ----
  	$(RANLIB) $@
  
! # This rule is only here for DG/UX, UnixWare, and BeOS!!!
  libpython$(VERSION).so:	$(LIBRARY)
  	case `uname -s | tr -d '/ ' | tr '[A-Z]' '[a-z]'` in \
***************
*** 317,320 ****
--- 317,323 ----
  	    (cd dgux;ar x ../$^;ld -G -o ../$@ * ); \
  	    /bin/rm -rf ./dgux \
+ 	    ;; \
+ 	unixware*) \
+ 	    $(LDSHARED) -o $@ $(LIBRARY_OBJS) \
  	    ;; \
  	beos) \

Index: config.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/config.h.in,v
retrieving revision 2.90
retrieving revision 2.91
diff -C2 -r2.90 -r2.91
*** config.h.in	2001/03/20 13:09:13	2.90
--- config.h.in	2001/04/11 20:56:18	2.91
***************
*** 270,276 ****
  #undef SIZEOF_VOID_P
  
- /* Define if you have the _getpty function.  */
- #undef HAVE__GETPTY
- 
  /* Define if you have the alarm function.  */
  #undef HAVE_ALARM
--- 270,273 ----
***************
*** 360,363 ****
--- 357,363 ----
  #undef HAVE_GETPID
  
+ /* Define if you have the _getpty function.  */
+ #undef HAVE__GETPTY
+ 
  /* Define if you have the getpwent function.  */
  #undef HAVE_GETPWENT
***************
*** 519,530 ****
  #undef HAVE_WAITPID
  
! /* Define if you have the <db.h> header file.  */
! #undef HAVE_DB_H
  
  /* Define if you have the <db1/ndbm.h> header file.  */
  #undef HAVE_DB1_NDBM_H
  
! /* Define if you have the <db_185.h> header file.  */
! #undef HAVE_DB_185_H
  
  /* Define if you have the <dirent.h> header file.  */
--- 519,530 ----
  #undef HAVE_WAITPID
  
! /* Define if you have the <db_185.h> header file.  */
! #undef HAVE_DB_185_H
  
  /* Define if you have the <db1/ndbm.h> header file.  */
  #undef HAVE_DB1_NDBM_H
  
! /* Define if you have the <db.h> header file.  */
! #undef HAVE_DB_H
  
  /* Define if you have the <dirent.h> header file.  */

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -r1.206 -r1.207
*** configure	2001/03/31 00:01:55	1.206
--- configure	2001/04/11 20:56:18	1.207
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.213 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.215 
  
[...4569 lines suppressed...]
  if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6177 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6188,6192 ****
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6191: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then
--- 6223,6227 ----
  SRCDIRS="Parser Grammar Objects Python Modules"
  echo $ac_n "checking for build directories""... $ac_c" 1>&6
! echo "configure:6226: checking for build directories" >&5
  for dir in $SRCDIRS; do
      if test ! -d $dir; then

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -r1.214 -r1.215
*** configure.in	2001/03/31 00:01:55	1.214
--- configure.in	2001/04/11 20:56:19	1.215
***************
*** 53,57 ****
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64"; then
  		ac_sys_release=`uname -v`
  	else
--- 53,59 ----
  then
  	ac_sys_system=`uname -s`
! 	if test "$ac_sys_system" = "AIX" -o \
! 		"$ac_sys_system" = "Monterey64" -o \
! 		"$ac_sys_system" = "UnixWare"; then
  		ac_sys_release=`uname -v`
  	else
***************
*** 126,131 ****
      Monterey*)
          RANLIB=:
!         without_gcc=;;
! 	*)	without_gcc=no;;
  	esac])
  AC_MSG_RESULT($without_gcc)
--- 128,140 ----
      Monterey*)
          RANLIB=:
! 	    without_gcc=
! 	    ;;
! 	UnixWare*)
! 	    RANLIB=:
! 	    without_gcc=
! 	    ;;
! 	*)
! 	    without_gcc=no
! 	    ;;
  	esac])
  AC_MSG_RESULT($without_gcc)
***************
*** 265,268 ****
--- 274,280 ----
        DLLLIBRARY='libpython$(VERSION).dll'
        ;;
+ unixware*)
+       LDLIBRARY='libpython$(VERSION).so'
+       ;;
  esac
  AC_MSG_RESULT($LDLIBRARY)
***************
*** 299,308 ****
  	yes)
  		case $ac_cv_prog_cc_g in
! 		yes)	OPT="-g -O2 -Wall -Wstrict-prototypes";;
! 		*)	OPT="-O2 -Wall -Wstrict-prototypes";;
  		esac
  		;;
! 	*)	OPT="-O";;
  	esac
  fi
  
--- 311,328 ----
  	yes)
  		case $ac_cv_prog_cc_g in
! 	yes)
! 	    OPT="-g -O2 -Wall -Wstrict-prototypes";;
! 	*)
! 	    OPT="-O2 -Wall -Wstrict-prototypes";;
  		esac
  		;;
!     *)
! 	case $ac_sys_system in
! 	UnixWare*)
! 	    OPT="-O -K pentium,host,inline,loop_unroll,alloca ";;
! 	*)
! 	    OPT="-O";;
  	esac
+     esac
  fi
  
***************
*** 598,602 ****
  		if test "$GCC" = "yes"
  		then LDSHARED="$(CC) -shared"
! 		else LDSHARED="$(CC) -G"
  		fi;;
  	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
--- 618,622 ----
  		if test "$GCC" = "yes"
  		then LDSHARED="$(CC) -shared"
! 		else LDSHARED="ld -G -dy -Bdynamic"
  		fi;;
  	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
***************
*** 628,632 ****
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
! 		else CCSHARED="-KPIC"
  		fi;;
  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
--- 648,652 ----
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
! 		else CCSHARED="-KPIC -G -dy -Bdynamic"
  		fi;;
  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
***************
*** 659,663 ****
  	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
  	Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;;
! 	UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
--- 679,683 ----
  	next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;;
  	Darwin/*) LINKFORSHARED="-u __dummy -framework System -framework Foundation" ;;
! 	UnixWare*) LINKFORSHARED="-dy -Bdynamic -Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
***************
*** 794,868 ****
      USE_THREAD_MODULE="#"
  else
!     if test ! -z "$with_threads" -a -d "$with_threads"
!     then LDFLAGS="$LDFLAGS -L$with_threads"
!     fi
!     if test ! -z "$withval" -a -d "$withval"
!     then LDFLAGS="$LDFLAGS -L$withval"
!     fi
!     AC_DEFINE(_REENTRANT)
!     AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(C_THREADS)
!     LIBOBJS="$LIBOBJS thread.o"],[
!     AC_MSG_CHECKING(for --with-pth)
!     AC_ARG_WITH(pth,
!     [  --with-pth                      use GNU pth threading libraries], [
!     AC_MSG_RESULT($withval)
!     AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(HAVE_PTH)
!     LIBS="-lpth $LIBS"
!     LIBOBJS="$LIBOBJS thread.o"],[
!     AC_MSG_RESULT(no)
!     AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="-lpthread $LIBS"
!     LIBOBJS="$LIBOBJS thread.o"],[
!     AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
!     case $ac_sys_system in
!       Darwin*) ;;
!       *) AC_DEFINE(_POSIX_THREADS);;
!     esac
!     LIBOBJS="$LIBOBJS thread.o"],[
!     AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(BEOS_THREADS)
!     LIBOBJS="$LIBOBJS thread.o"],[
!     AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="$LIBS -lpthreads"
!     LIBOBJS="$LIBOBJS thread.o"], [
!     AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="$LIBS -lc_r"
!     LIBOBJS="$LIBOBJS thread.o"], [
!     AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="$LIBS -lthread"
!     LIBOBJS="$LIBOBJS thread.o"], [
!     AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="$LIBS -lpthread"
!     LIBOBJS="$LIBOBJS thread.o"], [
!     AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
!     AC_DEFINE(_POSIX_THREADS)
!     LIBS="$LIBS -lcma"
!     LIBOBJS="$LIBOBJS thread.o"],[
!     USE_THREAD_MODULE="#"])
!     ])])])])])])])])])
! 
!     AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
!     LIBS="$LIBS -lmpc"
!     LIBOBJS="$LIBOBJS thread.o"
!     USE_THREAD_MODULE=""])
!     AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
!     LIBS="$LIBS -lthread"
!     LIBOBJS="$LIBOBJS thread.o"
!     USE_THREAD_MODULE=""])
! 
!     if test "$USE_THREAD_MODULE" != "#"
!     then
!         # If the above checks didn't disable threads, (at least) OSF1
!         # needs this '-threads' argument during linking.
!         case $ac_sys_system in
!         OSF1) LDLAST=-threads;;
!         esac
      fi
  fi
--- 814,897 ----
      USE_THREAD_MODULE="#"
  else
!     if test "$ac_sys_system" = "UnixWare"
!      then
! 	CC="${CC} -Kthread"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	USE_THREAD_MODULE=""
!     else
! 	if test ! -z "$with_threads" -a -d "$with_threads"
! 	then LDFLAGS="$LDFLAGS -L$with_threads"
! 	fi
! 	if test ! -z "$withval" -a -d "$withval"
! 	then LDFLAGS="$LDFLAGS -L$withval"
! 	fi
! 	AC_DEFINE(_REENTRANT)
! 	AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(C_THREADS)
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_MSG_CHECKING(for --with-pth)
! 	AC_ARG_WITH(pth,
! 	[  --with-pth                      use GNU pth threading libraries], [
! 	AC_MSG_RESULT($withval)
! 	AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(HAVE_PTH)
! 	LIBS="-lpth $LIBS"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_MSG_RESULT(no)
! 	AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="-lpthread $LIBS"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
! 	case $ac_sys_system in
! 	  Darwin*) ;;
! 	  *) AC_DEFINE(_POSIX_THREADS);;
! 	esac
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(BEOS_THREADS)
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lpthreads"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lc_r"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lthread"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lpthread"
! 	LIBOBJS="$LIBOBJS thread.o"], [
! 	AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD)
! 	AC_DEFINE(_POSIX_THREADS)
! 	LIBS="$LIBS -lcma"
! 	LIBOBJS="$LIBOBJS thread.o"],[
! 	USE_THREAD_MODULE="#"])
! 	])])])])])])])])])
! 
! 	AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD)
! 	LIBS="$LIBS -lmpc"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	USE_THREAD_MODULE=""])
! 	AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD)
! 	LIBS="$LIBS -lthread"
! 	LIBOBJS="$LIBOBJS thread.o"
! 	USE_THREAD_MODULE=""])
! 
! 	if test "$USE_THREAD_MODULE" != "#"
! 	then
! 	    # If the above checks didn't disable threads, (at least) OSF1
! 	    # needs this '-threads' argument during linking.
! 	    case $ac_sys_system in
! 	    OSF1) LDLAST=-threads;;
! 	    esac
! 	fi
      fi
  fi