Changeset 3391 for trunk

Timestamp:

Jun 10, 2007, 9:20:42 PM (18 years ago)

Author:

bird

Message:

OS/2 and shared building

File:

• trunk/essentials/dev-lang/python/configure.in (modified) (9 diffs)

trunk/essentials/dev-lang/python/configure.in

@@ -184 +184 @@
         atheos*) MACHDEP="atheos";;
         irix646) MACHDEP="irix6";;
-        os2*|emx*) MACHDEP="emx";;
+        os2*|OS/2*|emx*) MACHDEP="emx";;
 
         '')     MACHDEP="unknown";;
@@ -489 +489 @@
     gcc) CC="$CC -D_HAVE_BSDI";;
     esac;;
-os2*|emx*)
+OS/2*|os2*|emx*)
     CC="$CC -DPYOS_OS2=1 -DPYCC_GCC=1"
     ;;
@@ -537 +537 @@
 AC_SUBST(INSTSONAME)
 AC_SUBST(RUNSHARED)
+AC_SUBST(CONDENSED_VERSION)
 LDLIBRARY="$LIBRARY"
 BLDLIBRARY='$(LDLIBRARY)'
@@ -543 +544 @@
 LDLIBRARYDIR=''
 RUNSHARED=''
+CONDENSED_VERSION=''
 
 # LINKCC is the command that links the python executable -- default is $(CC).
@@ -576 +578 @@
 then 
   case $ac_sys_system in
-  CYGWIN* | atheos* | os2* | emx*)
+  CYGWIN* | atheos* | *OS/2* | *emx*)
     enable_shared="yes";;
   *)
@@ -670 +672 @@
           RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
           ;;
-    os2*|emx*)
+    OS/2*|os2*|emx*)
       LDLIBRARY='python$(VERSION)_dll.a'
           BLDLIBRARY='-L. -lpython$(VERSION)'
-          RUNSHARED=BEGINLIBPATH="`pwd`;$BEGINLIBPATH"
+          RUNSHARED=BEGINLIBPATH="'`pwd`;$BEGINLIBPATH'"
       CONDENSED_VERSION=`echo "$(VERSION)" | tr -d .,"`
       DLLLIBRARY='python$(CONDENSED_VERSION).dll'
@@ -718 +720 @@
                 BeOS*) LN="ln -s";;
                 CYGWIN*) LN="ln -s";;
-                os2*|emx*) LN="ln -s";;
+                OS/2*|os2*|emx*) LN="ln -s";;
                 atheos*) LN="ln -s";;
                 *) LN=ln;;
@@ -1421 +1423 @@
                 ;;
         CYGWIN*)   SO=.dll;;
-        os2*|emx*) SO=.dll;;
+        OS/2*|os2*|emx*) SO=.dll;;
         *)         SO=.so;;
         esac
@@ -1546 +1548 @@
         CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
         atheos*) LDSHARED="gcc -shared";;
+        OS/2*|os2*|emx*) LDSHARED="gcc -Zdll -Zomf";;
         *)      LDSHARED="ld";;
         esac