diff options
| -rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 6 | ||||
| -rw-r--r-- | devel/libtool/patches/manual-libtool.m4 | 45 | ||||
| -rw-r--r-- | devel/libtool/patches/manual.README | 26 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 211 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ad | 267 | ||||
| -rw-r--r-- | mk/defs.Interix.mk | 4 |
7 files changed, 335 insertions, 228 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index 00effdb1048..e83fbf42e39 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.49 2004/04/20 18:29:34 tv Exp $ +# $NetBSD: Makefile.common,v 1.50 2004/04/21 14:55:32 tv Exp $ # DISTNAME= libtool-1.5.2 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index fa270a8cec3..d46205400f6 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.39 2004/04/20 18:29:34 tv Exp $ +$NetBSD: distinfo,v 1.40 2004/04/21 14:55:32 tv Exp $ SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260 Size (libtool-1.5.2.tar.gz) = 2653072 bytes SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e -SHA1 (patch-ab) = 92eb9d9cd825a329172e108fdaa2d2cc68821838 +SHA1 (patch-ab) = ef15cd8d1436719d2c4715ceb139474ce3e81a30 SHA1 (patch-ac) = b09fb38a59875a60bb51c9fb487e940521a71715 -SHA1 (patch-ad) = 26171c5184660fa18b9160ed2313617e90fb7cac +SHA1 (patch-ad) = 2fdd8d3bd276bdadf25811b5b102c823adeced34 diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index 5a261420998..494398d9a00 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,4 +1,4 @@ -$NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ +$NetBSD: manual-libtool.m4,v 1.2 2004/04/21 14:55:32 tv Exp $ --- libtool.m4.orig Fri Jan 23 01:07:04 2004 +++ libtool.m4 @@ -39,13 +39,13 @@ $NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -104,7 +104,7 @@ $NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ esac ;; -+interix*) ++interix3*) + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' + ;; + @@ -115,7 +115,7 @@ $NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6*) case $cc_basename in @@ -162,20 +162,43 @@ $NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -4643,6 +4677,8 @@ AC_MSG_CHECKING([for $compiler option to +@@ -4579,6 +4613,10 @@ AC_MSG_CHECKING([for $compiler option to + ;; + esac + ;; ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +@@ -4643,6 +4681,8 @@ AC_MSG_CHECKING([for $compiler option to ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6* | nonstopux*) case $cc_basename in CC) -@@ -5131,6 +5167,11 @@ EOF +@@ -4839,6 +4879,11 @@ AC_MSG_CHECKING([for $compiler option to + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + ;; +@@ -5131,6 +5176,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -183,13 +206,13 @@ $NetBSD: manual-libtool.m4,v 1.1 2004/04/20 18:29:34 tv Exp $ netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -5534,6 +5575,14 @@ $echo "local: *; };" >> $output_objdir/$ +@@ -5534,6 +5584,14 @@ $echo "local: *; };" >> $output_objdir/$ ;; esac fi + ;; + -+ interix*) ++ interix3*) + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' diff --git a/devel/libtool/patches/manual.README b/devel/libtool/patches/manual.README index 151a4ff34b4..3378d638130 100644 --- a/devel/libtool/patches/manual.README +++ b/devel/libtool/patches/manual.README @@ -1,4 +1,4 @@ -$NetBSD: manual.README,v 1.2 2004/04/21 13:55:19 tv Exp $ +$NetBSD: manual.README,v 1.3 2004/04/21 14:55:32 tv Exp $ The "manual-*" patch files are used to maintain the pkgsrc version of libtool. These files contain patches for the .m4 files in libtool which are @@ -11,21 +11,21 @@ libtool, the following process should be used: ===== -$ cd /usr/pkgsrc/devel/libtool-base -$ make configure -$ cd work*/libtool-* -$ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s +cd /usr/pkgsrc/devel/libtool-base +make configure +cd work*/libtool-* +cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s [edit *.m4 files and put patches back to manual-*] -$ make ./configure -$ pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab -$ cp -f acinclude.m4 libltdl/ -$ (cd libltdl && make ./configure) -$ pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad -$ cd /usr/pkgsrc/devel/libtool -$ make makepatchsum -$ cvs commit +make ./configure +pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab +cp -f acinclude.m4 libltdl/ +(cd libltdl && make ./configure) +pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad +cd /usr/pkgsrc/devel/libtool +make makepatchsum +cvs commit ===== diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index ab09c707832..f7ddcc2f832 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ +$NetBSD: patch-ab,v 1.35 2004/04/21 14:55:32 tv Exp $ --- configure.orig Sun Jan 25 07:36:38 2004 +++ configure @@ -193,7 +193,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ esac ;; -+interix*) ++interix3*) + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + ;; + @@ -240,11 +240,23 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7243,6 +7270,11 @@ EOF +@@ -6868,6 +6895,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic='-fPIC' + ;; +@@ -7243,6 +7275,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -252,7 +264,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +7489,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -7457,7 +7494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -262,7 +274,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7517,7 +7550,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -7517,7 +7555,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -272,11 +284,11 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7748,6 +7782,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -7748,6 +7787,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct=yes + hardcode_shlibpath_var=no + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -287,7 +299,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +8178,9 @@ beos*) +@@ -8136,8 +8183,9 @@ beos*) ;; bsdi4*) @@ -298,7 +310,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +8296,15 @@ kfreebsd*-gnu) +@@ -8253,15 +8301,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -320,17 +332,17 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -8337,15 +8380,22 @@ hpux9* | hpux10* | hpux11*) +@@ -8337,15 +8385,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -349,7 +361,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -8381,7 +8431,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -8381,7 +8436,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -358,7 +370,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +8555,7 @@ sco3.2v5*) +@@ -8505,7 +8560,7 @@ sco3.2v5*) ;; solaris*) @@ -367,7 +379,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +8758,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8708,7 +8763,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -377,7 +389,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8811,7 +8862,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8811,7 +8867,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -387,7 +399,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8876,7 +8928,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8876,7 +8933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -397,7 +409,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8969,7 +9022,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8969,7 +9027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -407,7 +419,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9034,7 +9088,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -9034,7 +9093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -417,7 +429,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9100,7 +9155,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -9100,7 +9160,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -427,7 +439,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9166,7 +9222,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -9166,7 +9227,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -437,7 +449,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10411,7 +10468,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -10411,7 +10473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -447,7 +459,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10472,7 +10530,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -10472,7 +10535,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -457,16 +469,16 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10746,6 +10805,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10746,6 +10810,8 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6*) case $cc_basename in CC) -@@ -10854,6 +10915,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10854,6 +10920,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= @@ -480,7 +492,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no -@@ -11226,6 +11294,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -11226,6 +11299,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c esac done @@ -495,7 +507,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ # Clean up. rm -f a.out a.exe else -@@ -11273,9 +11349,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -11273,9 +11354,11 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -508,16 +520,27 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -11361,6 +11439,8 @@ echo $ECHO_N "checking for $compiler opt +@@ -11297,6 +11380,10 @@ echo $ECHO_N "checking for $compiler opt + ;; + esac + ;; ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; +@@ -11361,6 +11448,8 @@ echo $ECHO_N "checking for $compiler opt ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6* | nonstopux*) case $cc_basename in CC) -@@ -11829,8 +11909,9 @@ beos*) +@@ -11829,8 +11918,9 @@ beos*) ;; bsdi4*) @@ -528,7 +551,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +12027,15 @@ kfreebsd*-gnu) +@@ -11946,15 +12036,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -550,17 +573,17 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -12030,15 +12111,22 @@ hpux9* | hpux10* | hpux11*) +@@ -12030,15 +12120,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -579,7 +602,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -12074,7 +12162,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -12074,7 +12171,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -588,7 +611,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +12286,7 @@ sco3.2v5*) +@@ -12198,7 +12295,7 @@ sco3.2v5*) ;; solaris*) @@ -597,7 +620,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +12489,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12401,7 +12498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -607,7 +630,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12504,7 +12593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12504,7 +12602,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -617,7 +640,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12569,7 +12659,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12569,7 +12668,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -627,7 +650,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12662,7 +12753,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12662,7 +12762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -637,7 +660,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12727,7 +12819,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12727,7 +12828,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -647,7 +670,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12793,7 +12886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12793,7 +12895,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -657,7 +680,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12859,7 +12953,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12859,7 +12962,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -667,11 +690,23 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14096,6 +14191,11 @@ EOF +@@ -13721,6 +13825,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; +@@ -14096,6 +14205,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -679,7 +714,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +14400,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -14300,7 +14414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -689,7 +724,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14350,7 +14451,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -14350,7 +14465,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -699,11 +734,11 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14581,6 +14683,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -14581,6 +14697,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -714,7 +749,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +15079,9 @@ beos*) +@@ -14969,8 +15093,9 @@ beos*) ;; bsdi4*) @@ -725,7 +760,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +15197,15 @@ kfreebsd*-gnu) +@@ -15086,15 +15211,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -747,17 +782,17 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -15170,15 +15281,22 @@ hpux9* | hpux10* | hpux11*) +@@ -15170,15 +15295,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -776,7 +811,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -15214,7 +15332,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -15214,7 +15346,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -785,7 +820,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +15456,7 @@ sco3.2v5*) +@@ -15338,7 +15470,7 @@ sco3.2v5*) ;; solaris*) @@ -794,11 +829,23 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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}' -@@ -16425,6 +16543,11 @@ EOF +@@ -16050,6 +16182,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; +@@ -16425,6 +16562,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -806,7 +853,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +16762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -16639,7 +16781,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -816,7 +863,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16699,7 +16823,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -16699,7 +16842,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -826,11 +873,11 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16930,6 +17055,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -16930,6 +17074,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -841,7 +888,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +17451,9 @@ beos*) +@@ -17318,8 +17470,9 @@ beos*) ;; bsdi4*) @@ -852,7 +899,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +17569,15 @@ kfreebsd*-gnu) +@@ -17435,15 +17588,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -874,17 +921,17 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -17519,15 +17653,22 @@ hpux9* | hpux10* | hpux11*) +@@ -17519,15 +17672,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -903,7 +950,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -17563,7 +17704,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -17563,7 +17723,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -912,7 +959,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +17828,7 @@ sco3.2v5*) +@@ -17687,7 +17847,7 @@ sco3.2v5*) ;; solaris*) @@ -921,7 +968,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 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 +18031,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17890,7 +18050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -931,7 +978,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17993,7 +18135,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17993,7 +18154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -941,7 +988,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18058,7 +18201,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18058,7 +18220,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -951,7 +998,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18151,7 +18295,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18151,7 +18314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -961,7 +1008,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18216,7 +18361,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18216,7 +18380,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -971,7 +1018,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18282,7 +18428,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18282,7 +18447,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -981,7 +1028,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18348,7 +18495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18348,7 +18514,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -991,7 +1038,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20503,6 +20651,11 @@ esac +@@ -20503,6 +20670,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1003,7 +1050,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ # 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 +20694,6 @@ echo "$as_me: error: cannot find input f +@@ -20541,12 +20713,6 @@ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } @@ -1016,7 +1063,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -@@ -20718,14 +20865,14 @@ echo X"$mf" | +@@ -20718,14 +20884,14 @@ echo X"$mf" | grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. @@ -1034,7 +1081,7 @@ $NetBSD: patch-ab,v 1.34 2004/04/20 18:29:34 tv Exp $ /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop -@@ -20987,7 +21134,7 @@ echo "$as_me: error: $ac_sub_configure f +@@ -20987,7 +21153,7 @@ echo "$as_me: error: $ac_sub_configure f { (exit 1); exit 1; }; } fi diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index 0ec866426f9..fa55362a172 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ +$NetBSD: patch-ad,v 1.9 2004/04/21 14:55:32 tv Exp $ --- libltdl/configure.orig Sun Jan 25 07:36:58 2004 +++ libltdl/configure @@ -142,7 +142,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ esac ;; -+interix*) ++interix3*) + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + ;; + @@ -260,11 +260,23 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7148,6 +7177,11 @@ EOF +@@ -6773,6 +6802,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic='-fPIC' + ;; +@@ -7148,6 +7182,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -272,7 +284,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +7396,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -7362,7 +7401,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -282,7 +294,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7422,7 +7457,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -7422,7 +7462,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -292,11 +304,11 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7653,6 +7689,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -7653,6 +7694,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct=yes + hardcode_shlibpath_var=no + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -307,7 +319,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +8085,9 @@ beos*) +@@ -8041,8 +8090,9 @@ beos*) ;; bsdi4*) @@ -318,7 +330,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +8203,15 @@ kfreebsd*-gnu) +@@ -8158,15 +8208,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -340,17 +352,17 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -8242,15 +8287,22 @@ hpux9* | hpux10* | hpux11*) +@@ -8242,15 +8292,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -369,7 +381,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -8286,7 +8338,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -8286,7 +8343,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -378,7 +390,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +8462,7 @@ sco3.2v5*) +@@ -8410,7 +8467,7 @@ sco3.2v5*) ;; solaris*) @@ -387,7 +399,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +8665,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8613,7 +8670,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -397,7 +409,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8716,7 +8769,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8716,7 +8774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -407,7 +419,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8781,7 +8835,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8781,7 +8840,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -417,7 +429,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8874,7 +8929,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8874,7 +8934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -427,7 +439,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8939,7 +8995,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -8939,7 +9000,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -437,7 +449,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9005,7 +9062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -9005,7 +9067,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -447,7 +459,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9071,7 +9129,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -9071,7 +9134,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -457,7 +469,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10316,7 +10375,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -10316,7 +10380,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -467,7 +479,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10377,7 +10437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -10377,7 +10442,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -477,16 +489,16 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10651,6 +10712,8 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10651,6 +10717,8 @@ if test -z "$aix_libpath"; then aix_libp ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6*) case $cc_basename in CC) -@@ -10759,6 +10822,13 @@ if test -z "$aix_libpath"; then aix_libp +@@ -10759,6 +10827,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= @@ -500,7 +512,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ hardcode_libdir_flag_spec_CXX='-R$libdir' hardcode_direct_CXX=yes hardcode_shlibpath_var_CXX=no -@@ -11131,6 +11201,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -11131,6 +11206,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c esac done @@ -515,7 +527,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ # Clean up. rm -f a.out a.exe else -@@ -11178,9 +11256,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -11178,9 +11261,11 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -528,16 +540,27 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -11266,6 +11346,8 @@ echo $ECHO_N "checking for $compiler opt +@@ -11202,6 +11287,10 @@ echo $ECHO_N "checking for $compiler opt + ;; + esac + ;; ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; + *) + lt_prog_compiler_pic_CXX='-fPIC' + ;; +@@ -11266,6 +11355,8 @@ echo $ECHO_N "checking for $compiler opt ;; esac ;; -+ interix*) ++ interix3*) + ;; irix5* | irix6* | nonstopux*) case $cc_basename in CC) -@@ -11734,8 +11816,9 @@ beos*) +@@ -11734,8 +11825,9 @@ beos*) ;; bsdi4*) @@ -548,7 +571,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +11934,15 @@ kfreebsd*-gnu) +@@ -11851,15 +11943,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -570,17 +593,17 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -11935,15 +12018,22 @@ hpux9* | hpux10* | hpux11*) +@@ -11935,15 +12027,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -599,7 +622,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -11979,7 +12069,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -11979,7 +12078,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -608,7 +631,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +12193,7 @@ sco3.2v5*) +@@ -12103,7 +12202,7 @@ sco3.2v5*) ;; solaris*) @@ -617,7 +640,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +12396,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12306,7 +12405,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -627,7 +650,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12409,7 +12500,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12409,7 +12509,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -637,7 +660,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12474,7 +12566,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12474,7 +12575,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -647,7 +670,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12567,7 +12660,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12567,7 +12669,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -657,7 +680,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12632,7 +12726,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12632,7 +12735,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -667,7 +690,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12698,7 +12793,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12698,7 +12802,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -677,7 +700,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12764,7 +12860,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -12764,7 +12869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -687,11 +710,23 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14001,6 +14098,11 @@ EOF +@@ -13626,6 +13732,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic_F77='-fPIC' + ;; +@@ -14001,6 +14112,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -699,7 +734,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +14307,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -14205,7 +14321,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -709,7 +744,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14255,7 +14358,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -14255,7 +14372,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -719,11 +754,11 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14486,6 +14590,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -14486,6 +14604,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -734,7 +769,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +14986,9 @@ beos*) +@@ -14874,8 +15000,9 @@ beos*) ;; bsdi4*) @@ -745,7 +780,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +15104,15 @@ kfreebsd*-gnu) +@@ -14991,15 +15118,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -767,17 +802,17 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -15075,15 +15188,22 @@ hpux9* | hpux10* | hpux11*) +@@ -15075,15 +15202,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -796,7 +831,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -15119,7 +15239,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -15119,7 +15253,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -805,7 +840,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +15363,7 @@ sco3.2v5*) +@@ -15243,7 +15377,7 @@ sco3.2v5*) ;; solaris*) @@ -814,11 +849,23 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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}' -@@ -16330,6 +16450,11 @@ EOF +@@ -15955,6 +16089,11 @@ echo $ECHO_N "checking for $compiler opt + esac + ;; + ++ interix3*) ++ # Interix 3.0-3.5 -fPIC option generates borked code. ++ # (Instead, shlibs are relocated at runtime.) ++ ;; ++ + *) + lt_prog_compiler_pic_GCJ='-fPIC' + ;; +@@ -16330,6 +16469,11 @@ EOF fi ;; -+ interix*) ++ interix3*) + archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib' + archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib' + ;; @@ -826,7 +873,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +16669,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -16544,7 +16688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -836,7 +883,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16604,7 +16730,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -16604,7 +16749,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -846,11 +893,11 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16835,6 +16962,14 @@ if test -z "$aix_libpath"; then aix_libp +@@ -16835,6 +16981,14 @@ if test -z "$aix_libpath"; then aix_libp fi ;; -+ interix*) ++ interix3*) + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' @@ -861,7 +908,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +17358,9 @@ beos*) +@@ -17223,8 +17377,9 @@ beos*) ;; bsdi4*) @@ -872,7 +919,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +17476,15 @@ kfreebsd*-gnu) +@@ -17340,15 +17495,15 @@ kfreebsd*-gnu) freebsd*) objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` @@ -894,17 +941,17 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ need_version=yes ;; esac -@@ -17424,15 +17560,22 @@ hpux9* | hpux10* | hpux11*) +@@ -17424,15 +17579,22 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -+interix*) ++interix3*) + version_type=sunos + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix ld.so' ++ dynamic_linker='Interix 3.x ld.so' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes @@ -923,7 +970,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -17468,7 +17611,7 @@ linux*oldld* | linux*aout* | linux*coff* +@@ -17468,7 +17630,7 @@ linux*oldld* | linux*aout* | linux*coff* # This must be Linux ELF. linux*) @@ -932,7 +979,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +17735,7 @@ sco3.2v5*) +@@ -17592,7 +17754,7 @@ sco3.2v5*) ;; solaris*) @@ -941,7 +988,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 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 +17938,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17795,7 +17957,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -951,7 +998,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17898,7 +18042,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17898,7 +18061,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -961,7 +1008,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17963,7 +18108,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17963,7 +18127,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -971,7 +1018,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18056,7 +18202,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18056,7 +18221,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -981,7 +1028,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18121,7 +18268,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18121,7 +18287,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -991,7 +1038,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18187,7 +18335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18187,7 +18354,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1001,7 +1048,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18253,7 +18402,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -18253,7 +18421,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1011,7 +1058,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19482,7 +19632,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -19482,7 +19651,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1021,7 +1068,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19554,7 +19705,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -19554,7 +19724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1031,7 +1078,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19608,7 +19760,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -19608,7 +19779,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1041,7 +1088,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19679,7 +19832,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -19679,7 +19851,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1051,7 +1098,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19733,7 +19887,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -19733,7 +19906,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1061,7 +1108,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -19985,7 +20140,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -19985,7 +20159,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1071,7 +1118,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20054,7 +20210,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20054,7 +20229,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1081,7 +1128,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20125,7 +20282,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20125,7 +20301,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1091,7 +1138,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20185,7 +20343,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20185,7 +20362,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1101,7 +1148,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20244,7 +20403,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20244,7 +20422,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1111,7 +1158,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20315,7 +20475,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20315,7 +20494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1121,7 +1168,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20413,7 +20574,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20413,7 +20593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1131,7 +1178,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20538,7 +20700,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -20538,7 +20719,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1141,17 +1188,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -20771,6 +20934,9 @@ else - hpux10*|hpux11*) - libltdl_cv_sys_dlopen_deplibs=yes - ;; -+ interix*) -+ libltdl_cv_sys_dlopen_deplibs=yes -+ ;; - irix[12345]*|irix6.[01]*) - # Catch all versions of IRIX before 6.2, and indicate that we don't - # know how it worked for any of those versions. -@@ -20859,7 +21025,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -20859,7 +21041,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1161,7 +1198,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21010,7 +21177,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -21010,7 +21193,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1171,7 +1208,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21122,7 +21290,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21122,7 +21306,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1181,7 +1218,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21215,7 +21384,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -21215,7 +21400,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1191,7 +1228,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21367,7 +21537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -21367,7 +21553,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1201,7 +1238,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21517,7 +21688,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -21517,7 +21704,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1211,7 +1248,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21703,7 +21875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21703,7 +21891,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1221,7 +1258,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21805,7 +21978,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21805,7 +21994,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1231,7 +1268,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -21907,7 +22081,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -21907,7 +22097,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1241,7 +1278,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -22009,7 +22184,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -22009,7 +22200,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1251,7 +1288,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -22112,7 +22288,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -22112,7 +22304,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1261,7 +1298,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -23053,6 +23230,11 @@ esac +@@ -23053,6 +23246,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1273,7 +1310,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ # 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 +23273,6 @@ echo "$as_me: error: cannot find input f +@@ -23091,12 +23289,6 @@ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } @@ -1286,7 +1323,7 @@ $NetBSD: patch-ad,v 1.8 2004/04/20 18:29:34 tv Exp $ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -@@ -23513,14 +23689,14 @@ echo X"$mf" | +@@ -23513,14 +23705,14 @@ echo X"$mf" | grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk index 639d408e604..6b7a814d5b7 100644 --- a/mk/defs.Interix.mk +++ b/mk/defs.Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Interix.mk,v 1.12 2004/04/21 14:53:51 tv Exp $ +# $NetBSD: defs.Interix.mk,v 1.13 2004/04/21 14:55:32 tv Exp $ # # Variable definitions for the Interix operating system. @@ -121,7 +121,7 @@ _OPSYS_HAS_INET6= no # IPv6 is not standard _OPSYS_HAS_JAVA= no # Java is not standard _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available -_OPSYS_LIBTOOL_REQD= 1.5.2nb6 # base version of libtool required +_OPSYS_LIBTOOL_REQD= 1.5.2nb7 # base version of libtool required _OPSYS_PERL_REQD= # no base version of perl required _OPSYS_PKGTOOLS_REQD= 20040330 _OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads |