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-ab629
1 files changed, 39 insertions, 590 deletions
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 51a61603fc8..507ea78f248 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,177 +1,8 @@
-$NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
+$NetBSD: patch-ab,v 1.37 2004/04/22 14:40:29 tv Exp $
---- configure.orig Sun Jan 25 07:36:38 2004
+--- configure.orig Thu Apr 22 10:23:09 2004
+++ configure
-@@ -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
-
-@@ -1717,7 +1717,7 @@ else
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--if mkdir -p -- . 2>/dev/null; then
-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
- # $(mkdir_p) $(somedir)
-@@ -1730,7 +1730,7 @@ else
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
-- for d in ./-p ./--;
-+ for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
-@@ -2580,7 +2580,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=$?
-@@ -2638,7 +2639,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=$?
-@@ -2754,7 +2756,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=$?
-@@ -2808,7 +2811,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=$?
-@@ -2853,7 +2857,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=$?
-@@ -2897,7 +2902,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=$?
-@@ -3042,7 +3048,9 @@ else
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -3543,7 +3551,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=$?
-@@ -3601,7 +3610,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=$?
-@@ -3672,7 +3682,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=$?
-@@ -3716,7 +3727,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=$?
-@@ -3790,7 +3802,9 @@ else
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-@@ -4002,7 +4016,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=$?
-@@ -4051,7 +4066,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=$?
-@@ -4424,10 +4440,13 @@ beos*)
+@@ -4440,10 +4440,13 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -189,7 +20,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
;;
cygwin*)
-@@ -4485,6 +4504,10 @@ hpux10.20* | hpux11*)
+@@ -4501,6 +4504,10 @@ hpux10.20* | hpux11*)
esac
;;
@@ -200,47 +31,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
irix5* | irix6* | nonstopux*)
case $LD in
*-32|*"-32 ") libmagic=32-bit;;
-@@ -4745,7 +4768,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=$?
-@@ -5296,7 +5320,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=$?
-@@ -5466,7 +5491,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=$?
-@@ -5533,7 +5559,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=$?
-@@ -6868,6 +6895,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -6888,6 +6895,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -252,7 +43,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
*)
lt_prog_compiler_pic='-fPIC'
;;
-@@ -7243,6 +7275,17 @@ EOF
+@@ -7263,6 +7275,17 @@ EOF
fi
;;
@@ -270,27 +61,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -7457,7 +7500,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=$?
-@@ -7517,7 +7561,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=$?
-@@ -7748,6 +7793,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -7770,6 +7793,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -311,7 +82,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -8136,8 +8195,9 @@ beos*)
+@@ -8158,8 +8195,9 @@ beos*)
;;
bsdi4*)
@@ -322,7 +93,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -8253,15 +8313,15 @@ kfreebsd*-gnu)
+@@ -8275,15 +8313,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -344,7 +115,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_version=yes
;;
esac
-@@ -8337,15 +8397,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -8359,15 +8397,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -373,7 +144,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -8381,7 +8448,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -8403,7 +8448,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -382,7 +153,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8505,7 +8572,7 @@ sco3.2v5*)
+@@ -8527,7 +8572,7 @@ sco3.2v5*)
;;
solaris*)
@@ -391,97 +162,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8708,7 +8775,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=$?
-@@ -8811,7 +8879,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=$?
-@@ -8876,7 +8945,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=$?
-@@ -8969,7 +9039,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=$?
-@@ -9034,7 +9105,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=$?
-@@ -9100,7 +9172,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=$?
-@@ -9166,7 +9239,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=$?
-@@ -10411,7 +10485,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=$?
-@@ -10472,7 +10547,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=$?
-@@ -10746,6 +10822,8 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10777,6 +10822,8 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -490,7 +171,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
irix5* | irix6*)
case $cc_basename in
CC)
-@@ -10854,6 +10932,13 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10885,6 +10932,13 @@ if test -z "$aix_libpath"; then aix_libp
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -504,7 +185,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_direct_CXX=yes
hardcode_shlibpath_var_CXX=no
-@@ -11226,6 +11311,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -11257,6 +11311,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
esac
done
@@ -519,7 +200,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
# Clean up.
rm -f a.out a.exe
else
-@@ -11273,9 +11366,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11304,9 +11366,11 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
@@ -532,7 +213,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
;;
*djgpp*)
# DJGPP does not support shared libraries at all
-@@ -11297,6 +11392,10 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11328,6 +11392,10 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -543,7 +224,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
*)
lt_prog_compiler_pic_CXX='-fPIC'
;;
-@@ -11361,6 +11460,8 @@ echo $ECHO_N "checking for $compiler opt
+@@ -11392,6 +11460,8 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -552,7 +233,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
irix5* | irix6* | nonstopux*)
case $cc_basename in
CC)
-@@ -11829,8 +11930,9 @@ beos*)
+@@ -11860,8 +11930,9 @@ beos*)
;;
bsdi4*)
@@ -563,7 +244,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -11946,15 +12048,15 @@ kfreebsd*-gnu)
+@@ -11977,15 +12048,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -585,7 +266,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_version=yes
;;
esac
-@@ -12030,15 +12132,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -12061,15 +12132,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -614,7 +295,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -12074,7 +12183,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -12105,7 +12183,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -623,7 +304,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12198,7 +12307,7 @@ sco3.2v5*)
+@@ -12229,7 +12307,7 @@ sco3.2v5*)
;;
solaris*)
@@ -632,77 +313,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -12401,7 +12510,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=$?
-@@ -12504,7 +12614,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=$?
-@@ -12569,7 +12680,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=$?
-@@ -12662,7 +12774,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=$?
-@@ -12727,7 +12840,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=$?
-@@ -12793,7 +12907,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=$?
-@@ -12859,7 +12974,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=$?
-@@ -13721,6 +13837,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -13759,6 +13837,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -714,7 +325,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
*)
lt_prog_compiler_pic_F77='-fPIC'
;;
-@@ -14096,6 +14217,17 @@ EOF
+@@ -14134,6 +14217,17 @@ EOF
fi
;;
@@ -732,27 +343,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -14300,7 +14432,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=$?
-@@ -14350,7 +14483,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=$?
-@@ -14581,6 +14715,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14621,6 +14715,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -773,7 +364,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -14969,8 +15117,9 @@ beos*)
+@@ -15009,8 +15117,9 @@ beos*)
;;
bsdi4*)
@@ -784,7 +375,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -15086,15 +15235,15 @@ kfreebsd*-gnu)
+@@ -15126,15 +15235,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -806,7 +397,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_version=yes
;;
esac
-@@ -15170,15 +15319,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -15210,15 +15319,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -835,7 +426,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -15214,7 +15370,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -15254,7 +15370,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -844,7 +435,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -15338,7 +15494,7 @@ sco3.2v5*)
+@@ -15378,7 +15494,7 @@ sco3.2v5*)
;;
solaris*)
@@ -853,7 +444,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -16050,6 +16206,11 @@ echo $ECHO_N "checking for $compiler opt
+@@ -16090,6 +16206,11 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -865,7 +456,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
*)
lt_prog_compiler_pic_GCJ='-fPIC'
;;
-@@ -16425,6 +16586,17 @@ EOF
+@@ -16465,6 +16586,17 @@ EOF
fi
;;
@@ -883,27 +474,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -16639,7 +16811,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=$?
-@@ -16699,7 +16872,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=$?
-@@ -16930,6 +17104,20 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16972,6 +17104,20 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -924,7 +495,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -17318,8 +17506,9 @@ beos*)
+@@ -17360,8 +17506,9 @@ beos*)
;;
bsdi4*)
@@ -935,7 +506,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv 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'
-@@ -17435,15 +17624,15 @@ kfreebsd*-gnu)
+@@ -17477,15 +17624,15 @@ kfreebsd*-gnu)
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
@@ -957,7 +528,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_version=yes
;;
esac
-@@ -17519,15 +17708,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -17561,15 +17708,22 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -986,7 +557,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
esac
need_lib_prefix=no
need_version=no
-@@ -17563,7 +17759,7 @@ linux*oldld* | linux*aout* | linux*coff*
+@@ -17605,7 +17759,7 @@ linux*oldld* | linux*aout* | linux*coff*
# This must be Linux ELF.
linux*)
@@ -995,7 +566,7 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17687,7 +17883,7 @@ sco3.2v5*)
+@@ -17729,7 +17883,7 @@ sco3.2v5*)
;;
solaris*)
@@ -1004,125 +575,3 @@ $NetBSD: patch-ab,v 1.36 2004/04/21 19:24:49 tv Exp $
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17890,7 +18086,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=$?
-@@ -17993,7 +18190,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=$?
-@@ -18058,7 +18256,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=$?
-@@ -18151,7 +18350,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=$?
-@@ -18216,7 +18416,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=$?
-@@ -18282,7 +18483,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=$?
-@@ -18348,7 +18550,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=$?
-@@ -20503,6 +20706,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. */
-@@ -20541,12 +20749,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
-@@ -20718,14 +20920,14 @@ echo X"$mf" |
- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
-- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n -e '/^U = / s///p' < "$mf"`
-+ U=`sed -n 's/^U = //p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
-- for file in `sed -n -e '
-+ for file in `sed -n '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
-@@ -20987,7 +21189,7 @@ echo "$as_me: error: $ac_sub_configure f
- { (exit 1); exit 1; }; }
- fi
-
-- cd "$ac_popdir"
-+ cd $ac_popdir
- done
- fi
-