Changeset 400 for python/trunk/configure

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.

File:

• python/trunk/configure (modified) (4 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