$NetBSD: patch-ac,v 1.2 2013/04/30 22:31:52 joerg Exp $

--- configure.orig	2008-05-16 08:01:24.000000000 +0000
+++ configure
@@ -11085,7 +11085,7 @@ if test "${enable_xshm+set}" = set; then
   enableval=$enable_xshm;
 fi
 
-	if test x$enable_xshm == xyes; then
+	if test x$enable_xshm = xyes; then
 	  { echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5
 echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_X11_extensions_XShm_h+set}" = set; then
@@ -11735,35 +11735,6 @@ if test -n "$GCC"; then
     #
     # Previous versions of GCC do not have the reliance on the stdc++
     # or g++ libraries, so the extra supc++ library is not needed.
-
-    { echo "$as_me:$LINENO: checking if libsupc++ is required" >&5
-echo $ECHO_N "checking if libsupc++ is required... $ECHO_C" >&6; }
-
-    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
-    case "$SUPC" in
-    	libsupc++.a*)
-	    # Library not found, so this is and older GCC...
-	    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-	    ;;
-	*)
-            # This is gcc 3.x, and it knows of libsupc++, so we need it
-	case "$uname" in
-	    # do not add for Darwin as it is already linked with it
-	    Darwin*)
-	    ;;
-	    *)
-            LIBS="$LIBS -lsupc++"
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-	    ;;
-	esac
-    esac
-
-    if test x$uname != xDarwin; then
-        CXX="$CC"
-    fi
-
     # Check whether --enable-exceptions was given.
 if test "${enable_exceptions+set}" = set; then
   enableval=$enable_exceptions;