summaryrefslogtreecommitdiff
path: root/devel/libtool/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libtool/patches/patch-ab')
-rw-r--r--devel/libtool/patches/patch-ab589
1 files changed, 541 insertions, 48 deletions
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index e51172ab3a0..b71d5efa6b3 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
+$NetBSD: patch-ab,v 1.52 2005/05/18 14:40:04 tv Exp $
---- configure.orig Mon May 16 11:33:42 2005
+--- configure.orig 2005-05-18 09:53:15.000000000 -0400
+++ configure
@@ -322,11 +322,11 @@ else
@@ -16,7 +16,136 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
test "X$CONFIG_SHELL" != X/bin/ksh; then
# If we have ksh, try running configure again with it.
-@@ -4522,6 +4522,10 @@ hpux10.20* | hpux11*)
+@@ -1156,7 +1156,7 @@ esac
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+
+@@ -2592,7 +2592,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2650,7 +2651,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2766,7 +2768,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2820,7 +2823,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2865,7 +2869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2909,7 +2914,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3562,7 +3568,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3620,7 +3627,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3691,7 +3699,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3735,7 +3744,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4030,7 +4040,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4079,7 +4090,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4522,6 +4534,10 @@ hpux10.20* | hpux11*)
esac
;;
@@ -27,7 +156,47 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -5674,12 +5678,7 @@ fi
+@@ -4771,7 +4787,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5322,7 +5339,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5492,7 +5510,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5559,7 +5578,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5674,12 +5694,7 @@ fi
done
@@ -41,7 +210,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5909,8 +5908,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+@@ -5909,8 +5924,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -50,7 +219,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
-@@ -6936,9 +6933,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6936,9 +6949,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -63,7 +232,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
;;
msdosdjgpp*)
-@@ -6967,6 +6966,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6967,6 +6982,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -75,7 +244,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
*)
lt_prog_compiler_pic='-fPIC'
;;
-@@ -7435,6 +7439,17 @@ EOF
+@@ -7435,6 +7455,17 @@ EOF
fi
;;
@@ -93,7 +262,27 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7798,7 +7813,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7622,7 +7653,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7682,7 +7714,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7798,7 +7831,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -102,7 +291,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -7913,6 +7928,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7913,6 +7946,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -124,7 +313,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -8316,6 +8346,7 @@ beos*)
+@@ -8316,6 +8364,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -132,7 +321,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -8433,15 +8464,16 @@ freebsd* | dragonfly*)
+@@ -8433,15 +8482,16 @@ freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -155,7 +344,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
need_version=yes
;;
esac
-@@ -8517,15 +8549,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8517,15 +8567,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -184,7 +373,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -8602,11 +8641,11 @@ knetbsd*-gnu)
+@@ -8602,11 +8659,11 @@ knetbsd*-gnu)
;;
netbsd*)
@@ -198,7 +387,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -8637,14 +8676,14 @@ nto-qnx*)
+@@ -8637,14 +8694,14 @@ nto-qnx*)
;;
openbsd*)
@@ -215,7 +404,77 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -10203,9 +10242,7 @@ echo "$as_me: error: tag name \"$tagname
+@@ -8892,7 +8949,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8995,7 +9053,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9060,7 +9119,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9153,7 +9213,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9218,7 +9279,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9284,7 +9346,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9350,7 +9413,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10203,9 +10267,7 @@ echo "$as_me: error: tag name \"$tagname
case $tagname in
CXX)
@@ -226,7 +485,27 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -10781,7 +10818,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10592,7 +10654,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10653,7 +10716,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10781,7 +10845,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -235,7 +514,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -10939,6 +10976,16 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10939,6 +11003,16 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -252,7 +531,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6*)
case $cc_basename in
CC*)
-@@ -11069,14 +11116,29 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11069,14 +11143,29 @@ if test -z "$aix_libpath"; then aix_libp
;;
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -284,7 +563,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
;;
openbsd2*)
# C++ shared libraries are fairly broken
-@@ -11463,6 +11525,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11463,6 +11552,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@@ -306,7 +585,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
# Clean up.
rm -f a.out a.exe
else
-@@ -11510,9 +11587,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11510,9 +11614,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -319,7 +598,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -11534,6 +11613,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11534,6 +11640,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -330,7 +609,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
-@@ -11608,6 +11691,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11608,6 +11718,8 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -339,7 +618,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC*)
-@@ -12088,6 +12173,7 @@ beos*)
+@@ -12088,6 +12200,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -347,7 +626,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -12205,15 +12291,16 @@ freebsd* | dragonfly*)
+@@ -12205,15 +12318,16 @@ freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -370,7 +649,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
need_version=yes
;;
esac
-@@ -12289,15 +12376,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12289,15 +12403,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -399,7 +678,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -12374,11 +12468,11 @@ knetbsd*-gnu)
+@@ -12374,11 +12495,11 @@ knetbsd*-gnu)
;;
netbsd*)
@@ -413,7 +692,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -12409,14 +12503,14 @@ nto-qnx*)
+@@ -12409,14 +12530,14 @@ nto-qnx*)
;;
openbsd*)
@@ -430,7 +709,77 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -13984,9 +14078,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -12664,7 +12785,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12767,7 +12889,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12832,7 +12955,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12925,7 +13049,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12990,7 +13115,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13056,7 +13182,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13122,7 +13249,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13984,9 +14112,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -443,7 +792,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
;;
msdosdjgpp*)
-@@ -14015,6 +14111,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -14015,6 +14145,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -455,7 +804,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
-@@ -14483,6 +14584,17 @@ EOF
+@@ -14483,6 +14618,17 @@ EOF
fi
;;
@@ -473,7 +822,27 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14826,7 +14938,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14660,7 +14806,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14710,7 +14857,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14826,7 +14974,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -482,7 +851,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -14941,6 +15053,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14941,6 +15089,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -504,7 +873,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -15344,6 +15471,7 @@ beos*)
+@@ -15344,6 +15507,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -512,7 +881,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -15461,15 +15589,16 @@ freebsd* | dragonfly*)
+@@ -15461,15 +15625,16 @@ freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -535,7 +904,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
need_version=yes
;;
esac
-@@ -15545,15 +15674,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15545,15 +15710,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -564,7 +933,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -15630,11 +15766,11 @@ knetbsd*-gnu)
+@@ -15630,11 +15802,11 @@ knetbsd*-gnu)
;;
netbsd*)
@@ -578,7 +947,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -15665,14 +15801,14 @@ nto-qnx*)
+@@ -15665,14 +15837,14 @@ nto-qnx*)
;;
openbsd*)
@@ -595,7 +964,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -16432,9 +16568,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16432,9 +16604,11 @@ echo $ECHO_N "checking for $compiler opt
;;
darwin* | rhapsody*)
@@ -608,7 +977,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
;;
msdosdjgpp*)
-@@ -16463,6 +16601,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16463,6 +16637,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -620,7 +989,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
-@@ -16931,6 +17074,17 @@ EOF
+@@ -16931,6 +17110,17 @@ EOF
fi
;;
@@ -638,7 +1007,27 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -17294,7 +17448,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17118,7 +17308,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17178,7 +17369,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17294,7 +17486,7 @@ if test -z "$aix_libpath"; then aix_libp
archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -647,7 +1036,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -17409,6 +17563,21 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -17409,6 +17601,21 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -669,7 +1058,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-@@ -17812,6 +17981,7 @@ beos*)
+@@ -17812,6 +18019,7 @@ beos*)
bsdi[45]*)
version_type=linux
need_version=no
@@ -677,7 +1066,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -17929,15 +18099,16 @@ freebsd* | dragonfly*)
+@@ -17929,15 +18137,16 @@ freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -700,7 +1089,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
need_version=yes
;;
esac
-@@ -18013,15 +18184,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -18013,15 +18222,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -729,7 +1118,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -18098,11 +18276,11 @@ knetbsd*-gnu)
+@@ -18098,11 +18314,11 @@ knetbsd*-gnu)
;;
netbsd*)
@@ -743,7 +1132,7 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
-@@ -18133,14 +18311,14 @@ nto-qnx*)
+@@ -18133,14 +18349,14 @@ nto-qnx*)
;;
openbsd*)
@@ -760,3 +1149,107 @@ $NetBSD: patch-ab,v 1.51 2005/05/18 11:57:12 adam Exp $
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+@@ -18388,7 +18604,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18491,7 +18708,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18556,7 +18774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18649,7 +18868,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18714,7 +18934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18780,7 +19001,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18846,7 +19068,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -21039,6 +21262,11 @@ esac
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -21077,12 +21305,6 @@ echo "$as_me: error: cannot find input f
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+@@ -21517,7 +21739,7 @@ echo "$as_me: error: $ac_sub_configure f
+ { (exit 1); exit 1; }; }
+ fi
+
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+