diff options
author | tv <tv@pkgsrc.org> | 2004-04-22 14:40:29 +0000 |
---|---|---|
committer | tv <tv@pkgsrc.org> | 2004-04-22 14:40:29 +0000 |
commit | c46bf70f731a215b7569beb9071acaa9266109d0 (patch) | |
tree | 52b33d86f02eb179974f09898c97ecc3c6236104 /devel | |
parent | 1f38a6c5c72085261a248e49c58665fb08f84c9f (diff) | |
download | pkgsrc-c46bf70f731a215b7569beb9071acaa9266109d0.tar.gz |
Update to 1.5.6 (OK'd by skrll).
* In libtool-base, generate shlibtool with a simple sed script; no full
build is actually needed.
Changelog:
New in 1.5.6: 2004-04-11; CVS version 1.5.5a, Libtool team:
* Installs libltdl files properly in $prefix/share/libtool/libltdl. 1.5.4
did not install them at all.
* libltdl correctly guesses the extension for loadable modules again.
New in 1.5.4: 2004-04-03; CVS version 1.5.3a, Libtool team:
* Bug fixes.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libtool-base/Makefile | 25 | ||||
-rw-r--r-- | devel/libtool/Makefile.common | 5 | ||||
-rw-r--r-- | devel/libtool/distinfo | 12 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 629 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ac | 99 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ad | 887 |
6 files changed, 126 insertions, 1531 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 89a8ef7fa60..e2939b4485c 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/02/29 10:28:24 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2004/04/22 14:40:29 tv Exp $ # PKGNAME= ${DISTNAME:C/-/-base-/} @@ -26,7 +26,7 @@ DEPENDS+= c++rt0>=1.0:../../sysutils/c++rt0 .if ${OPSYS} == "NetBSD" . if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) -CONFIGURE_ARGS= --disable-shared +5~CONFIGURE_ARGS= --disable-shared BUILD_SHLIBTOOL= NO . endif .else @@ -56,7 +56,6 @@ CONFIGURE_ENV+= lt_cv_path_NM="nm -p" .endif BUILD_SHLIBTOOL?= YES -BUILDING_SHLIBTOOL?= NO .PHONY: fix-libtool fix-libtool: @@ -68,26 +67,18 @@ fix-libtool: post-build: fix-libtool -.if ${BUILDING_SHLIBTOOL} == "YES" -CONFIGURE_ARGS+= --disable-static -.else -SHLIBTOOL_WRKDIR= ${WRKDIR}/shlibtool -SHLIBTOOL_WRKSRC= ${WRKSRC:S/${WRKDIR}/${SHLIBTOOL_WRKDIR}/} -SHLIBTOOL_MAKEFLAGS= BUILDING_SHLIBTOOL=YES -SHLIBTOOL_MAKEFLAGS+= WRKDIR=${SHLIBTOOL_WRKDIR} - -. if ${BUILD_SHLIBTOOL} == "NO" +.if ${BUILD_SHLIBTOOL} == "NO" PLIST_SUBST+= SHLIBTOOL="@comment " -. else +.else PLIST_SUBST+= SHLIBTOOL= post-build: - cd ${.CURDIR} && ${MAKE} build ${SHLIBTOOL_MAKEFLAGS} + cd ${WRKSRC} && \ + ${SED} -e '/^# Whether or not to build static/{n;s/yes/no/;}' \ + < libtool > shlibtool post-install: - ${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool \ - ${PREFIX}/bin/shlibtool -. endif + ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index e83fbf42e39..087b5e1bc19 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.common,v 1.50 2004/04/21 14:55:32 tv Exp $ +# $NetBSD: Makefile.common,v 1.51 2004/04/22 14:40:29 tv Exp $ # -DISTNAME= libtool-1.5.2 -PKGREVISION= 7 +DISTNAME= libtool-1.5.6 CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 03b5f73936c..2192592d578 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.41 2004/04/21 19:24:49 tv Exp $ +$NetBSD: distinfo,v 1.42 2004/04/22 14:40:29 tv Exp $ -SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260 -Size (libtool-1.5.2.tar.gz) = 2653072 bytes +SHA1 (libtool-1.5.6.tar.gz) = 6018b2661725e9689d7f782c5a2a489e928698ba +Size (libtool-1.5.6.tar.gz) = 2665434 bytes SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e -SHA1 (patch-ab) = 9579b82ec97663665f1cfc6e61f965f95b0e0b95 -SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715 -SHA1 (patch-ad) = 97be231b803d8a058dfa11930f3314126837ed35 +SHA1 (patch-ab) = 8fd750bc0d6a5cd247f7788909325abd073efabf +SHA1 (patch-ac) = 998846b81d9e69d4ff469d644377a57f83a1adc1 +SHA1 (patch-ad) = 83172e62964fd3e666b4e47101970ec27769dc5c 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 - diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 0cb24e47ca9..61704587a41 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,22 +1,13 @@ -$NetBSD: patch-ac,v 1.11 2004/02/18 07:55:51 skrll Exp $ +$NetBSD: patch-ac,v 1.12 2004/04/22 14:40:29 tv Exp $ ---- ltmain.sh.orig Wed Feb 18 07:53:05 2004 +--- ltmain.sh.orig Sun Apr 11 01:44:45 2004 +++ ltmain.sh -@@ -318,7 +318,7 @@ if test -z "$show_help"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 - case $nonopt in -- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) -+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC) - mode=link - for arg - do -@@ -525,10 +525,26 @@ if test -z "$show_help"; then - case $base_compile in +@@ -192,10 +192,26 @@ func_infer_tag () { + case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; -+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) +- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; ++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) + tagname=CC + ;; # Blanks at the start of $base_compile will cause this to fail @@ -37,56 +28,28 @@ $NetBSD: patch-ac,v 1.11 2004/02/18 07:55:51 skrll Exp $ + fi + if test -n "$available_tags" && test -z "$tagname"; then for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. -@@ -554,8 +570,6 @@ if test -z "$show_help"; then +@@ -231,8 +247,6 @@ func_infer_tag () { # else # $echo "$modename: using $tagname tagged configuration" fi - ;; - esac fi - - for arg in $later; do -@@ -912,10 +926,26 @@ EOF - case $base_compile in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. -- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; -+ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) -+ tagname=CC -+ ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) -+ base_compiler=`$echo $base_compile | awk '{ print $1 }'` -+ case $base_compiler in -+ *cc) -+ tagname=CC -+ ;; -+ *++) -+ tagname=CXX -+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ if test -n "$available_tags" && test -z "$tagname"; then - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then - # Evaluate the configuration. -@@ -941,8 +971,6 @@ EOF - # else - # $echo "$modename: using $tagname tagged configuration" - fi -- ;; -- esac - fi - - # We need to know -static, to get the right output filenames. -@@ -1180,6 +1208,13 @@ EOF - exit 1 + } + # End of Shell function definitions +@@ -401,7 +415,7 @@ if test -z "$show_help"; then + $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 + $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 + case $nonopt in +- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) ++ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC) + mode=link + for arg + do +@@ -1185,6 +1199,13 @@ EOF + exit $EXIT_FAILURE ;; esac + # Canonicalise the pathname @@ -99,7 +62,7 @@ $NetBSD: patch-ac,v 1.11 2004/02/18 07:55:51 skrll Exp $ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; -@@ -2967,8 +3002,8 @@ EOF +@@ -2983,8 +3004,8 @@ EOF darwin) # Like Linux, but with the current version available in # verstring for coding it into the library header @@ -110,8 +73,8 @@ $NetBSD: patch-ac,v 1.11 2004/02/18 07:55:51 skrll Exp $ # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" -@@ -5365,8 +5400,16 @@ relink_command=\"$relink_command\"" - exit 1 +@@ -5384,8 +5405,16 @@ relink_command=\"$relink_command\"" + exit $EXIT_FAILURE fi - # Strip any trailing slash from the destination. @@ -129,17 +92,3 @@ $NetBSD: patch-ac,v 1.11 2004/02/18 07:55:51 skrll Exp $ # Check to see that the destination is a directory. test -d "$dest" && isdir=yes -@@ -5673,8 +5716,12 @@ relink_command=\"$relink_command\"" - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" -- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : -+ save_umask=`umask` -+ umask 0077 -+ if $mkdir "$tmpdir"; then -+ umask $save_umask - else -+ umask $save_umask - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index a8da2c5a8bb..4f0de38732a 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,126 +1,8 @@ -$NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ +$NetBSD: patch-ad,v 1.11 2004/04/22 14:40:29 tv Exp $ ---- libltdl/configure.orig Sun Jan 25 07:36:58 2004 +--- libltdl/configure.orig Thu Apr 22 10:23:13 2004 +++ libltdl/configure -@@ -1153,7 +1153,7 @@ esac - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi -- cd "$ac_popdir" -+ cd $ac_popdir - done - fi - -@@ -1714,7 +1714,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) -@@ -1727,7 +1727,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 -@@ -2529,7 +2529,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=$? -@@ -2587,7 +2588,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=$? -@@ -2703,7 +2705,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=$? -@@ -2757,7 +2760,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=$? -@@ -2802,7 +2806,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=$? -@@ -2846,7 +2851,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=$? -@@ -2991,7 +2997,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 - -@@ -3128,7 +3136,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=$? -@@ -3188,7 +3197,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=$? -@@ -3642,10 +3652,13 @@ beos*) +@@ -3652,10 +3652,13 @@ beos*) lt_cv_deplibs_check_method=pass_all ;; @@ -138,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ ;; cygwin*) -@@ -3703,6 +3716,10 @@ hpux10.20* | hpux11*) +@@ -3713,6 +3716,10 @@ hpux10.20* | hpux11*) esac ;; @@ -149,118 +31,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ irix5* | irix6* | nonstopux*) case $LD in *-32|*"-32 ") libmagic=32-bit;; -@@ -3963,7 +3980,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=$? -@@ -4514,7 +4532,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=$? -@@ -4684,7 +4703,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=$? -@@ -4751,7 +4771,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=$? -@@ -5011,7 +5032,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=$? -@@ -5069,7 +5091,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=$? -@@ -5140,7 +5163,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=$? -@@ -5184,7 +5208,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=$? -@@ -5258,7 +5283,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 - -@@ -5688,7 +5715,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=$? -@@ -5737,7 +5765,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=$? -@@ -6773,6 +6802,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -6795,6 +6802,11 @@ echo $ECHO_N "checking for $compiler opt esac ;; @@ -272,7 +43,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ *) lt_prog_compiler_pic='-fPIC' ;; -@@ -7148,6 +7182,17 @@ EOF +@@ -7170,6 +7182,17 @@ EOF fi ;; @@ -290,27 +61,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -7362,7 +7407,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=$? -@@ -7422,7 +7468,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=$? -@@ -7653,6 +7700,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -7677,6 +7700,20 @@ if test -z "$aix_libpath"; then aix_libp fi ;; @@ -331,7 +82,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -8041,8 +8102,9 @@ beos*) +@@ -8065,8 +8102,9 @@ beos*) ;; bsdi4*) @@ -342,7 +93,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -8158,15 +8220,15 @@ kfreebsd*-gnu) +@@ -8182,15 +8220,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -364,7 +115,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ need_version=yes ;; esac -@@ -8242,15 +8304,22 @@ hpux9* | hpux10* | hpux11*) +@@ -8266,15 +8304,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; @@ -393,7 +144,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -8286,7 +8355,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -8310,7 +8355,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -402,7 +153,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -8410,7 +8479,7 @@ sco3.2v5*) +@@ -8434,7 +8479,7 @@ sco3.2v5*) ;; solaris*) @@ -411,97 +162,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -8613,7 +8682,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=$? -@@ -8716,7 +8786,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=$? -@@ -8781,7 +8852,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=$? -@@ -8874,7 +8946,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=$? -@@ -8939,7 +9012,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=$? -@@ -9005,7 +9079,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=$? -@@ -9071,7 +9146,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=$? -@@ -10316,7 +10392,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=$? -@@ -10377,7 +10454,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=$? -@@ -10651,6 +10729,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10684,6 +10729,8 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; @@ -510,7 +171,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ irix5* | irix6*) case $cc_basename in CC) -@@ -10759,6 +10839,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10792,6 +10839,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= @@ -524,7 +185,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no -@@ -11131,6 +11218,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -11164,6 +11218,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c esac done @@ -539,7 +200,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ # Clean up. rm -f a.out a.exe else -@@ -11178,9 +11273,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -11211,9 +11273,11 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -552,7 +213,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -11202,6 +11299,10 @@ echo $ECHO_N "checking for $compiler opt +@@ -11235,6 +11299,10 @@ echo $ECHO_N "checking for $compiler opt ;; esac ;; @@ -563,7 +224,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ *) lt_prog_compiler_pic_CXX='-fPIC' ;; -@@ -11266,6 +11367,8 @@ echo $ECHO_N "checking for $compiler opt +@@ -11299,6 +11367,8 @@ echo $ECHO_N "checking for $compiler opt ;; esac ;; @@ -572,7 +233,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ irix5* | irix6* | nonstopux*) case $cc_basename in CC) -@@ -11734,8 +11837,9 @@ beos*) +@@ -11767,8 +11837,9 @@ beos*) ;; bsdi4*) @@ -583,7 +244,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -11851,15 +11955,15 @@ kfreebsd*-gnu) +@@ -11884,15 +11955,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -605,7 +266,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ need_version=yes ;; esac -@@ -11935,15 +12039,22 @@ hpux9* | hpux10* | hpux11*) +@@ -11968,15 +12039,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; @@ -634,7 +295,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -11979,7 +12090,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -12012,7 +12090,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -643,7 +304,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -12103,7 +12214,7 @@ sco3.2v5*) +@@ -12136,7 +12214,7 @@ sco3.2v5*) ;; solaris*) @@ -652,77 +313,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -12306,7 +12417,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=$? -@@ -12409,7 +12521,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=$? -@@ -12474,7 +12587,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=$? -@@ -12567,7 +12681,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=$? -@@ -12632,7 +12747,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=$? -@@ -12698,7 +12814,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=$? -@@ -12764,7 +12881,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=$? -@@ -13626,6 +13744,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -13666,6 +13744,11 @@ echo $ECHO_N "checking for $compiler opt esac ;; @@ -734,7 +325,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ *) lt_prog_compiler_pic_F77='-fPIC' ;; -@@ -14001,6 +14124,17 @@ EOF +@@ -14041,6 +14124,17 @@ EOF fi ;; @@ -752,27 +343,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -14205,7 +14339,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=$? -@@ -14255,7 +14390,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=$? -@@ -14486,6 +14622,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -14528,6 +14622,20 @@ if test -z "$aix_libpath"; then aix_libp fi ;; @@ -793,7 +364,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -14874,8 +15024,9 @@ beos*) +@@ -14916,8 +15024,9 @@ beos*) ;; bsdi4*) @@ -804,7 +375,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -14991,15 +15142,15 @@ kfreebsd*-gnu) +@@ -15033,15 +15142,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -826,7 +397,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ need_version=yes ;; esac -@@ -15075,15 +15226,22 @@ hpux9* | hpux10* | hpux11*) +@@ -15117,15 +15226,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; @@ -855,7 +426,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -15119,7 +15277,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -15161,7 +15277,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -864,7 +435,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -15243,7 +15401,7 @@ sco3.2v5*) +@@ -15285,7 +15401,7 @@ sco3.2v5*) ;; solaris*) @@ -873,7 +444,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -15955,6 +16113,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -15997,6 +16113,11 @@ echo $ECHO_N "checking for $compiler opt esac ;; @@ -885,7 +456,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ *) lt_prog_compiler_pic_GCJ='-fPIC' ;; -@@ -16330,6 +16493,17 @@ EOF +@@ -16372,6 +16493,17 @@ EOF fi ;; @@ -903,27 +474,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -16544,7 +16718,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=$? -@@ -16604,7 +16779,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=$? -@@ -16835,6 +17011,20 @@ if test -z "$aix_libpath"; then aix_libp +@@ -16879,6 +17011,20 @@ if test -z "$aix_libpath"; then aix_libp fi ;; @@ -944,7 +495,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -17223,8 +17413,9 @@ beos*) +@@ -17267,8 +17413,9 @@ beos*) ;; bsdi4*) @@ -955,7 +506,7 @@ $NetBSD: patch-ad,v 1.10 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' -@@ -17340,15 +17531,15 @@ kfreebsd*-gnu) +@@ -17384,15 +17531,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -977,7 +528,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ need_version=yes ;; esac -@@ -17424,15 +17615,22 @@ hpux9* | hpux10* | hpux11*) +@@ -17468,15 +17615,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; @@ -1006,7 +557,7 @@ $NetBSD: patch-ad,v 1.10 2004/04/21 19:24:49 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -17468,7 +17666,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -17512,7 +17666,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -1015,7 +566,7 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -17592,7 +17790,7 @@ sco3.2v5*) +@@ -17636,7 +17790,7 @@ sco3.2v5*) ;; solaris*) @@ -1024,356 +575,12 @@ $NetBSD: patch-ad,v 1.10 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}' -@@ -17795,7 +17993,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=$? -@@ -17898,7 +18097,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=$? -@@ -17963,7 +18163,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=$? -@@ -18056,7 +18257,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=$? -@@ -18121,7 +18323,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=$? -@@ -18187,7 +18390,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=$? -@@ -18253,7 +18457,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=$? -@@ -19482,7 +19687,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=$? -@@ -19554,7 +19760,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=$? -@@ -19608,7 +19815,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=$? -@@ -19679,7 +19887,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=$? -@@ -19733,7 +19942,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=$? -@@ -19985,7 +20195,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=$? -@@ -20054,7 +20265,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=$? -@@ -20125,7 +20337,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=$? -@@ -20185,7 +20398,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=$? -@@ -20244,7 +20458,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=$? -@@ -20315,7 +20530,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=$? -@@ -20413,7 +20629,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=$? -@@ -20538,7 +20755,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=$? -@@ -20859,7 +21077,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=$? -@@ -21010,7 +21229,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=$? -@@ -21122,7 +21342,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=$? -@@ -21215,7 +21436,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=$? -@@ -21367,7 +21589,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=$? -@@ -21517,7 +21740,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=$? -@@ -21703,7 +21927,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=$? -@@ -21805,7 +22030,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=$? -@@ -21907,7 +22133,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=$? -@@ -22009,7 +22236,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=$? -@@ -22112,7 +22340,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=$? -@@ -23053,6 +23282,11 @@ esac - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac +@@ -19858,7 +20012,7 @@ if test "${libltdl_cv_shlibext+set}" = s + else -+ 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. */ -@@ -23091,12 +23325,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 -@@ -23513,14 +23741,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 + module=yes +-eval libltdl_cv_shlibext=$shrext_cmds ++eval libltdl_cv_shlibext=$shrext + + fi + echo "$as_me:$LINENO: result: $libltdl_cv_shlibext" >&5 |