--- configure.orig	2007-09-18 21:43:41.000000000 +0200
+++ configure	2007-09-18 23:01:34.000000000 +0200
@@ -2598,27 +2598,6 @@
   fi
 
 
-  if test ! -z "`uname -a | grep CYGWIN`" \
-        -a "$LD_SHARED" = "/bin/true" \
-	-a -z "`gcc -shared conftest2.o -o libconftest.dll`" ; then
-    if test -z "`${CC} conftest1.c -L./ -lconftest -o conftest1 2>&1`"; then
-      LD_LIBRARY_PATH_OLD="$LD_LIBRARY_PATH"
-      if test -z "$LD_LIBRARY_PATH" ; then
-        LD_LIBRARY_PATH="`pwd`"
-      else
-        LD_LIBRARY_PATH="`pwd`:$LD_LIBRARY_PATH"
-      fi
-      export LD_LIBRARY_PATH
-      if test -z "`./conftest1 2>&1`" ; then
-        echo "checking for Cygwin gcc -shared ... yes"
-        LD_SHARED="c++ -shared"
-        SO_EXT="dll"
-      fi
-      LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
-    fi
-  fi
-
-
   if test ! -z "`uname | grep Darwin`" \
           -a "$LD_SHARED" = "/bin/true" \
           -a -z "`${CXX} -dynamiclib conftest2.o -o libconftest.so 2>&1`" ; then
@@ -2642,34 +2621,8 @@
   fi
 
   if test "$LD_SHARED" = "/bin/true" \
-	-a -z "`${CXX} -shared $IRIX_ALL conftest2.o -o libconftest.so 2>&1|grep -v WARNING`" ; then
-    if test -z "`${CC} conftest1.c libconftest.so -o conftest1 2>&1`"; then
-      LD_LIBRARY_PATH_OLD="$LD_LIBRARY_PATH"
-      if test -z "$LD_LIBRARY_PATH" ; then
-        LD_LIBRARY_PATH="`pwd`"
-      else
-        LD_LIBRARY_PATH="`pwd`:$LD_LIBRARY_PATH"
-      fi
-      export LD_LIBRARY_PATH
-      if test -z "`./conftest1 2>&1`" ; then
-        echo "checking for ${CXX} -shared ... yes"
-        LD_SHARED="${CXX} -shared $IRIX_ALL"
-      else
-        echo "checking for ${CXX} -shared ... no(3)"
-      fi
-      LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
-    else
-      echo "checking for ${CXX} -shared ... no(2)"
-    fi
-  else
-    if test "$LD_SHARED" = "/bin/true" ; then
-      echo "checking for ${CXX} -shared ... no(1)"
-    fi
-  fi
-
-  if test "$LD_SHARED" = "/bin/true" \
-          -a -z "`ld -shared conftest2.o -o libconftest.so 2>&1`" ; then
-    if test -z "`${CC} conftest1.c libconftest.so -o conftest1 2>&1`"; then
+          -a -z "`${CC} -dynamiclib conftest2.o -o libconftest.dylib 2>&1`" ; then
+    if test -z "`${CC} conftest1.c libconftest.dylib -o conftest1 2>&1`"; then
       LD_LIBRARY_PATH_OLD="$LD_LIBRARY_PATH"
       if test -z "$LD_LIBRARY_PATH" ; then
         LD_LIBRARY_PATH="`pwd`"
@@ -2678,15 +2631,15 @@
       fi
       export LD_LIBRARY_PATH
       if test -z "`./conftest1 2>&1`" ; then
-        echo "checking for ld -shared ... yes"
-        LD_SHARED="ld -shared"
+        echo "checking for ${CC} -dynamiclib ... yes"
+        LD_SHARED="${CC} -dynamiclib"
       fi
       LD_LIBRARY_PATH="$LD_LIBRARY_PATH_OLD"
     fi
   fi
 
   if test "$LD_SHARED" = "/bin/true" ; then
-    echo "checking for ld -shared ... no"
+    echo "checking for ld -dynamiclib ... no"
     if test ! -x /bin/true ; then
       LD_SHARED=/usr/bin/true
     fi