Fixes for multithreading handling on OS/2.

Some fixes for autoconf-2.57.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -263,6 +263,11 @@ case "${host}" in
     AC_DEFINE(__EMX__)
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
+    dnl "c++" wrapper is not always available, so always use plain gcc.
+    CXX=gcc
+    dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
+    LIBS="$LIBS -lstdcpp"
+    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
   ;;
 
   powerpc-*-darwin* )
@@ -1931,10 +1936,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
         fi
         AC_CHECK_HEADER(tiffio.h,
+            [
                 AC_CHECK_LIB(tiff, TIFFError,
                              TIFF_LINK=" -ltiff",
                              ,
                              $TIFF_PREREQ_LINKS)
+            ]
         )
 
         if test "x$TIFF_LINK" = "x" ; then
@@ -3461,12 +3468,16 @@ AC_CHECK_FUNCS(inet_addr,
     [
         AC_CHECK_LIB(nsl, inet_addr,
             INET_LINK="nsl",
+            [
                 AC_CHECK_LIB(resolv, inet_addr,
                     INET_LINK="resolv",
+                    [
                         AC_CHECK_LIB(socket, inet_addr,
                             INET_LINK="socket"
                         )
+                    ]
                 )
+            ]
         )
     ]
 )
@@ -3499,7 +3510,7 @@ dnl ---------------------------------------------------------------------------
 
 dnl under MSW (except mingw32) we always have thread support
 CPP_MT_FLAG=
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$TOOLKIT" != "PM"; then
 
     dnl the code below:
     dnl
@@ -3795,6 +3806,11 @@ else
                 CFLAGS="$CFLAGS_OLD"
             fi
         ;;
+        *-pc-os2*emx )
+	    CFLAGS="$CFLAGS -Zmt"	
+	    CXXFLAGS="$CXXFLAGS -Zmt"	
+	    LDFLAGS="$LDFLAGS -Zmt"	
+        ;;
       esac
     fi
 fi
@@ -4258,6 +4274,7 @@ if test "$wxUSE_SOCKETS" = "yes"; then
     if test "$TOOLKIT" != "MSW"; then
         dnl under Solaris and OS/2, socket functions live in -lsocket
         AC_CHECK_FUNC(socket,,
+            [
                 AC_CHECK_LIB(socket, socket,
                     if test "$INET_LINK" != " -lsocket"; then
                         INET_LINK="$INET_LINK -lsocket"
@@ -4267,6 +4284,7 @@ if test "$wxUSE_SOCKETS" = "yes"; then
                         wxUSE_SOCKETS=no
                     ]
                 )
+            ]
         )
     fi
 fi
@@ -4421,7 +4439,10 @@ if test "$TOOLKIT" != "MSW"; then
         if test "$HAVE_DL_FUNCS" = 1; then
             AC_CHECK_FUNCS(dlerror,
                 AC_DEFINE(HAVE_DLERROR),
-                           AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
+                [
+                    AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
+                ]
+            )
         fi
         fi