From f6b0d765bb98c58ae5bc0de2a4502e1b8dc50330 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 30 Jan 2006 22:19:56 +0000 Subject: Update libtool to 1.5.22. Too many changes for CVS commit logs; here's some highlighted changes: * Fixes minor /tmp race condition bug. * Integrated Interix support; no longer requires pkgsrc hackery. * shlibtool is a wrapper using the (now working) "--tag=disable-static". * Several other bugs fixed, removing some pkgsrc-local changes. --- devel/libltdl/Makefile | 3 +- devel/libtool-base/Makefile | 10 +- devel/libtool-base/files/shlibtool.in | 4 + devel/libtool/Makefile.common | 6 +- devel/libtool/distinfo | 14 +- devel/libtool/patches/manual-libtool.m4 | 205 +---- devel/libtool/patches/manual-ltdl.m4 | 14 - devel/libtool/patches/manual.README | 21 +- devel/libtool/patches/patch-aa | 10 +- devel/libtool/patches/patch-ab | 1009 ++++-------------------- devel/libtool/patches/patch-ad | 1264 ++++--------------------------- 11 files changed, 401 insertions(+), 2159 deletions(-) create mode 100644 devel/libtool-base/files/shlibtool.in delete mode 100644 devel/libtool/patches/manual-ltdl.m4 diff --git a/devel/libltdl/Makefile b/devel/libltdl/Makefile index e19467d6619..34863868cbe 100644 --- a/devel/libltdl/Makefile +++ b/devel/libltdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/11/26 09:39:30 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2006/01/30 22:19:57 tv Exp $ # .include "../../devel/libtool/Makefile.common" @@ -13,7 +13,6 @@ CONFLICTS+= libtool<=1.3.5nb11 libtool-base<=1.5.10nb4 USE_LIBTOOL= yes CONFIGURE_ARGS+=--enable-libltdl-install -CONFIGURE_DIRS= ${WRKSRC}/libltdl BUILD_DIRS= ${WRKSRC}/libltdl .include "../../mk/dlopen.buildlink3.mk" diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index 1bb65155c16..526ee06f234 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2005/11/09 18:05:57 tv Exp $ +# $NetBSD: Makefile,v 1.74 2006/01/30 22:19:56 tv Exp $ ########################################################################### ########################################################################### @@ -26,7 +26,7 @@ .include "../../devel/libtool/Makefile.common" PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 6 +#PKGREVISION= SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) @@ -83,10 +83,10 @@ PLIST_SUBST+= SHLIBTOOL="@comment " .else PLIST_SUBST+= SHLIBTOOL= +USE_PKGINSTALL= YES # for FILES_SUBST defaults + post-build: - cd ${WRKSRC} && \ - ${SED} -e '/^# Whether or not to build static/{n;s/yes/no/;}' \ - < libtool > shlibtool + @${SED} ${FILES_SUBST_SED} <${FILESDIR}/shlibtool.in >${WRKSRC}/shlibtool post-install: ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool diff --git a/devel/libtool-base/files/shlibtool.in b/devel/libtool-base/files/shlibtool.in new file mode 100644 index 00000000000..b8df96e5113 --- /dev/null +++ b/devel/libtool-base/files/shlibtool.in @@ -0,0 +1,4 @@ +#!@SH@ +# $NetBSD: shlibtool.in,v 1.1 2006/01/30 22:19:57 tv Exp $ + +exec @PREFIX@/bin/libtool --tag=disable-static "$@" diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index fcfd20f5342..bb8bff06ca5 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.64 2005/05/22 05:35:32 jlam Exp $ +# $NetBSD: Makefile.common,v 1.65 2006/01/30 22:19:56 tv Exp $ ########################################################################### ########################################################################### @@ -23,7 +23,7 @@ ########################################################################### ########################################################################### -DISTNAME= libtool-1.5.18 +DISTNAME= libtool-1.5.22 CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} @@ -37,7 +37,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo -FILESDIR= ${.CURDIR}/../libtool/files PATCHDIR= ${.CURDIR}/../libtool/patches AUTOMAKE_OVERRIDE= NO @@ -57,6 +56,7 @@ CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} # The configure script doesn't seem to be working out the need for -p # or -B, so tell it +# .if ${OPSYS} == "SunOS" CONFIGURE_ENV+= lt_cv_path_NM="nm -p" .elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 7fc0f08193f..988764e2d13 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.64 2005/11/09 18:05:56 tv Exp $ +$NetBSD: distinfo,v 1.65 2006/01/30 22:19:56 tv Exp $ -SHA1 (libtool-1.5.18.tar.gz) = 9eae4a25cf386f2dd3937f215368c9cc090009df -RMD160 (libtool-1.5.18.tar.gz) = facff15723bb89b0e260def31354fe437430bf3b -Size (libtool-1.5.18.tar.gz) = 2780846 bytes -SHA1 (patch-aa) = 36f589c09c492bc688bdfbb97f0d375cd04c008d -SHA1 (patch-ab) = 1905521a7823883d7628448befb679b6649b8b6c +SHA1 (libtool-1.5.22.tar.gz) = 17353e66aeaac80ae188ea0a3a90609550ce3254 +RMD160 (libtool-1.5.22.tar.gz) = 7cbe793ee0509908daac928b4dc3a0f16f7293bf +Size (libtool-1.5.22.tar.gz) = 2921483 bytes +SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6 +SHA1 (patch-ab) = 9a0c0223d5cf2ae518157e0198b63eba844efecd SHA1 (patch-ac) = 61a5c1ace76beeeb64388726e6a0772e8f1828e0 -SHA1 (patch-ad) = a8b1632162e27b74f936f499ae15cc33aef03817 +SHA1 (patch-ad) = 371ef534ec576d031bf82898b9d1d8a2d5829ef0 diff --git a/devel/libtool/patches/manual-libtool.m4 b/devel/libtool/patches/manual-libtool.m4 index abc30792bb7..439b9b93352 100644 --- a/devel/libtool/patches/manual-libtool.m4 +++ b/devel/libtool/patches/manual-libtool.m4 @@ -1,8 +1,8 @@ -$NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ +$NetBSD: manual-libtool.m4,v 1.18 2006/01/30 22:19:56 tv Exp $ ---- libtool.m4.orig 2005-05-15 09:41:23.000000000 -0400 +--- libtool.m4.orig 2005-12-18 16:53:17.000000000 -0500 +++ libtool.m4 -@@ -388,11 +388,11 @@ else +@@ -392,11 +392,11 @@ else if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -16,7 +16,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running configure again with it. -@@ -1250,6 +1250,7 @@ beos*) +@@ -1289,6 +1289,7 @@ beos*) bsdi[[45]]*) version_type=linux need_version=no @@ -24,10 +24,10 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 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' -@@ -1367,15 +1368,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -1414,15 +1415,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -42,27 +42,12 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ *) ++ *) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2' need_version=yes ;; esac -@@ -1451,15 +1453,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -1518,12 +1520,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -76,7 +61,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -1536,11 +1545,11 @@ knetbsd*-gnu) +@@ -1600,11 +1597,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -90,15 +75,16 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -1571,14 +1580,14 @@ nto-qnx*) +@@ -1635,7 +1632,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -1643,7 +1640,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -107,7 +93,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -1743,9 +1752,7 @@ if test -f "$ltmain" && test -n "$tagnam +@@ -1832,9 +1829,7 @@ if test -f "$ltmain" && test -n "$tagnam case $tagname in CXX) @@ -118,18 +104,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ AC_LIBTOOL_LANG_CXX_CONFIG else tagname="" -@@ -2253,6 +2260,10 @@ hpux10.20* | hpux11*) - esac - ;; - -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -2480,22 +2491,10 @@ AC_DEFUN([AC_LIBTOOL_CXX], +@@ -2580,22 +2575,10 @@ AC_DEFUN([AC_LIBTOOL_CXX], # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) @@ -139,7 +114,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ ])# _LT_AC_LANG_CXX -# _LT_AC_PROG_CXXCPP --# --------------- +-# ------------------ -AC_DEFUN([_LT_AC_PROG_CXXCPP], -[ -AC_REQUIRE([AC_PROG_CXX]) @@ -153,7 +128,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ # AC_LIBTOOL_F77 # -------------- # enable support for Fortran 77 libraries -@@ -2663,7 +2662,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [ +@@ -2732,7 +2715,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) @@ -162,37 +137,16 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -2999,7 +2998,7 @@ case $host_os in +@@ -3080,7 +3063,7 @@ case $host_os in _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -3157,6 +3156,20 @@ case $host_os in - ;; - esac - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -3287,14 +3300,29 @@ case $host_os in +@@ -3377,14 +3360,29 @@ case $host_os in ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then @@ -224,29 +178,20 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ ;; openbsd2*) # C++ shared libraries are fairly broken -@@ -3734,6 +3762,21 @@ if AC_TRY_EVAL(ac_compile); then - esac - done +@@ -3872,6 +3870,12 @@ interix3*) + _LT_AC_TAGVAR(postdeps,$1)= + ;; -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac ++netbsd*) ++ if test -n "$cpprt0_file"; then ++ _LT_AC_TAGVAR(predep_objects,$1)=`eval echo $_LT_AC_TAGVAR(predep_objects,$1) | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` ++ fi ++ ;; + - # Clean up. - rm -f a.out a.exe - else -@@ -4698,9 +4741,11 @@ AC_MSG_CHECKING([for $compiler option to + solaris*) + case $cc_basename in + CC*) +@@ -4847,9 +4851,11 @@ AC_MSG_CHECKING([for $compiler option to _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -259,27 +204,7 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -4722,6 +4767,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' - ;; -@@ -4796,6 +4845,8 @@ AC_MSG_CHECKING([for $compiler option to - ;; - esac - ;; -+ interix3*) -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -4967,9 +5018,11 @@ AC_MSG_CHECKING([for $compiler option to +@@ -5122,9 +5128,11 @@ AC_MSG_CHECKING([for $compiler option to ;; darwin* | rhapsody*) @@ -291,69 +216,13 @@ $NetBSD: manual-libtool.m4,v 1.17 2005/11/09 18:05:56 tv Exp $ + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='' ;; - msdosdjgpp*) -@@ -4998,6 +5051,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' - ;; -@@ -5370,6 +5428,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ - 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' -@@ -5633,7 +5706,7 @@ EOF + interix3*) +@@ -5850,7 +5858,7 @@ _LT_EOF _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -5748,6 +5821,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$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' diff --git a/devel/libtool/patches/manual-ltdl.m4 b/devel/libtool/patches/manual-ltdl.m4 deleted file mode 100644 index f73eb1874c8..00000000000 --- a/devel/libtool/patches/manual-ltdl.m4 +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: manual-ltdl.m4,v 1.2 2005/03/22 15:12:08 tv Exp $ - ---- ltdl.m4.orig 2005-02-12 07:18:34.000000000 -0500 -+++ ltdl.m4 -@@ -134,6 +134,9 @@ AC_CACHE_CHECK([whether deplibs are load - 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. diff --git a/devel/libtool/patches/manual.README b/devel/libtool/patches/manual.README index 596e553c913..0119b5d721e 100644 --- a/devel/libtool/patches/manual.README +++ b/devel/libtool/patches/manual.README @@ -1,4 +1,17 @@ -$NetBSD: manual.README,v 1.7 2005/03/22 15:12:08 tv Exp $ +$NetBSD: manual.README,v 1.8 2006/01/30 22:19:56 tv Exp $ + +************************************************************************ +**** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING *** + +Currently (as of libtool 1.5.22), libtool requires "autoconf 2.59c", a +pre-release build of Autoconf. The instructions below should still be +followed, but Autoconf must be built from its CVS sources of at least +"-D2005/12/01". Ensure that PATH is set appropriately to include that +version's install directory first. Once autoconf 2.60 is released and +pkgsrc is updated to use it, this hack will no longer be required. + +**** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING *** +************************************************************************ 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 @@ -21,10 +34,10 @@ cat /usr/pkgsrc/devel/libtool/patches/manual-* | patch -s cp -f configure configure.orig cp -f libltdl/configure libltdl/configure.orig ./configure -make ./configure +aclocal && make ./configure pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab cp -f acinclude.m4 libltdl/ -(cd libltdl && make ./configure) +(cd libltdl && aclocal && make ./configure) pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad cd /usr/pkgsrc/devel/libtool make makepatchsum @@ -35,4 +48,4 @@ make makepatchsum ===== -- tv@duh.org, 4 Oct 2004 +- tv@duh.org, 30 Jan 2006 diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 34222fb0180..7cc1c072bc4 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.34 2005/05/18 11:57:12 adam Exp $ +$NetBSD: patch-aa,v 1.35 2006/01/30 22:19:56 tv Exp $ ---- Makefile.in.orig Mon May 16 11:33:40 2005 +--- Makefile.in.orig 2005-12-18 17:13:48.000000000 -0500 +++ Makefile.in -@@ -211,7 +211,7 @@ subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -220,7 +220,7 @@ target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.3e gnu -BUILD_SUBDIRS = . libltdl doc tests +BUILD_SUBDIRS = . libltdl tests diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 09ab038fc91..e52c41f7de7 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ +$NetBSD: patch-ab,v 1.56 2006/01/30 22:19:56 tv Exp $ ---- configure.orig 2005-11-09 12:32:46.000000000 -0500 +--- configure.orig 2006-01-30 17:05:54.000000000 -0500 +++ configure -@@ -322,11 +322,11 @@ else +@@ -76,7 +76,6 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- # FIXME: next line outputs $as_me, which is still unset. + { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; }; } + fi +@@ -589,11 +588,11 @@ else if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -16,187 +24,80 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running configure again with it. -@@ -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 +@@ -1918,8 +1917,7 @@ esac + ## ------------------------ ## + ## Automake Initialisation. ## + ## ------------------------ ## +-am__api_version='1.9a' +- ++am__api_version="1.9" + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then +@@ -2096,30 +2094,26 @@ echo "$as_me: WARNING: \`missing' script fi -@@ -2592,7 +2592,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2650,7 +2651,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2766,7 +2768,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2820,7 +2823,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2865,7 +2869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2909,7 +2914,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3562,7 +3568,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3620,7 +3627,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3691,7 +3699,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3735,7 +3744,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4030,7 +4040,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4079,7 +4090,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4522,6 +4534,10 @@ hpux10.20* | hpux11*) - esac - ;; + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to define $(mkdir_p) as `mkdir -p -- .', in order to ++ # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However we don't do +- # that anymore. +- # 1. before we restricted the check to GNU mkdir, `mkdir -p .' was +- # reported to fail in read-only directories. The system where this +- # happened has been forgotten. +- # 2. in practice we call $(mkdir_p) on directories such as +- # $(mkdir_p) "$(DESTDIR)$(somedir)" +- # and we don't want to create $(DESTDIR) if $(somedir) is empty. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) "$(DESTDIR)$(somedir)" +- # so $(mkdir_p) always has an argument. +- # We will have better chances of detecting a missing test if +- # $(mkdir_p) complains about missing arguments. +- # 3. $(mkdir_p) is named after `mkdir -p' and we don't expect this +- # to accept no argument. +- # 4. having something like `mkdir .' in the output is unsightly. ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. + mkdir_p='mkdir -p --' + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as +- # directories to create. ++ # directories to create, and then abort because `.' already ++ # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d +@@ -2260,7 +2254,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2360,7 +2354,7 @@ else + fi -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -4771,7 +4787,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5322,7 +5339,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5492,7 +5510,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5559,7 +5578,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5674,12 +5694,7 @@ fi + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -6599,12 +6593,7 @@ fi done @@ -205,12 +106,12 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cc -+ac_ext=cc +- ac_ext=cpp ++ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5909,8 +5924,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS +@@ -6838,8 +6827,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -219,7 +120,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ -@@ -6936,9 +6949,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -7866,9 +7853,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -231,93 +132,17 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static='' ;; - msdosdjgpp*) -@@ -6967,6 +6982,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' - ;; -@@ -7435,6 +7455,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -7622,7 +7657,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7682,7 +7718,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7798,7 +7835,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -8828,7 +8817,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -7913,6 +7950,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -@@ -8316,6 +8368,7 @@ beos*) +@@ -9358,6 +9347,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -325,10 +150,10 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 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' -@@ -8433,15 +8486,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -9483,15 +9473,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -348,22 +173,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -8517,15 +8571,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -9587,12 +9578,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -377,7 +187,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -8602,11 +8663,11 @@ knetbsd*-gnu) +@@ -9669,11 +9655,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -391,15 +201,16 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -8637,14 +8698,14 @@ nto-qnx*) +@@ -9704,7 +9690,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -9712,7 +9698,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -408,77 +219,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -8892,7 +8953,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8995,7 +9057,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9060,7 +9123,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9153,7 +9217,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9218,7 +9283,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9284,7 +9350,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9350,7 +9417,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10203,9 +10271,7 @@ echo "$as_me: error: tag name \"$tagname +@@ -11304,9 +11290,7 @@ echo "$as_me: error: tag name \"$tagname case $tagname in CXX) @@ -486,60 +227,19 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -10592,7 +10658,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10653,7 +10720,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10781,7 +10849,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -11903,7 +11887,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -10939,6 +11007,20 @@ if test -z "$aix_libpath"; then aix_libp - ;; - esac - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_CXX=no -+ ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -11069,14 +11151,29 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12200,14 +12184,29 @@ if test -z "$aix_libpath"; then aix_libp ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then @@ -571,29 +271,20 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ ;; openbsd2*) # C++ shared libraries are fairly broken -@@ -11463,6 +11560,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - esac - done +@@ -12643,6 +12642,12 @@ interix3*) + postdeps_CXX= + ;; -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac ++netbsd*) ++ if test -n "$cpprt0_file"; then ++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` ++ fi ++ ;; + - # Clean up. - rm -f a.out a.exe - else -@@ -11510,9 +11622,11 @@ echo $ECHO_N "checking for $compiler opt + solaris*) + case $cc_basename in + CC*) +@@ -12695,9 +12700,11 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -606,27 +297,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -11534,6 +11648,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' - ;; -@@ -11608,6 +11726,8 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -+ interix3*) -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -12088,6 +12208,7 @@ beos*) +@@ -13317,6 +13324,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -634,10 +305,10 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 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' -@@ -12205,15 +12326,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -13442,15 +13450,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -657,22 +328,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -12289,15 +12411,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -13546,12 +13555,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -686,7 +342,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -12374,11 +12503,11 @@ knetbsd*-gnu) +@@ -13628,11 +13632,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -700,15 +356,16 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -12409,14 +12538,14 @@ nto-qnx*) +@@ -13663,7 +13667,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -13671,7 +13675,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -717,77 +374,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -12664,7 +12793,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12767,7 +12897,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12832,7 +12963,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12925,7 +13057,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12990,7 +13123,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13056,7 +13190,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13122,7 +13257,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13984,9 +14120,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -14436,9 +14440,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -799,93 +386,17 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static_F77='' ;; - msdosdjgpp*) -@@ -14015,6 +14153,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' - ;; -@@ -14483,6 +14626,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -14660,7 +14818,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14710,7 +14869,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14826,7 +14986,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -15378,7 +15384,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -14941,6 +15101,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -@@ -15344,6 +15519,7 @@ beos*) +@@ -15908,6 +15914,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -893,10 +404,10 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 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' -@@ -15461,15 +15637,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -16033,15 +16040,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -916,22 +427,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -15545,15 +15722,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -16137,12 +16145,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -945,7 +441,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -15630,11 +15814,11 @@ knetbsd*-gnu) +@@ -16219,11 +16222,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -959,15 +455,16 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -15665,14 +15849,14 @@ nto-qnx*) +@@ -16254,7 +16257,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -16262,7 +16265,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -976,7 +473,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -16432,9 +16616,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -17018,9 +17021,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -988,93 +485,17 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static_GCJ='' ;; - msdosdjgpp*) -@@ -16463,6 +16649,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' - ;; -@@ -16931,6 +17122,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -17118,7 +17324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17178,7 +17385,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17294,7 +17502,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -17980,7 +17985,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -17409,6 +17617,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -@@ -17812,6 +18035,7 @@ beos*) +@@ -18510,6 +18515,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -1082,10 +503,10 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 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' -@@ -17929,15 +18153,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -18635,15 +18641,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -1105,22 +526,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -18013,15 +18238,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -18739,12 +18746,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1134,7 +540,7 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -18098,11 +18330,11 @@ knetbsd*-gnu) +@@ -18821,11 +18823,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -1148,15 +554,16 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -18133,14 +18365,14 @@ nto-qnx*) +@@ -18856,7 +18858,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -18864,7 +18866,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -1165,107 +572,11 @@ $NetBSD: patch-ab,v 1.55 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -18388,7 +18620,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18491,7 +18724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18556,7 +18790,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18649,7 +18884,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18714,7 +18950,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18780,7 +19017,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18846,7 +19084,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21039,6 +21278,11 @@ esac - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -21077,12 +21321,6 @@ echo "$as_me: error: cannot find input f - fi;; - esac - done` || { (exit 1); exit 1; } -- -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -@@ -21517,7 +21755,7 @@ echo "$as_me: error: $ac_sub_configure f +@@ -20250,7 +20252,6 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- # FIXME: next line outputs $as_me, which is still unset. + { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; }; } - fi - -- cd "$ac_popdir" -+ cd $ac_popdir - done fi - diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad index 7a68d15cb46..f12a3bab26b 100644 --- a/devel/libtool/patches/patch-ad +++ b/devel/libtool/patches/patch-ad @@ -1,8 +1,16 @@ -$NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ +$NetBSD: patch-ad,v 1.28 2006/01/30 22:19:56 tv Exp $ ---- libltdl/configure.orig 2005-11-09 12:32:46.000000000 -0500 +--- libltdl/configure.orig 2006-01-30 17:05:54.000000000 -0500 +++ libltdl/configure -@@ -322,11 +322,11 @@ else +@@ -76,7 +76,6 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- # FIXME: next line outputs $as_me, which is still unset. + { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; }; } + fi +@@ -589,11 +588,11 @@ else if test "X$echo" = Xecho; then # We didn't find a better echo, so look for alternatives. @@ -16,187 +24,80 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running configure again with it. -@@ -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 +@@ -1927,8 +1926,7 @@ fi + ## ------------------------ ## + ## Automake Initialisation. ## + ## ------------------------ ## +-am__api_version='1.9a' +- ++am__api_version="1.9" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -2080,30 +2078,26 @@ echo "$as_me: WARNING: \`missing' script fi -@@ -2541,7 +2541,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=$? -@@ -2599,7 +2600,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=$? -@@ -2715,7 +2717,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=$? -@@ -2769,7 +2772,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=$? -@@ -2814,7 +2818,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=$? -@@ -2858,7 +2863,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=$? -@@ -3147,7 +3153,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=$? -@@ -3207,7 +3214,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=$? -@@ -3731,6 +3739,10 @@ hpux10.20* | hpux11*) - esac - ;; + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then +- # We used to define $(mkdir_p) as `mkdir -p -- .', in order to ++ # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) +- # where $(somedir) is conditionally defined. However we don't do +- # that anymore. +- # 1. before we restricted the check to GNU mkdir, `mkdir -p .' was +- # reported to fail in read-only directories. The system where this +- # happened has been forgotten. +- # 2. in practice we call $(mkdir_p) on directories such as +- # $(mkdir_p) "$(DESTDIR)$(somedir)" +- # and we don't want to create $(DESTDIR) if $(somedir) is empty. +- # To support the latter case, we have to write +- # test -z "$(somedir)" || $(mkdir_p) "$(DESTDIR)$(somedir)" +- # so $(mkdir_p) always has an argument. +- # We will have better chances of detecting a missing test if +- # $(mkdir_p) complains about missing arguments. +- # 3. $(mkdir_p) is named after `mkdir -p' and we don't expect this +- # to accept no argument. +- # 4. having something like `mkdir .' in the output is unsightly. ++ # where $(somedir) is conditionally defined. However this is wrong ++ # for two reasons: ++ # 1. if the package is installed by a user who cannot write `.' ++ # make install will fail, ++ # 2. the above comment should most certainly read ++ # $(mkdir_p) $(DESTDIR)$(somedir) ++ # so it does not work when $(somedir) is undefined and ++ # $(DESTDIR) is not. ++ # To support the latter case, we have to write ++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), ++ # so the `.' trick is pointless. + mkdir_p='mkdir -p --' + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as +- # directories to create. ++ # directories to create, and then abort because `.' already ++ # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d +@@ -2235,7 +2229,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++install_sh=${install_sh-"$am_aux_dir/install-sh"} + + # Installed binaries are usually stripped using `strip' when the user + # run `make install-strip'. However `strip' might not be the right +@@ -2335,7 +2329,7 @@ else + fi -+interix3*) -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' -+ ;; -+ - irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; -@@ -3980,7 +3992,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=$? -@@ -4531,7 +4544,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=$? -@@ -4701,7 +4715,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=$? -@@ -4768,7 +4783,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=$? -@@ -5028,7 +5044,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=$? -@@ -5086,7 +5103,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=$? -@@ -5157,7 +5175,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=$? -@@ -5201,7 +5220,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=$? -@@ -5343,12 +5363,7 @@ else + fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -6221,12 +6215,7 @@ else fi @@ -205,12 +106,12 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then -- ac_ext=cc -+ac_ext=cc +- ac_ext=cpp ++ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5578,8 +5593,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS +@@ -6460,8 +6449,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu @@ -219,27 +120,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -@@ -5719,7 +5732,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=$? -@@ -5768,7 +5782,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=$? -@@ -6839,9 +6854,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -7739,9 +7726,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -251,93 +132,17 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static='' ;; - msdosdjgpp*) -@@ -6870,6 +6887,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' - ;; -@@ -7338,6 +7360,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -7525,7 +7562,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=$? -@@ -7585,7 +7623,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=$? -@@ -7701,7 +7740,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -8701,7 +8690,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -7816,6 +7855,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec='${wl}-E' -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var=no -+ ;; -+ - 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' -@@ -8219,6 +8273,7 @@ beos*) +@@ -9231,6 +9220,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -345,10 +150,10 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 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' -@@ -8336,15 +8391,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -9356,15 +9346,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -368,22 +173,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -8420,15 +8476,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -9460,12 +9451,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -397,7 +187,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -8505,11 +8568,11 @@ knetbsd*-gnu) +@@ -9542,11 +9528,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -411,15 +201,16 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -8540,14 +8603,14 @@ nto-qnx*) +@@ -9577,7 +9563,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -9585,7 +9571,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -428,77 +219,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -8795,7 +8858,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=$? -@@ -8898,7 +8962,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=$? -@@ -8963,7 +9028,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=$? -@@ -9056,7 +9122,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=$? -@@ -9121,7 +9188,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=$? -@@ -9187,7 +9255,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=$? -@@ -9253,7 +9322,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=$? -@@ -10106,9 +10176,7 @@ echo "$as_me: error: tag name \"$tagname +@@ -11177,9 +11163,7 @@ echo "$as_me: error: tag name \"$tagname case $tagname in CXX) @@ -506,60 +227,19 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then + if test -n "$CXX" && test "X$CXX" != "Xno"; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -10495,7 +10563,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=$? -@@ -10556,7 +10625,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=$? -@@ -10684,7 +10754,7 @@ if test -z "$aix_libpath"; then aix_libp +@@ -11776,7 +11760,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -10842,6 +10912,20 @@ if test -z "$aix_libpath"; then aix_libp - ;; - esac - ;; -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_CXX='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ hardcode_direct_CXX=yes -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_CXX=no -+ ;; - irix5* | irix6*) - case $cc_basename in - CC*) -@@ -10972,14 +11056,29 @@ if test -z "$aix_libpath"; then aix_libp +@@ -12073,14 +12057,29 @@ if test -z "$aix_libpath"; then aix_libp ;; netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then @@ -591,29 +271,20 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ ;; openbsd2*) # C++ shared libraries are fairly broken -@@ -11366,6 +11465,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - esac - done +@@ -12516,6 +12515,12 @@ interix3*) + postdeps_CXX= + ;; -+ case "$host_os" in -+ netbsd*) -+ if test -n "$cpprt0_file"; then -+ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` -+ fi -+ ;; -+ interix3*) -+ # Interix installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ predep_objects_CXX= -+ postdep_objects_CXX= -+ postdeps_CXX= -+ ;; -+ esac ++netbsd*) ++ if test -n "$cpprt0_file"; then ++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'` ++ fi ++ ;; + - # Clean up. - rm -f a.out a.exe - else -@@ -11413,9 +11527,11 @@ echo $ECHO_N "checking for $compiler opt + solaris*) + case $cc_basename in + CC*) +@@ -12568,9 +12573,11 @@ echo $ECHO_N "checking for $compiler opt lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -626,27 +297,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ ;; *djgpp*) # DJGPP does not support shared libraries at all -@@ -11437,6 +11553,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' - ;; -@@ -11511,6 +11631,8 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -+ interix3*) -+ ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC*) -@@ -11991,6 +12113,7 @@ beos*) +@@ -13190,6 +13197,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -654,10 +305,10 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 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' -@@ -12108,15 +12231,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -13315,15 +13323,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -677,22 +328,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -12192,15 +12316,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -13419,12 +13428,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -706,7 +342,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -12277,11 +12408,11 @@ knetbsd*-gnu) +@@ -13501,11 +13505,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -720,15 +356,16 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -12312,14 +12443,14 @@ nto-qnx*) +@@ -13536,7 +13540,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -13544,7 +13548,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -737,77 +374,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -12567,7 +12698,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=$? -@@ -12670,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); } && -- { 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=$? -@@ -12735,7 +12868,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=$? -@@ -12828,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); } && -- { 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=$? -@@ -12893,7 +13028,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=$? -@@ -12959,7 +13095,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=$? -@@ -13025,7 +13162,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=$? -@@ -13887,9 +14025,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -14309,9 +14313,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -819,93 +386,17 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static_F77='' ;; - msdosdjgpp*) -@@ -13918,6 +14058,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' - ;; -@@ -14386,6 +14531,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -14563,7 +14723,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=$? -@@ -14613,7 +14774,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=$? -@@ -14729,7 +14891,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -15251,7 +15257,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -14844,6 +15006,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_F77='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ hardcode_direct_F77=yes -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_F77=no -+ ;; -+ - 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' -@@ -15247,6 +15424,7 @@ beos*) +@@ -15781,6 +15787,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -913,10 +404,10 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 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' -@@ -15364,15 +15542,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -15906,15 +15913,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -936,22 +427,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -15448,15 +15627,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -16010,12 +16018,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -965,7 +441,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -15533,11 +15719,11 @@ knetbsd*-gnu) +@@ -16092,11 +16095,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -979,15 +455,16 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -15568,14 +15754,14 @@ nto-qnx*) +@@ -16127,7 +16130,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -16135,7 +16138,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -996,7 +473,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -16335,9 +16521,11 @@ echo $ECHO_N "checking for $compiler opt +@@ -16891,9 +16894,11 @@ echo $ECHO_N "checking for $compiler opt ;; darwin* | rhapsody*) @@ -1008,93 +485,17 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ + lt_prog_compiler_static_GCJ='' ;; - msdosdjgpp*) -@@ -16366,6 +16554,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' - ;; -@@ -16834,6 +17027,21 @@ EOF - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -@@ -17021,7 +17229,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=$? -@@ -17081,7 +17290,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=$? -@@ -17197,7 +17407,7 @@ if test -z "$aix_libpath"; then aix_libp + interix3*) +@@ -17853,7 +17858,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) -@@ -17312,6 +17522,21 @@ if test -z "$aix_libpath"; then aix_libp - fi - ;; - -+ interix3*) -+ # Oy, what a hack. -+ # Because shlibs are not compiled -fPIC due to broken code, we must -+ # choose an --image-base. Otherwise, 0x10000000 will be chosen for -+ # all libraries, leading to runtime relocations -- slow and very -+ # memory consuming. To do this, we pick a random 256KB-aligned -+ # start address between 0x50000000 and 0x6ffc0000 at link time. -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ archive_expsym_cmds_GCJ='sed s,^,_, $export_symbols >$output_objdir/$soname.exp && $CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$output_objdir/$soname.exp ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ hardcode_direct_GCJ=yes -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ hardcode_shlibpath_var_GCJ=no -+ ;; -+ - 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' -@@ -17715,6 +17940,7 @@ beos*) +@@ -18383,6 +18388,7 @@ beos*) bsdi[45]*) version_type=linux need_version=no @@ -1102,10 +503,10 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 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' -@@ -17832,15 +18058,16 @@ freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` +@@ -18508,15 +18514,16 @@ freebsd* | dragonfly*) + *) objformat=elf ;; + esac + fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) @@ -1125,22 +526,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ need_version=yes ;; esac -@@ -17916,15 +18143,22 @@ hpux9* | hpux10* | hpux11*) - postinstall_cmds='chmod 555 $lib' - ;; - -+interix3*) -+ version_type=linux -+ 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 3.x ld.so' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ +@@ -18612,12 +18619,7 @@ interix3*) irix5* | irix6* | nonstopux*) case $host_os in nonstopux*) version_type=nonstopux ;; @@ -1154,7 +540,7 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ esac need_lib_prefix=no need_version=no -@@ -18001,11 +18235,11 @@ knetbsd*-gnu) +@@ -18694,11 +18696,11 @@ knetbsd*-gnu) ;; netbsd*) @@ -1168,15 +554,16 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else -@@ -18036,14 +18270,14 @@ nto-qnx*) +@@ -18729,7 +18731,7 @@ nto-qnx*) ;; openbsd*) - version_type=sunos + version_type=linux + sys_lib_dlsearch_path_spec="/usr/lib" need_lib_prefix=no # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in +@@ -18737,7 +18739,7 @@ openbsd*) openbsd3.3 | openbsd3.3.*) need_version=yes ;; *) need_version=no ;; esac @@ -1185,338 +572,11 @@ $NetBSD: patch-ad,v 1.27 2005/11/09 18:05:56 tv Exp $ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -18291,7 +18525,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=$? -@@ -18394,7 +18629,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=$? -@@ -18459,7 +18695,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=$? -@@ -18552,7 +18789,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=$? -@@ -18617,7 +18855,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=$? -@@ -18683,7 +18922,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=$? -@@ -18749,7 +18989,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=$? -@@ -20014,7 +20255,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=$? -@@ -20086,7 +20328,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=$? -@@ -20140,7 +20383,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=$? -@@ -20211,7 +20455,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=$? -@@ -20265,7 +20510,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=$? -@@ -20517,7 +20763,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=$? -@@ -20586,7 +20833,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=$? -@@ -20657,7 +20905,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=$? -@@ -20717,7 +20966,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=$? -@@ -20776,7 +21026,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=$? -@@ -20847,7 +21098,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=$? -@@ -20945,7 +21197,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=$? -@@ -21070,7 +21323,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=$? -@@ -21391,7 +21645,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=$? -@@ -21542,7 +21797,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=$? -@@ -21654,7 +21910,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=$? -@@ -21747,7 +22004,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=$? -@@ -21899,7 +22157,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=$? -@@ -22049,7 +22308,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=$? -@@ -22235,7 +22495,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=$? -@@ -22337,7 +22598,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=$? -@@ -22439,7 +22701,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=$? -@@ -22541,7 +22804,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=$? -@@ -22644,7 +22908,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=$? -@@ -23587,6 +23852,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. */ -@@ -23625,12 +23895,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 +@@ -22719,7 +22721,6 @@ if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then +- # FIXME: next line outputs $as_me, which is still unset. + { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; }; } + fi -- cgit v1.2.3