Changeset 10 for python/trunk/configure

Timestamp:

Sep 3, 2010, 5:33:06 PM (15 years ago)

Author:

Yuri Dario

Message:

python: merged offline changes.

File:

• python/trunk/configure (modified) (10 diffs)

python/trunk/configure

@@ -698 +698 @@
 LDLIBRARYDIR
 INSTSONAME
+CONDENSED_VERSION
 RUNSHARED
 LINKCC
@@ -2106 +2107 @@
         atheos*) MACHDEP="atheos";;
         irix646) MACHDEP="irix6";;
+        os2*|OS/2*|emx*) MACHDEP="os2knix";;
         '')     MACHDEP="unknown";;
         esac
@@ -4013 +4015 @@
 LDLIBRARYDIR=''
 RUNSHARED=''
+CONDENSED_VERSION=`echo "${VERSION}" | tr -d .,"`
 
 # LINKCC is the command that links the python executable -- default is $(CC).
@@ -4056 +4059 @@
 then
   case $ac_sys_system in
-  CYGWIN* | atheos*)
+  CYGWIN* | atheos* | *OS/2* | *emx* | *os2*)
     enable_shared="yes";;
   *)
@@ -4205 +4208 @@
         RUNSHARED='DYLD_LIBRARY_PATH=`pwd`:${DYLD_LIBRARY_PATH}'
         ;;
+    OS/2*|os2*|*emx*)
+        LDLIBRARY='python$(VERSION)_dll.a'
+        BLDLIBRARY='-L. -lpython$(VERSION)'
+        RUNSHARED=BEGINLIBPATH="'`pwd`;$BEGINLIBPATH'"
+        DLLLIBRARY='python${CONDENSED_VERSION}.dll'
+        ;;
 
   esac
@@ -4533 +4542 @@
                 CYGWIN*) LN="ln -s";;
                 atheos*) LN="ln -s";;
+                OS/2*|os2*|*emx*) LN="ln -s";;
                 *) LN=ln;;
         esac
@@ -13192 +13202 @@
                 ;;
         CYGWIN*)   SO=.dll;;
+        OS/2*|os2*|*emx*) SO=.dll;;
         *)         SO=.so;;
         esac
@@ -13322 +13333 @@
         CYGWIN*) LDSHARED="gcc -shared -Wl,--enable-auto-image-base";;
         atheos*) LDSHARED="gcc -shared";;
+        OS/2*|os2*|*emx*) LDSHARED="gcc -Zdll -Zomf";;
         *)      LDSHARED="ld";;
         esac
@@ -25911 +25923 @@
 INSTSONAME!$INSTSONAME$ac_delim
 RUNSHARED!$RUNSHARED$ac_delim
+CONDENSED_VERSION!$CONDENSED_VERSION$ac_delim
 LINKCC!$LINKCC$ac_delim
 RANLIB!$RANLIB$ac_delim
@@ -25928 +25941 @@
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
     break
   elif $ac_last_try; then