$NetBSD: patch-ab,v 1.2 2009/07/12 10:34:19 hasso Exp $ --- dist/configure.orig 2007-09-27 18:32:04 +0300 +++ dist/configure 2009-07-11 22:40:41 +0300 @@ -3735,7 +3735,7 @@ bsdi3*) CC=${CC-"shlicc2"} LIBSO_LIBS="$LIBSO_LIBS -lipc";; cygwin*) CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; -freebsd*) +freebsd*|dragonfly*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" LDFLAGS="$LDFLAGS -pthread";; gnu*|k*bsd*-gnu|linux*) @@ -5938,6 +5938,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 @@ -5954,7 +5955,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 @@ -21078,7 +21079,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo SOFLAGS="-rpath \$(libdir)" -LIBTOOL_PROG="${SHELL} ./libtool" # Set SOSUFFIX and friends @@ -21170,7 +21170,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" @@ -21937,7 +21937,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";; @@ -28547,10 +28547,12 @@ typedef FILE ac__type_new_; int main () { +#ifndef __DragonFly__ if ((ac__type_new_ *) 0) return 0; if (sizeof (ac__type_new_)) return 0; +#endif ; return 0; } @@ -29859,7 +29861,7 @@ rm -f core conftest.err conftest.$ac_obj # 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