[Python-checkins] python/dist/src configure,1.321,1.322 pyconfig.h.in,1.42,1.43 configure.in,1.332,1.333 Makefile.pre.in,1.87,1.88

mhammond@users.sourceforge.net mhammond@users.sourceforge.net
Thu, 18 Jul 2002 23:55:43 -0700


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

Modified Files:
	configure pyconfig.h.in configure.in Makefile.pre.in 
Log Message:
Land Patch [ 566100 ] Rationalize DL_IMPORT and DL_EXPORT.



Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.321
retrieving revision 1.322
diff -C2 -d -r1.321 -r1.322
*** configure	18 Jul 2002 22:39:32 -0000	1.321
--- configure	19 Jul 2002 06:55:40 -0000	1.322
***************
*** 1,4 ****
  #! /bin/sh
! # From configure.in Revision: 1.330 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.
--- 1,4 ----
  #! /bin/sh
! # From configure.in Revision: 1.332 .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.53.
***************
*** 1226,1229 ****
--- 1226,1230 ----
  SOVERSION=1.0
  
+ 
  cat >>confdefs.h <<\_ACEOF
  #define _XOPEN_SOURCE 500
***************
*** 1348,1353 ****
  			CC=mwcc
  			without_gcc=yes
! 			OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
! 			CCSHARED="-UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
  			LDFLAGS="$LDFLAGS -nodup"
  			;;
--- 1349,1353 ----
  			CC=mwcc
  			without_gcc=yes
! 			OPT="-O -export pragma"
  			LDFLAGS="$LDFLAGS -nodup"
  			;;
***************
*** 3108,3111 ****
--- 3108,3116 ----
  # Other platforms follow
  if test $enable_shared = "yes"; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define Py_ENABLE_SHARED 1
+ _ACEOF
+ 
    case $ac_sys_system in
      BeOS*)
***************
*** 8821,8825 ****
  		   *) CCSHARED="";;
  		   esac;;
- 	CYGWIN*) CCSHARED="-DUSE_DL_IMPORT";;
  	atheos*) CCSHARED="-fPIC";;
  	esac
--- 8826,8829 ----

Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** pyconfig.h.in	14 Jun 2002 20:30:30 -0000	1.42
--- pyconfig.h.in	19 Jul 2002 06:55:40 -0000	1.43
***************
*** 12,19 ****
  #undef BAD_EXEC_PROTOTYPES
  
- /* Define if your compiler botches static forward declarations (as it does on
-    SCI ODT 3.0) */
- #undef BAD_STATIC_FORWARD
- 
  /* Define this if you have BeOS threads. */
  #undef BEOS_THREADS
--- 12,15 ----
***************
*** 129,135 ****
  #undef HAVE_GAI_STRERROR
  
- /* Define to 1 if you have the <gdbm/ndbm.h> header file. */
- #undef HAVE_GDBM_NDBM_H
- 
  /* Define if you have the getaddrinfo function. */
  #undef HAVE_GETADDRINFO
--- 125,128 ----
***************
*** 273,279 ****
  #undef HAVE_NCURSES_H
  
- /* Define to 1 if you have the <ndbm.h> header file. */
- #undef HAVE_NDBM_H
- 
  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
  #undef HAVE_NDIR_H
--- 266,269 ----
***************
*** 354,360 ****
  #undef HAVE_SETPGID
  
- /* Define to 1 if you have the `setpgrp' function. */
- #undef HAVE_SETPGRP
- 
  /* Define to 1 if you have the `setregid' function. */
  #undef HAVE_SETREGID
--- 344,347 ----
***************
*** 627,630 ****
--- 614,620 ----
  #undef Py_DEBUG
  
+ /* Defined if Python is built as a shared library. */
+ #undef Py_ENABLE_SHARED
+ 
  /* Define as the size of the unicode type. */
  #undef Py_UNICODE_SIZE
***************
*** 639,642 ****
--- 629,635 ----
  #undef SETPGRP_HAVE_ARG
  
+ /* Define to 1 if the `setpgrp' function takes no argument. */
+ #undef SETPGRP_VOID
+ 
  /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
  #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
***************
*** 713,719 ****
  #undef WINDOW_HAS_FLAGS
  
- /* Define if you want to compile in cycle garbage collection. */
- #undef WITH_CYCLE_GC
- 
  /* 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
--- 706,709 ----
***************
*** 783,786 ****
--- 773,779 ----
  /* Define to force use of thread-safe errno, h_errno, and other functions */
  #undef _REENTRANT
+ 
+ /* Needed on Tru64 and does no harm on Linux */
+ #undef _XOPEN_SOURCE
  
  /* Define to 1 if type `char' is unsigned and you are not using gcc.  */

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.332
retrieving revision 1.333
diff -C2 -d -r1.332 -r1.333
*** configure.in	19 Jul 2002 06:31:24 -0000	1.332
--- configure.in	19 Jul 2002 06:55:40 -0000	1.333
***************
*** 126,131 ****
  			CC=mwcc
  			without_gcc=yes
! 			OPT="-O -D'DL_EXPORT(RTYPE)=__declspec(dllexport) RTYPE' -D'DL_IMPORT(RTYPE)=__declspec(dllexport) RTYPE' -export pragma"
! 			CCSHARED="-UDL_IMPORT -D'DL_IMPORT(RTYPE)=__declspec(dllimport) RTYPE'"
  			LDFLAGS="$LDFLAGS -nodup"
  			;;
--- 126,130 ----
  			CC=mwcc
  			without_gcc=yes
! 			OPT="-O -export pragma"
  			LDFLAGS="$LDFLAGS -nodup"
  			;;
***************
*** 360,363 ****
--- 359,363 ----
  # Other platforms follow
  if test $enable_shared = "yes"; then
+   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
    case $ac_sys_system in
      BeOS*)
***************
*** 949,953 ****
  		   *) CCSHARED="";;
  		   esac;;
- 	CYGWIN*) CCSHARED="-DUSE_DL_IMPORT";;
  	atheos*) CCSHARED="-fPIC";;
  	esac
--- 949,952 ----

Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** Makefile.pre.in	17 Jul 2002 15:55:09 -0000	1.87
--- Makefile.pre.in	19 Jul 2002 06:55:40 -0000	1.88
***************
*** 66,70 ****
  CFLAGSFORSHARED=@CFLAGSFORSHARED@
  # C flags used for building the interpreter object files
! PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED)
  
  
--- 66,70 ----
  CFLAGSFORSHARED=@CFLAGSFORSHARED@
  # C flags used for building the interpreter object files
! PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
  
  
***************
*** 421,428 ****
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
  
  Objects/unicodectype.o:	$(srcdir)/Objects/unicodectype.c \
--- 421,428 ----
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
! 		$(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c
  
  Python/importdl.o: $(srcdir)/Python/importdl.c
! 		$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
  
  Objects/unicodectype.o:	$(srcdir)/Objects/unicodectype.c \