$NetBSD: patch-ab,v 1.15 2006/10/05 01:24:32 rillig Exp $

--- dist/configure.orig	2006-01-10 17:19:32.000000000 +0100
+++ dist/configure	2006-10-05 03:21:44.000000000 +0200
@@ -5498,6 +5498,7 @@ db_cv_gxx_except=no;
 if test "$GXX" = "yes"; then
 	GXX_VERSION=`${MAKEFILE_CXX} --version`
 	case ${GXX_VERSION} in
+	egcs*)	CXXFLAGS="-fexceptions $CXXFLAGS";;
 	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
 		db_cv_gxx_except=yes;;
 	esac
@@ -5514,7 +5515,7 @@ fi
 # we're using.
 case "$host_os" in
 sysv5UnixWare*|sysv5OpenUNIX8*)
-	if test "$GCC" == "yes"; then
+	if test "$GCC" = "yes"; then
 		CPPFLAGS="$CPPFLAGS -pthread"
 		LDFLAGS="$LDFLAGS -pthread"
 	else
@@ -21564,7 +21565,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
 
 
 SOFLAGS="-rpath \$(libdir)"
-LIBTOOL_PROG="${SHELL} ./libtool"
 
 # Set SOSUFFIX and friends
 
@@ -21656,7 +21656,7 @@ echo "${ECHO_T}$JMODSUFFIX" >&6
 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
 
 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
@@ -22412,7 +22412,7 @@ if test "$_JTOPDIR" != "/usr"; then
 	case "$host_os" in
 	aix*)		_JNI_INC_SUBDIRS="aix";;
 	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
-	freebsd*)	_JNI_INC_SUBDIRS="freebsd";;
+	freebsd*|dragonfly*)	_JNI_INC_SUBDIRS="freebsd";;
 	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
 	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
 	osf*)		_JNI_INC_SUBDIRS="alpha";;
@@ -30835,7 +30835,7 @@ fi
 #
 # If the user specified we use POSIX pthreads mutexes, and we fail to find the
 # full interface, try and configure for just intra-process support.
-if test "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
+if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = "posix_only"; then
 	LIBS="$LIBS -lpthread"
 
 if test "$cross_compiling" = yes; then