Changeset 400 for python

Timestamp:

Mar 22, 2014, 12:06:54 AM (11 years ago)

Author:

dmik

Message:

python: Add OS/2 bits to configure.ac and sync with configure.

Contributed by Paul Smedley.

Location:

python/trunk

Files:

• configure (modified) (4 diffs)
• configure.ac (modified) (10 diffs)

python/trunk/configure

@@ -5213 +5213 @@
 LDLIBRARYDIR=''
 RUNSHARED=''
-CONDENSED_VERSION=`echo "${VERSION}" | tr -d .,"`
+CONDENSED_VERSION=''
 
 # LINKCC is the command that links the python executable -- default is $(CC).
@@ -5398 +5398 @@
         ;;
     OS/2*|os2*|*emx*)
-        LDLIBRARY='python$(VERSION)_dll.a'
-        BLDLIBRARY='-L. -lpython$(VERSION)'
-        RUNSHARED=BEGINLIBPATH="'`pwd`;$BEGINLIBPATH'"
-        DLLLIBRARY='python${CONDENSED_VERSION}.dll'
-        ;;
+          LDLIBRARY='python$(VERSION)_dll.a'
+          BLDLIBRARY='-L. -lpython$(VERSION)'
+          RUNSHARED=BEGINLIBPATH="'`pwd`;$BEGINLIBPATH'"
+          CONDENSED_VERSION=`echo "${VERSION}" | tr -d .,"`
+          DLLLIBRARY='python$(CONDENSED_VERSION).dll'
+          ;;
 
   esac
@@ -8140 +8141 @@
 
 # SO is the extension of shared libraries `(including the dot!)
-# -- usually .so, .sl on HP-UX, .dll on Cygwin
+# -- usually .so, .sl on HP-UX, .dll on Cygwin and OS/2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking SO" >&5
 $as_echo_n "checking SO... " >&6; }
@@ -8316 +8317 @@
                 LDSHARED="gcc -shared"
                 LDCXXSHARED="g++ -shared";;
-        OS/2*|os2*|*emx*) LDSHARED="${CC} ${LDFLAGS} -Zdll";;
+        OS/2*|os2*|*emx*)
+                LDSHARED="${CC} ${LDFLAGS} -Zdll"
+                LDCXXSHARED="${CXX} ${LDFLAGS} -Zdll";;
         *)      LDSHARED="ld";;
         esac

python/trunk/configure.ac

@@ -347 +347 @@
         atheos*) MACHDEP="atheos";;
         irix646) MACHDEP="irix6";;
+        os2*|OS/2*|emx*) MACHDEP="os2knix";;
         '')     MACHDEP="unknown";;
     esac
@@ -749 +750 @@
 # LDLIBRARYDIR is the path to LDLIBRARY, which is made in a subdirectory. On
 # systems without shared libraries, LDLIBRARY is the same as LIBRARY
-# (defined in the Makefiles). On Cygwin LDLIBRARY is the import library,
-# DLLLIBRARY is the shared (i.e., DLL) library.
-# 
+# (defined in the Makefiles). On Cygwin and OS/2 LDLIBRARY is the import
+# library, DLLLIBRARY is the shared (i.e., DLL) library.
+#
 # RUNSHARED is used to run shared python without installed libraries
 #
@@ -762 +763 @@
 AC_SUBST(INSTSONAME)
 AC_SUBST(RUNSHARED)
+AC_SUBST(CONDENSED_VERSION)
 LDLIBRARY="$LIBRARY"
 BLDLIBRARY='$(LDLIBRARY)'
@@ -768 +770 @@
 LDLIBRARYDIR=''
 RUNSHARED=''
+CONDENSED_VERSION=''
 
 # LINKCC is the command that links the python executable -- default is $(CC).
@@ -822 +825 @@
 then 
   case $ac_sys_system in
-  CYGWIN* | atheos*)
+  CYGWIN* | atheos* | *OS/2* | *emx* | *os2*)
     enable_shared="yes";;
   *)
@@ -926 +929 @@
         RUNSHARED=LIBPATH=`pwd`:${LIBPATH}
         ;;
+    OS/2*|os2*|*emx*)
+          LDLIBRARY='python$(VERSION)_dll.a'
+          BLDLIBRARY='-L. -lpython$(VERSION)'
+          RUNSHARED=BEGINLIBPATH="'`pwd`;$BEGINLIBPATH'"
+          CONDENSED_VERSION=`echo "${VERSION}" | tr -d .,"`
+          DLLLIBRARY='python$(CONDENSED_VERSION).dll'
+          ;;
 
   esac
@@ -1009 +1019 @@
                 BeOS*) LN="ln -s";;
                 CYGWIN*) LN="ln -s";;
+                OS/2*|os2*|*emx*) LN="ln -s";;
                 atheos*) LN="ln -s";;
                 *) LN=ln;;
@@ -1907 +1918 @@
 AC_SUBST(LINKFORSHARED)
 # SO is the extension of shared libraries `(including the dot!)
-# -- usually .so, .sl on HP-UX, .dll on Cygwin
+# -- usually .so, .sl on HP-UX, .dll on Cygwin and OS/2
 AC_MSG_CHECKING(SO)
 if test -z "$SO"
@@ -1919 +1930 @@
                 ;;
         CYGWIN*)   SO=.dll;;
+        OS/2*|os2*|*emx*) SO=.dll;;
         *)         SO=.so;;
         esac
@@ -2075 +2087 @@
                 LDSHARED="gcc -shared"
                 LDCXXSHARED="g++ -shared";;
+        OS/2*|os2*|*emx*)
+                LDSHARED="${CC} ${LDFLAGS} -Zdll"
+                LDCXXSHARED="${CXX} ${LDFLAGS} -Zdll";;
         *)      LDSHARED="ld";;
         esac