Updated to 3.11.2 (provided by ORI Manabu in pkg/14765).

This is a bugfix release (too many fixes to list here).

The following link (as long as it exists) gives an overview
of the changes:

http://www.sleepycat.com/update/3.3.11/if.3.3.11.html

2 files changed, 133 insertions, 144 deletions

diff --git a/databases/db3/patches/patch-aa b/databases/db3/patches/patch-aa
index 30c306bd862..42a79b58456 100644
--- a/databases/db3/patches/patch-aa
+++ b/databases/db3/patches/patch-aa
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.7 2001/11/21 23:40:47 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2001/11/30 11:58:28 martti Exp $
 
---- ../dist/Makefile.in.orig	Thu Nov 30 18:07:33 2000
-+++ ../dist/Makefile.in
-@@ -17,7 +17,7 @@
- INSTALLER=	@INSTALLER@
+--- ../dist/Makefile.in.orig	Sat Jul  7 05:53:16 2001
++++ ../dist/Makefile.in	Thu Nov 29 14:19:43 2001
+@@ -11,7 +11,7 @@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	$(prefix)/share/doc/db3
  
- LDFLAGS=	@LDFLAGS@
--LIBDB_ARGS=	@LIBDB_ARGS@
-+LIBDB_ARGS=	$(libso_linkname)
- LIBJSO_LIBS=	@LIBJSO_LIBS@
- LIBS=		@LIBS@
- LIBSO_LIBS=	@LIBSO_LIBS@
-@@ -26,19 +26,19 @@
- LIBXSO_LIBS=	@LIBXSO_LIBS@
+ dmode=	755
+ emode=	555
+@@ -42,7 +42,7 @@
+ LIBTOOL=	@LIBTOOL@
  
  POSTLINK=	@POSTLINK@
 -SOLINK=		@SOLINK@
@@ -20,43 +20,47 @@ $NetBSD: patch-aa,v 1.7 2001/11/21 23:40:47 jlam Exp $
  SOFLAGS=	@SOFLAGS@
  SOMAJOR=	@DB_VERSION_MAJOR@
  SOVERSION=	@DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
+@@ -60,13 +60,13 @@
+ LIBS=		@LIBS@
+ LIBSO_LIBS=	@LIBSO_LIBS@
  
 -libdb=		libdb.a
-+libdb=		$(libso_base).la
- 
 -libso_base=	libdb
--libso_linkname=	$(libso_base)-$(SOVERSION).la
 -libso=		$(libso_base)-$(SOVERSION).@SOSUFFIX@
+-libso_static=	$(libso_base)-$(SOVERSION).a
 -libso_target=	$(libso_base)-$(SOVERSION).la
++libdb=		$(libso_base).la
 +libso_base=	libdb3
-+libso_linkname=	$(libso_base).la
 +libso=		$(libso_base).@SOSUFFIX@.$(SOVERSION)
++libso_static=	$(libso_base).la
 +libso_target=	$(libso_base).la
  libso_default=	$(libso_base).@SOSUFFIX@
 -libso_major=	$(libso_base)-$(SOMAJOR).@SOSUFFIX@
 +libso_major=	$(libso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
- # C++
-@@ -47,12 +47,12 @@
- # You must configure it using:
- #	--enable-cxx
- ##################################################
+ # C++ API.
+@@ -78,13 +78,13 @@
+ CXXLINK=	@MAKEFILE_CXXLINK@
+ LIBXSO_LIBS=	@LIBXSO_LIBS@
+ 
 -libcxx=		libdb_cxx.a
 -libxso_base=	libdb_cxx
 -libxso=		$(libxso_base)-$(SOVERSION).@SOSUFFIX@
+-libxso_static=	$(libxso_base)-$(SOVERSION).a
 -libxso_target=	$(libxso_base)-$(SOVERSION).la
 +libcxx=		libdb3_cxx.a
 +libxso_base=	libdb3_cxx
 +libxso=		$(libxso_base).@SOSUFFIX@.$(SOVERSION)
++libxso_static=	$(libxso_base).a
 +libxso_target=	$(libxso_base).la
  libxso_default=	$(libxso_base).@SOSUFFIX@
 -libxso_major=	$(libxso_base)-$(SOMAJOR).@SOSUFFIX@
 +libxso_major=	$(libxso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
- # JAVA
-@@ -72,13 +72,13 @@
+ # Java API.
+@@ -104,13 +104,13 @@
  JAVA_DBDIR=	$(JAVA_SRCDIR)/$(JAVA_DBREL)
  JAVA_EXDIR=	$(JAVA_SRCDIR)/com/sleepycat/examples
  
@@ -75,11 +79,11 @@ $NetBSD: patch-aa,v 1.7 2001/11/21 23:40:47 jlam Exp $
 +libjso_g=	$(libjso_base)_g.@SOSUFFIX@.$(SOVERSION)
  
  ##################################################
- # TCL
-@@ -88,11 +88,11 @@
- #	--enable-tcl --with-tcl=DIR --enable-dynamic
+ # TCL API.
+@@ -119,11 +119,11 @@
  ##################################################
  TCFLAGS=	@TCFLAGS@
+ LIBTSO_LIBS=	@LIBTSO_LIBS@
 -libtso_base=	libdb_tcl
 -libtso=		$(libtso_base)-$(SOVERSION).@SOSUFFIX@
 -libtso_target=	$(libtso_base)-$(SOVERSION).la
@@ -91,72 +95,64 @@ $NetBSD: patch-aa,v 1.7 2001/11/21 23:40:47 jlam Exp $
 +libtso_major=	$(libtso_base).@SOSUFFIX@.$(SOMAJOR)
  
  ##################################################
- # DB_DUMP185 UTILITY
-@@ -115,7 +115,7 @@
- bindir=	@bindir@
- includedir=@includedir@
- libdir=	@libdir@
--docdir=	$(prefix)/docs
-+docdir=	$(prefix)/share/doc/db3
- 
- dmode=	755
- emode=	555
-@@ -192,8 +192,8 @@
- 	db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@ \
- 	db_upgrade@o@ db_verify@o@ util_log@o@ util_sig@o@ 
+ # db_dump185 UTILITY
+@@ -239,8 +239,8 @@
+ 	perf_util@o@
  
--PROGS=  @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
+ UTIL_PROGS=\
+-	@ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
 -	db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
-+PROGS=  @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
++	@ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
 +	db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify
  
- JAVA_DBSRCS=\
- 	$(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \
-@@ -230,14 +230,6 @@
  ##################################################
- all:	@DEFAULT_LIB@ @ADDITIONAL_LIBS@ @ADDITIONAL_LANG@ $(PROGS)
+ # We're building a standard library or a RPM file hierarchy, potentially
+@@ -255,14 +255,6 @@
+ ##################################################
+ library_build: $(DEF_LIB) @ADDITIONAL_LIBS@ @ADDITIONAL_LANG@ $(UTIL_PROGS)
  
--$(libdb): $(OBJS)
--	$(ar) $@ $(OBJS)
+-$(libdb): $(C_OBJS)
+-	$(ar) cr $@ $(C_OBJS)
 -	test ! -f $(ranlib) || $(ranlib) $@
 -
--$(libcxx): $(COBJS) $(OBJS)
--	$(ar) $@ $(COBJS) $(OBJS)
+-$(libcxx): $(CXX_OBJS) $(C_OBJS)
+-	$(ar) cr $@ $(CXX_OBJS) $(C_OBJS)
 -	test ! -f $(ranlib) || $(ranlib) $@
 -
- $(libso_target): $(OBJS)
- 	$(SOLINK) $(SOFLAGS) -o $(libso_target) \
- 	    $(OBJS) $(LDFLAGS) $(LIBSO_LIBS)
-@@ -275,57 +267,57 @@
+ $(libso_target): $(C_OBJS)
+ 	$(SOLINK) $(SOFLAGS) -o $@ $(C_OBJS) $(LDFLAGS) $(LIBSO_LIBS)
+ 
+@@ -293,58 +285,58 @@
  ##################################################
  # Utilities
  ##################################################
--berkeley_db_svc: $(RPC_SRV) util_log@o@ @DEFAULT_LIB@
-+berkeley_db3_svc: $(RPC_SRV) util_log@o@ @DEFAULT_LIB@
- 	$(CCLINK) -o $@ $(LDFLAGS) $(RPC_SRV) util_log@o@ $(LIBDB_ARGS) $(LIBS)
+-berkeley_db_svc: $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB)
++berkeley_db3_svc: $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) \
+ 	    $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
+-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
++db3_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_archive@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
++db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_checkpoint@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
++db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_deadlock@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
- 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
++db3_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
 -db_dump185: db_dump185@o@ @LIBOBJS@
@@ -164,111 +160,104 @@ $NetBSD: patch-aa,v 1.7 2001/11/21 23:40:47 jlam Exp $
  	$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
  	$(POSTLINK) $@
  
--db_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
- 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
++db3_load: db_load@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
+-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
++db3_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_printlog@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
+-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
++db3_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_recover@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
- 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
++db3_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
+ 	$(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
+-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
++db3_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_upgrade@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
  
--db_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
+-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
++db3_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
  	$(CCLINK) -o $@ $(LDFLAGS) \
- 	    db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ 	    db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
  	$(POSTLINK) $@
-@@ -409,12 +401,9 @@
- 
+@@ -365,12 +357,9 @@
+ INCINC=	db_cxx.h cxx_common.h cxx_except.h
  install_include:
  	@echo "Installing DB include files: $(includedir) ..."
 -	@test -d $(includedir) || \
 -	    ($(mkdir) -p $(includedir) && $(chmod) $(dmode) $(includedir))
--	@cd $(includedir) && $(rm) -f db.h db_185.h db_cxx.h
--	@$(cp) -p db.h \
+-	@cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
+-	@$(cp) -p $(INCDOT) $(includedir)
+-	@cd $(srcdir)/include/ && $(cp) -p $(INCINC) $(includedir)
+-	@cd $(includedir) && $(chmod) $(fmode) $(INCDOT) $(INCINC)
 +	${BSD_INSTALL_DATA_DIR} $(includedir)
-+	${BSD_INSTALL_DATA} db.h \
- 	    $(srcdir)/include/db_cxx.h @ADDITIONAL_INCS@ $(includedir)
--	@cd $(includedir) && $(chmod) $(fmode) db.h db_cxx.h @ADDITIONAL_INCS@
++	${BSD_INSTALL_DATA} $(INCDOT) $(includedir)
++	@cd $(srcdir)/include/ && ${BSD_INSTALL_DATA} $(INCINC) $(includedir)
  
  uninstall_include:
- 	-cd $(includedir) && $(rm) -f db.h db_185.h db_cxx.h
-@@ -452,8 +441,6 @@
+ 	-cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
+@@ -401,10 +390,7 @@
  	@cd $(libdir) && $(rm) -f \
- 	    $(libso_target) $(libso) $(libso_default) $(libso_major)
+ 	    $(libso) $(libso_target) $(libso_default) $(libso_major)
  	@$(INSTALLER) $(libso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libso) $(libso_default)
 -	@cd $(libdir) && $(ln) -s $(libso) $(libso_major)
  	@$(LIBTOOL) --mode=finish $(libdir)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
  
- install_dynamic_cxx:
-@@ -463,8 +450,6 @@
+ install_static_cxx:
+ 	@echo "Installing DB C++ static library: $(libdir) ..."
+@@ -421,9 +407,6 @@
  	@cd $(libdir) && $(rm) -f \
- 	    $(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
+ 	    $(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
  	@$(INSTALLER) $(libxso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
 -	@cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
  
  install_tcl:
  	@echo "Installing DB Tcl library: $(libdir) ..."
-@@ -473,8 +458,6 @@
+@@ -432,9 +415,6 @@
  	@cd $(libdir) && $(rm) -f \
- 	    $(libtso_target) $(libtso) $(libtso_default) $(libtso_major)
+ 	    $(libtso) $(libtso_target) $(libtso_default) $(libtso_major)
  	@$(INSTALLER) $(libtso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_default)
 -	@cd $(libdir) && $(ln) -s $(libtso) $(libtso_major)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libtso) $(libtso_target)
  
  install_java:
  	@echo "Installing DB Java library: $(libdir) ..."
-@@ -483,27 +466,21 @@
- 	@cd $(libdir) && $(rm) -f \
- 	    $(libjso_target) $(libjso) $(libjso_default) $(libjso_major)
+@@ -443,10 +423,6 @@
+ 	@cd $(libdir) && $(rm) -f $(libjso_g) \
+ 	    $(libjso) $(libjso_target) $(libjso_default) $(libjso_major)
  	@$(INSTALLER) $(libjso_target) $(libdir)
 -	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_default)
 -	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_major)
 -	@cd $(libdir) && $(ln) -s $(libjso) $(libjso_g)
+-	@cd $(libdir) && $(chmod) $(fmode) $(libjso) $(libjso_target)
  	@$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(libdir)
  
  install_utilities:
- 	@echo "Installing DB utilities: $(bindir) ..."
--	@test -d $(bindir) || \
--	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
--	@cd $(bindir) && $(rm) -f $(PROGS)
--	@$(INSTALLER) -fp $(PROGS) $(bindir)
--	@cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS))
--	@cd $(bindir) && $(chmod) $(emode) $(PROGS)
-+	${BSD_INSTALL_PROGRAM_DIR} $(bindir)
-+	for i in $(PROGS); do \
-+		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} $$i $(bindir); \
-+	done
- 
- uninstall_utilities:
- 	-cd $(bindir) && $(rm) -f $(PROGS)
- 
+@@ -466,8 +442,7 @@
+ 	sleepycat utility
  install_docs:
  	@echo "Installing documentation: $(docdir) ..."
 -	@test -d $(docdir) || \
 -	    ($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir))
 +	${BSD_INSTALL_DATA_DIR} $(docdir)
- 	@cd $(docdir) && $(rm) -rf *
- 	@cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
+ 	@cd $(docdir) && $(rm) -rf $(DOCLIST)
+ 	@cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(docdir)/
  
diff --git a/databases/db3/patches/patch-ab b/databases/db3/patches/patch-ab
index bd587bab2b8..e1bb34af5b5 100644
--- a/databases/db3/patches/patch-ab
+++ b/databases/db3/patches/patch-ab
@@ -1,30 +1,30 @@
-$NetBSD: patch-ab,v 1.3 2001/03/28 21:49:40 wennmach Exp $
+$NetBSD: patch-ab,v 1.4 2001/11/30 11:58:28 martti Exp $
 
---- ../dist/configure.orig	Wed Jan 24 15:16:18 2001
-+++ ../dist/configure	Thu Mar 22 17:36:06 2001
-@@ -1605,6 +1605,7 @@
+--- ../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].* )
+ 	1.*|2.[01234567].*|*-1.*|*-2.[01234567].*)
  		CXXFLAGS="-fhandle-exceptions $CXXFLAGS";;
- 	* )	CXXFLAGS="-fexceptions $CXXFLAGS";;
-@@ -1632,7 +1633,7 @@
- 		--disable-static \
- 	|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 	*)
+@@ -8439,7 +8440,7 @@
+ # Prevent multiple expansion
  
--	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/'`
- 	DEFAULT_LIB="\$(libso_target)"
- 	DEFAULT_INSTALL="install_dynamic"
- 	LIBDB_ARGS="\$(libso_linkname)"
-@@ -1644,7 +1645,7 @@
+ 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)"
  
- 	INSTALLER="\$(LIBTOOL) --mode=install cp"
- 	POSTLINK="\$(LIBTOOL) --mode=execute true"
--	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
-+	SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
- 	SOFLAGS="-rpath \$(libdir)"
- 	o=".lo"
- fi
+ 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