$NetBSD: patch-ab,v 1.4 2001/11/30 11:58:28 martti Exp $

--- ../dist/configure.orig	Thu Nov 29 03:04:02 2001
+++ ../dist/configure	Thu Nov 29 03:07:21 2001
@@ -4329,6 +4329,7 @@
 if test "$GXX" = "yes"; then
 	CXXVERSION=`${MAKEFILE_CXX} --version`
 	case ${CXXVERSION} in
+	egcs*)	CXXFLAGS="-fexceptions $CXXFLAGS";;
 	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
 		CXXFLAGS="-fhandle-exceptions $CXXFLAGS";;
 	*)
@@ -8439,7 +8440,7 @@
 # Prevent multiple expansion
 
 LIBTOOL="\$(SHELL) ./libtool"
-SOSUFFIX=`sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/' ./libtool`
+SOSUFFIX=`./libtool --config | sed -e '/^library_names_spec=/!d' -e 's/.*\.\([a-zA-Z0-9_]*\).*/\1/'`
 SOFLAGS="-rpath \$(libdir)"
 
 SAVE_CC="${MAKEFILE_CC}"
@@ -8449,7 +8450,7 @@
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
 MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${SAVE_CXX}"
 
-SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
+SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
 INSTALLER="\$(LIBTOOL) --mode=install cp"
 
 # Configure for shared libraries, static libraries, or both.  If both are