head	1.86;
access;
symbols
	pkgsrc-2016Q4:1.85.0.8
	pkgsrc-2016Q4-base:1.85
	pkgsrc-2016Q3:1.85.0.6
	pkgsrc-2016Q3-base:1.85
	pkgsrc-2016Q2:1.85.0.4
	pkgsrc-2016Q2-base:1.85
	pkgsrc-2016Q1:1.85.0.2
	pkgsrc-2016Q1-base:1.85
	pkgsrc-2015Q4:1.84.0.12
	pkgsrc-2015Q4-base:1.84
	pkgsrc-2015Q3:1.84.0.10
	pkgsrc-2015Q3-base:1.84
	pkgsrc-2015Q2:1.84.0.8
	pkgsrc-2015Q2-base:1.84
	pkgsrc-2015Q1:1.84.0.6
	pkgsrc-2015Q1-base:1.84
	pkgsrc-2014Q4:1.84.0.4
	pkgsrc-2014Q4-base:1.84
	pkgsrc-2014Q3:1.84.0.2
	pkgsrc-2014Q3-base:1.84
	pkgsrc-2014Q2:1.81.0.2
	pkgsrc-2014Q2-base:1.81
	pkgsrc-2014Q1:1.78.0.2
	pkgsrc-2014Q1-base:1.78
	pkgsrc-2013Q4:1.77.0.4
	pkgsrc-2013Q4-base:1.77
	pkgsrc-2013Q3:1.77.0.2
	pkgsrc-2013Q3-base:1.77
	pkgsrc-2013Q2:1.76.0.2
	pkgsrc-2013Q2-base:1.76
	pkgsrc-2013Q1:1.73.0.6
	pkgsrc-2013Q1-base:1.73
	pkgsrc-2012Q4:1.73.0.4
	pkgsrc-2012Q4-base:1.73
	pkgsrc-2012Q3:1.73.0.2
	pkgsrc-2012Q3-base:1.73
	pkgsrc-2012Q2:1.72.0.8
	pkgsrc-2012Q2-base:1.72
	pkgsrc-2012Q1:1.72.0.6
	pkgsrc-2012Q1-base:1.72
	pkgsrc-2011Q4:1.72.0.4
	pkgsrc-2011Q4-base:1.72
	pkgsrc-2011Q3:1.72.0.2
	pkgsrc-2011Q3-base:1.72
	pkgsrc-2011Q2:1.70.0.2
	pkgsrc-2011Q2-base:1.70
	pkgsrc-2011Q1:1.69.0.2
	pkgsrc-2011Q1-base:1.69
	pkgsrc-2010Q4:1.68.0.8
	pkgsrc-2010Q4-base:1.68
	pkgsrc-2010Q3:1.68.0.6
	pkgsrc-2010Q3-base:1.68
	pkgsrc-2010Q2:1.68.0.4
	pkgsrc-2010Q2-base:1.68
	pkgsrc-2010Q1:1.68.0.2
	pkgsrc-2010Q1-base:1.68
	pkgsrc-2009Q4:1.67.0.2
	pkgsrc-2009Q4-base:1.67
	pkgsrc-2009Q3:1.63.0.2
	pkgsrc-2009Q3-base:1.63
	pkgsrc-2009Q2:1.62.0.4
	pkgsrc-2009Q2-base:1.62
	pkgsrc-2009Q1:1.62.0.2
	pkgsrc-2009Q1-base:1.62
	pkgsrc-2008Q4:1.61.0.2
	pkgsrc-2008Q4-base:1.61
	pkgsrc-2008Q3:1.60.0.14
	pkgsrc-2008Q3-base:1.60
	cube-native-xorg:1.60.0.12
	cube-native-xorg-base:1.60
	pkgsrc-2008Q2:1.60.0.10
	pkgsrc-2008Q2-base:1.60
	cwrapper:1.60.0.8
	pkgsrc-2008Q1:1.60.0.6
	pkgsrc-2008Q1-base:1.60
	pkgsrc-2007Q4:1.60.0.4
	pkgsrc-2007Q4-base:1.60
	pkgsrc-2007Q3:1.60.0.2
	pkgsrc-2007Q3-base:1.60
	pkgsrc-2007Q2:1.58.0.6
	pkgsrc-2007Q2-base:1.58
	pkgsrc-2007Q1:1.58.0.4
	pkgsrc-2007Q1-base:1.58
	pkgsrc-2006Q4:1.58.0.2
	pkgsrc-2006Q4-base:1.58
	pkgsrc-2006Q3:1.57.0.6
	pkgsrc-2006Q3-base:1.57
	pkgsrc-2006Q2:1.57.0.4
	pkgsrc-2006Q2-base:1.57
	pkgsrc-2006Q1:1.57.0.2
	pkgsrc-2006Q1-base:1.57
	tv-libtool-1-5-18-tmpdirfix:1.55.0.4
	pkgsrc-2005Q4:1.55.0.2
	pkgsrc-2005Q4-base:1.55
	pkgsrc-2005Q3:1.54.0.2
	pkgsrc-2005Q3-base:1.54
	pkgsrc-2005Q2:1.52.0.2
	pkgsrc-2005Q2-base:1.52
	pkgsrc-2005Q1:1.49.0.2
	pkgsrc-2005Q1-base:1.49
	pkgsrc-2004Q4:1.47.0.2
	pkgsrc-2004Q4-base:1.47
	pkgsrc-2004Q3:1.39.0.4
	pkgsrc-2004Q3-base:1.39
	pkgsrc-2004Q2:1.39.0.2
	pkgsrc-2004Q2-base:1.39
	pkgsrc-2004Q1:1.33.0.2
	pkgsrc-2004Q1-base:1.33
	pkgsrc-2003Q4:1.29.0.2
	pkgsrc-2003Q4-base:1.29
	netbsd-1-6-1:1.28.0.2
	netbsd-1-6-1-base:1.28
	netbsd-1-6:1.25.0.8
	netbsd-1-6-RELEASE-base:1.25
	pkgviews:1.25.0.4
	pkgviews-base:1.25
	buildlink2:1.25.0.2
	buildlink2-base:1.25
	netbsd-1-5-PATCH003:1.25
	netbsd-1-5-PATCH001:1.21
	netbsd-1-5-RELEASE:1.11
	netbsd-1-4-PATCH003:1.11
	netbsd-1-3-PATCH003:1.6
	FREEBSD-19980711:1.1.1.1
	FREEBSD:1.1.1;
locks; strict;
comment	@# @;


1.86
date	2017.03.06.16.14.07;	author jperkin;	state dead;
branches;
next	1.85;
commitid	o6zvJAUprKsbrvIz;

1.85
date	2016.03.10.12.43.48;	author tnn;	state Exp;
branches;
next	1.84;
commitid	jFRsHqxIL7cZW5Yy;

1.84
date	2014.09.10.10.44.58;	author richard;	state Exp;
branches;
next	1.83;
commitid	LpXO9l8izxP9TMPx;

1.83
date	2014.09.10.10.14.07;	author richard;	state Exp;
branches;
next	1.82;
commitid	YPGN7bUdBbHxHMPx;

1.82
date	2014.09.01.12.39.15;	author jperkin;	state Exp;
branches;
next	1.81;
commitid	0iFJtgMXloJKMDOx;

1.81
date	2014.06.15.14.42.05;	author joerg;	state Exp;
branches;
next	1.80;
commitid	jC781edwicOMZCEx;

1.80
date	2014.05.10.15.32.08;	author joerg;	state Exp;
branches;
next	1.79;
commitid	ulZBXmbIHjyKq0Ax;

1.79
date	2014.05.10.13.29.41;	author richard;	state Exp;
branches;
next	1.78;
commitid	PCAd230SpublFZzx;

1.78
date	2014.03.08.19.57.25;	author joerg;	state Exp;
branches;
next	1.77;
commitid	skbpVCXXacZkVVrx;

1.77
date	2013.08.27.15.50.23;	author joerg;	state Exp;
branches;
next	1.76;
commitid	qfu772Oon2ulJ63x;

1.76
date	2013.07.01.15.59.06;	author bsiegert;	state Exp;
branches;
next	1.75;
commitid	3gK4a8wQSJRnDMVw;

1.75
date	2013.05.13.12.53.42;	author adam;	state Exp;
branches;
next	1.74;
commitid	Q37HeCFvWBgSbtPw;

1.74
date	2013.04.12.13.44.08;	author joerg;	state Exp;
branches;
next	1.73;

1.73
date	2012.07.26.12.04.04;	author bsiegert;	state Exp;
branches;
next	1.72;

1.72
date	2011.09.16.15.08.27;	author joerg;	state Exp;
branches;
next	1.71;

1.71
date	2011.09.14.16.35.51;	author hans;	state Exp;
branches;
next	1.70;

1.70
date	2011.05.14.16.49.45;	author bsiegert;	state Exp;
branches;
next	1.69;

1.69
date	2011.03.23.15.46.36;	author obache;	state Exp;
branches;
next	1.68;

1.68
date	2010.03.17.10.59.45;	author markd;	state Exp;
branches;
next	1.67;

1.67
date	2009.12.18.22.11.10;	author joerg;	state Exp;
branches;
next	1.66;

1.66
date	2009.12.17.00.53.52;	author joerg;	state Exp;
branches;
next	1.65;

1.65
date	2009.12.16.15.27.33;	author joerg;	state Exp;
branches;
next	1.64;

1.64
date	2009.12.15.17.35.37;	author joerg;	state Exp;
branches;
next	1.63;

1.63
date	2009.07.08.21.01.43;	author markd;	state Exp;
branches;
next	1.62;

1.62
date	2009.03.23.23.03.59;	author joerg;	state Exp;
branches;
next	1.61;

1.61
date	2008.11.19.01.26.52;	author chuck;	state Exp;
branches;
next	1.60;

1.60
date	2007.10.07.12.31.59;	author joerg;	state Exp;
branches;
next	1.59;

1.59
date	2007.09.15.12.11.45;	author joerg;	state Exp;
branches;
next	1.58;

1.58
date	2006.12.15.11.28.51;	author dmcmahill;	state Exp;
branches;
next	1.57;

1.57
date	2006.02.06.18.57.30;	author tv;	state Exp;
branches;
next	1.56;

1.56
date	2006.01.30.22.19.56;	author tv;	state Exp;
branches;
next	1.55;

1.55
date	2005.11.09.18.05.56;	author tv;	state Exp;
branches;
next	1.54;

1.54
date	2005.07.03.19.42.14;	author tv;	state Exp;
branches;
next	1.53;

1.53
date	2005.07.03.19.01.50;	author tv;	state Exp;
branches;
next	1.52;

1.52
date	2005.05.18.14.40.04;	author tv;	state Exp;
branches;
next	1.51;

1.51
date	2005.05.18.11.57.12;	author adam;	state Exp;
branches;
next	1.50;

1.50
date	2005.03.22.15.12.08;	author tv;	state Exp;
branches;
next	1.49;

1.49
date	2005.01.18.18.51.15;	author tv;	state Exp;
branches;
next	1.48;

1.48
date	2004.12.21.13.50.23;	author grant;	state Exp;
branches;
next	1.47;

1.47
date	2004.12.18.17.42.24;	author grant;	state Exp;
branches
	1.47.2.1;
next	1.46;

1.46
date	2004.11.11.22.29.03;	author tv;	state Exp;
branches;
next	1.45;

1.45
date	2004.10.12.04.41.39;	author tv;	state Exp;
branches;
next	1.44;

1.44
date	2004.10.11.17.19.53;	author tv;	state Exp;
branches;
next	1.43;

1.43
date	2004.10.11.16.51.56;	author tv;	state Exp;
branches;
next	1.42;

1.42
date	2004.10.08.17.37.50;	author tv;	state Exp;
branches;
next	1.41;

1.41
date	2004.10.04.19.48.09;	author tv;	state Exp;
branches;
next	1.40;

1.40
date	2004.10.03.00.13.31;	author tv;	state Exp;
branches;
next	1.39;

1.39
date	2004.05.25.15.17.07;	author grant;	state Exp;
branches;
next	1.38;

1.38
date	2004.04.23.01.17.25;	author danw;	state Exp;
branches;
next	1.37;

1.37
date	2004.04.22.14.40.29;	author tv;	state Exp;
branches;
next	1.36;

1.36
date	2004.04.21.19.24.49;	author tv;	state Exp;
branches;
next	1.35;

1.35
date	2004.04.21.14.55.32;	author tv;	state Exp;
branches;
next	1.34;

1.34
date	2004.04.20.18.29.34;	author tv;	state Exp;
branches;
next	1.33;

1.33
date	2004.03.12.00.11.17;	author danw;	state Exp;
branches;
next	1.32;

1.32
date	2004.02.23.10.54.08;	author markd;	state Exp;
branches;
next	1.31;

1.31
date	2004.02.08.11.21.58;	author skrll;	state Exp;
branches;
next	1.30;

1.30
date	2004.02.05.20.14.06;	author skrll;	state Exp;
branches;
next	1.29;

1.29
date	2003.10.05.08.19.19;	author grant;	state Exp;
branches;
next	1.28;

1.28
date	2003.01.21.22.43.42;	author grant;	state Exp;
branches;
next	1.27;

1.27
date	2002.12.25.19.35.22;	author jschauma;	state Exp;
branches;
next	1.26;

1.26
date	2002.12.23.19.32.13;	author jschauma;	state Exp;
branches;
next	1.25;

1.25
date	2002.03.26.16.31.28;	author skrll;	state Exp;
branches;
next	1.24;

1.24
date	2002.03.01.15.40.44;	author skrll;	state Exp;
branches;
next	1.23;

1.23
date	2001.06.20.08.10.49;	author skrll;	state Exp;
branches;
next	1.22;

1.22
date	2001.06.14.14.55.47;	author skrll;	state Exp;
branches;
next	1.21;

1.21
date	2001.05.09.10.24.11;	author agc;	state Exp;
branches;
next	1.20;

1.20
date	2001.04.03.17.06.17;	author skrll;	state Exp;
branches;
next	1.19;

1.19
date	2001.03.12.11.23.04;	author skrll;	state Exp;
branches;
next	1.18;

1.18
date	2001.02.28.18.18.23;	author skrll;	state Exp;
branches;
next	1.17;

1.17
date	2001.02.28.10.16.58;	author skrll;	state Exp;
branches;
next	1.16;

1.16
date	2001.02.27.08.20.25;	author skrll;	state Exp;
branches;
next	1.15;

1.15
date	2001.01.26.16.42.45;	author skrll;	state Exp;
branches;
next	1.14;

1.14
date	2001.01.15.15.18.24;	author jlam;	state Exp;
branches;
next	1.13;

1.13
date	2001.01.09.18.37.46;	author bad;	state Exp;
branches;
next	1.12;

1.12
date	2000.11.26.11.22.40;	author mycroft;	state Exp;
branches;
next	1.11;

1.11
date	2000.09.14.10.20.46;	author skrll;	state Exp;
branches;
next	1.10;

1.10
date	2000.06.04.17.56.17;	author rh;	state Exp;
branches;
next	1.9;

1.9
date	2000.06.04.16.46.47;	author rh;	state Exp;
branches;
next	1.8;

1.8
date	2000.06.01.09.36.47;	author rh;	state Exp;
branches;
next	1.7;

1.7
date	98.10.02.14.49.33;	author tv;	state dead;
branches;
next	1.6;

1.6
date	98.08.07.10.40.26;	author agc;	state Exp;
branches;
next	1.5;

1.5
date	98.07.21.21.10.22;	author tv;	state Exp;
branches;
next	1.4;

1.4
date	98.07.17.14.48.15;	author tv;	state Exp;
branches;
next	1.3;

1.3
date	98.07.16.13.36.47;	author tv;	state Exp;
branches;
next	1.2;

1.2
date	98.07.13.01.53.49;	author tv;	state dead;
branches;
next	1.1;

1.1
date	98.07.13.01.50.08;	author tv;	state Exp;
branches
	1.1.1.1;
next	;

1.47.2.1
date	2004.12.23.03.35.47;	author snj;	state Exp;
branches;
next	;

1.1.1.1
date	98.07.13.01.50.08;	author tv;	state Exp;
branches;
next	;


desc
@@


1.86
log
@Update libtool packages to 2.4.6.

Changes since 2.4.2 are too numerous to mention, with over 4,700 lines
in the ChangeLog file.  However, this release does at least fix a large
number of build failures on SmartOS, and doesn't appear to cause any
obvious regressions in bulk builds performed by Joerg and myself.

Some pkgsrc cleanups while here, including merging the MirBSD patches
correctly.  It couldn't be made much clearer how to properly integrate
patches here to ensure they are not lost.  Next time you might not be so
fortunate!
@
text
@$NetBSD: patch-ab,v 1.85 2016/03/10 12:43:48 tnn Exp $

--- configure.orig	2016-03-10 10:28:17.598171804 +0000
+++ configure
@@@@ -5335,7 +5335,7 @@@@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@@@ -5829,12 +5829,19 @@@@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+midnightbsd*)
+  # might to use match_pattern like MirBSD, but there is no well-defined
+  # naming scheme for libraries yet, as the current one is deprecated, and
+  # the new one in a state of flux especially between mports and MirPorts
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+mirbsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  ;;
+
 netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
   ;;
 
 newos6*)
@@@@ -5844,7 +5851,7 @@@@ newos6*)
   ;;
 
 *nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|S\.a)$'
   ;;
 
 openbsd*)
@@@@ -6473,7 +6480,7 @@@@ fi
 
 case $host_os in
   darwin*)
-    lock_old_archive_extraction=yes ;;
+    lock_old_archive_extraction=no ;;	# work around bug #14579
   *)
     lock_old_archive_extraction=no ;;
 esac
@@@@ -6562,7 +6569,7 @@@@ osf*)
   symcode='[BCDEGQRST]'
   ;;
 solaris*)
-  symcode='[BDRT]'
+  symcode='[BCDRT]'
   ;;
 sco3.2v5*)
   symcode='[DT]'
@@@@ -8493,7 +8500,10 @@@@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@@@ -8806,9 +8816,16 @@@@ lt_prog_compiler_static=
       ;;
 
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic='-fno-common'
+      lt_prog_compiler_static=''
+      ;;
+
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic=
       ;;
 
     haiku*)
@@@@ -8836,6 +8853,13 @@@@ lt_prog_compiler_static=
       # Instead, we relocate shared libraries at runtime.
       ;;
 
+    mint*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@@@ -8988,6 +9012,15 @@@@ lt_prog_compiler_static=
       esac
       ;;
 
+    mirbsd*)
+      case $cc_basename in
+      # pkgsrc f77 is f2c, which uses gcc underneath.
+      f77*)
+	lt_prog_compiler_wl='-Wl,'
+	;;
+      esac
+      ;;
+
     newsos6)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@@@ -9063,6 +9096,9 @@@@ lt_prog_compiler_static=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
@@@@ -9608,16 +9644,29 @@@@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
+    mirbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec='${wl}-E'
       else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	ld_shlibs=no
       fi
       ;;
 
+    netbsd*)
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      output_verbose_link_cmd=func_echo_all
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@@@ -10026,7 +10075,7 @@@@ fi
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -10238,15 +10287,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    mirbsd*)
+     if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec='${wl}-E'
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	ld_shlibs=no
       fi
-      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+
+    netbsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
+      output_verbose_link_cmd=func_echo_all
       ;;
 
     newsos6)
@@@@ -10258,6 +10320,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       ;;
 
     *nto* | *qnx*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
       ;;
 
     openbsd*)
@@@@ -11031,7 +11098,7 @@@@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@@@ -11045,7 +11112,7 @@@@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
@@@@ -11068,13 +11135,24 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  *) # from 4.6 on, and DragonFly
+  *) # from 4.6 on
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   esac
   ;;
 
+dragonfly*)
+  version_type=linux
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@@@ -11162,12 +11240,7 @@@@ interix[3-9]*)
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
+    *) version_type=irix ;;
   esac
   need_lib_prefix=no
   need_version=no
@@@@ -11266,19 +11339,36 @@@@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+midnightbsd*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+mirbsd*)
+  version_type=linux
+  sys_lib_search_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 netbsd*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
+  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='NetBSD ld.elf_so'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@@@ -11304,7 +11394,7 @@@@ newsos6)
   ;;
 
 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.
@@@@ -11312,7 +11402,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
     *)				need_version=no  ;;
   esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
   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
@@@@ -12847,6 +12937,9 @@@@ else
     # at 6.2 and later dlopen does load deplibs.
     lt_cv_sys_dlopen_deplibs=yes
     ;;
+  mirbsd*)
+    lt_cv_sys_dlopen_deplibs=yes
+    ;;
   netbsd*)
     lt_cv_sys_dlopen_deplibs=yes
     ;;
@@@@ -13536,9 +13629,7 @@@@ func_stripname_cnf ()
   esac
 } # func_stripname_cnf
 
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (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=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@@@ -13786,7 +13877,10 @@@@ $RM -r conftest*
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@@@ -14282,7 +14376,7 @@@@ fi
   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -14651,6 +14745,22 @@@@ fi
         ld_shlibs_CXX=no
 	;;
 
+      mirbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}-E'
+	  whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  output_verbose_link_cmd='echo'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       mvs*)
         case $cc_basename in
           cxx*)
@@@@ -14665,15 +14775,13 @@@@ fi
 	;;
 
       netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	ld_shlibs_CXX=yes
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	hardcode_direct_CXX=yes
+	hardcode_shlibpath_var_CXX=no
+	output_verbose_link_cmd=func_echo_all
 	;;
 
       *nto* | *qnx*)
@@@@ -14852,27 +14960,14 @@@@ fi
 	    # GNU C++ compiler with Solaris linker
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	      archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
 	      case $host_os in
@@@@ -15014,13 +15109,11 @@@@ if { { eval echo "\"\$as_me\":${as_linen
     case ${prev}${p} in
 
     -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
+       # Some compilers place space between "-{L,R,l}" and the path or
+       # library.  Remove the space.
+       case $p in
+       -L|-R|-l) prev=$p; continue ;;
+       esac
 
        # Expand the sysroot to ease extracting the directories later.
        if test -z "$prev"; then
@@@@ -15236,9 +15329,15 @@@@ lt_prog_compiler_static_CXX=
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_CXX='-fno-common'
+      lt_prog_compiler_static_CXX=''
+      ;;
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
       ;;
     *djgpp*)
       # DJGPP does not support shared libraries at all
@@@@ -15316,6 +15415,9 @@@@ lt_prog_compiler_static_CXX=
 	    ;;
 	esac
 	;;
+      mint*)
+	# FreeMiNT uses GNU C++
+	;;
       freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
@@@@ -15513,6 +15615,9 @@@@ lt_prog_compiler_static_CXX=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic_CXX=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic_CXX=
     ;;
@@@@ -16184,7 +16289,7 @@@@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@@@ -16198,7 +16303,7 @@@@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
@@@@ -16221,13 +16326,24 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  *) # from 4.6 on, and DragonFly
+  *) # from 4.6 on
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   esac
   ;;
 
+dragonfly*)
+  version_type=linux
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@@@ -16315,12 +16431,7 @@@@ interix[3-9]*)
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
+    *) version_type=irix ;;
   esac
   need_lib_prefix=no
   need_version=no
@@@@ -16419,19 +16530,36 @@@@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+midnightbsd*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+mirbsd*)
+  version_type=linux
+  sys_lib_search_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 netbsd*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
+  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='NetBSD ld.elf_so'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@@@ -16457,7 +16585,7 @@@@ newsos6)
   ;;
 
 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.
@@@@ -16465,7 +16593,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
     *)				need_version=no  ;;
   esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
   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
@@@@ -17039,7 +17167,10 @@@@ $RM -r conftest*
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   GCC=$G77
   if test -n "$compiler"; then
@@@@ -17131,9 +17262,16 @@@@ lt_prog_compiler_static_F77=
       ;;
 
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_F77='-fno-common'
+      lt_prog_compiler_static_F77=''
+      ;;
+
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic_F77=
       ;;
 
     haiku*)
@@@@ -17161,6 +17299,13 @@@@ lt_prog_compiler_static_F77=
       # Instead, we relocate shared libraries at runtime.
       ;;
 
+    mint*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_F77=no
+      enable_shared=no
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@@@ -17313,6 +17458,15 @@@@ lt_prog_compiler_static_F77=
       esac
       ;;
 
+    mirbsd*)
+      case $cc_basename in
+      # pkgsrc f77 is f2c, which uses gcc underneath.
+      f77*)
+	lt_prog_compiler_wl_F77='-Wl,'
+	;;
+      esac
+      ;;
+
     newsos6)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@@@ -17388,6 +17542,9 @@@@ lt_prog_compiler_static_F77=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic_F77=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic_F77=
     ;;
@@@@ -17918,16 +18075,29 @@@@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
+    mirbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	hardcode_direct_absolute_F77=yes
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_F77='${wl}-E'
       else
-	archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	ld_shlibs_F77=no
       fi
       ;;
 
+    netbsd*)
+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      output_verbose_link_cmd=func_echo_all
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_F77=no
@@@@ -18324,7 +18494,7 @@@@ fi
   allow_undefined_flag_F77="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -18498,15 +18668,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    mirbsd*)
+     if test -f /usr/libexec/ld.so; then
+	hardcode_direct_F77=yes
+	hardcode_shlibpath_var_F77=no
+	hardcode_direct_absolute_F77=yes
+	archive_cmds_F77='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_F77='${wl}-E'
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	ld_shlibs_F77=no
       fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
+      ;;
+
+    netbsd*)
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
       hardcode_direct_F77=yes
       hardcode_shlibpath_var_F77=no
+      output_verbose_link_cmd=func_echo_all
       ;;
 
     newsos6)
@@@@ -18518,6 +18701,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       ;;
 
     *nto* | *qnx*)
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
       ;;
 
     openbsd*)
@@@@ -19126,7 +19314,7 @@@@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@@@ -19140,7 +19328,7 @@@@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
@@@@ -19163,13 +19351,24 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  *) # from 4.6 on, and DragonFly
+  *) # from 4.6 on
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   esac
   ;;
 
+dragonfly*)
+  version_type=linux
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@@@ -19257,12 +19456,7 @@@@ interix[3-9]*)
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
+    *) version_type=irix ;;
   esac
   need_lib_prefix=no
   need_version=no
@@@@ -19355,19 +19549,36 @@@@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+midnightbsd*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+mirbsd*)
+  version_type=linux
+  sys_lib_search_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 netbsd*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
+  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='NetBSD ld.elf_so'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@@@ -19393,7 +19604,7 @@@@ newsos6)
   ;;
 
 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.
@@@@ -19401,7 +19612,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
     *)				need_version=no  ;;
   esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
   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
@@@@ -19966,7 +20177,10 @@@@ $RM -r conftest*
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@@@ -20052,13 +20266,11 @@@@ if { { eval echo "\"\$as_me\":${as_linen
     case ${prev}${p} in
 
     -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
+       # Some compilers place space between "-{L,R,l}" and the path or
+       # library.  Remove the space.
+       case $p in
+       -L|-R|-l) prev=$p; continue ;;
+       esac
 
        # Expand the sysroot to ease extracting the directories later.
        if test -z "$prev"; then
@@@@ -20203,9 +20415,16 @@@@ lt_prog_compiler_static_FC=
       ;;
 
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_FC='-fno-common'
+      lt_prog_compiler_static_FC=''
+      ;;
+
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic_FC=
       ;;
 
     haiku*)
@@@@ -20233,6 +20452,13 @@@@ lt_prog_compiler_static_FC=
       # Instead, we relocate shared libraries at runtime.
       ;;
 
+    mint*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_FC=no
+      enable_shared=no
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@@@ -20385,6 +20611,15 @@@@ lt_prog_compiler_static_FC=
       esac
       ;;
 
+    mirbsd*)
+      case $cc_basename in
+      # pkgsrc f77 is f2c, which uses gcc underneath.
+      f77*)
+	lt_prog_compiler_wl_FC='-Wl,'
+	;;
+      esac
+      ;;
+
     newsos6)
       lt_prog_compiler_pic_FC='-KPIC'
       lt_prog_compiler_static_FC='-Bstatic'
@@@@ -20460,6 +20695,9 @@@@ lt_prog_compiler_static_FC=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic_FC=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic_FC=
     ;;
@@@@ -20990,16 +21228,29 @@@@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
+    mirbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_FC=yes
+	hardcode_shlibpath_var_FC=no
+	hardcode_direct_absolute_FC=yes
+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_FC='${wl}-E'
       else
-	archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	ld_shlibs_FC=no
       fi
       ;;
 
+    netbsd*)
+      archive_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+      hardcode_direct_FC=yes
+      hardcode_shlibpath_var_FC=no
+      output_verbose_link_cmd=func_echo_all
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_FC=no
@@@@ -21396,7 +21647,7 @@@@ fi
   allow_undefined_flag_FC="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -21570,15 +21821,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       link_all_deplibs_FC=yes
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    mirbsd*)
+     if test -f /usr/libexec/ld.so; then
+	hardcode_direct_FC=yes
+	hardcode_shlibpath_var_FC=no
+	hardcode_direct_absolute_FC=yes
+	archive_cmds_FC='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_FC='${wl}-E'
+	whole_archive_flag_spec_FC="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	archive_cmds_FC='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	ld_shlibs_FC=no
       fi
-      hardcode_libdir_flag_spec_FC='-R$libdir'
+      ;;
+
+    netbsd*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
       hardcode_direct_FC=yes
       hardcode_shlibpath_var_FC=no
+      output_verbose_link_cmd=func_echo_all
       ;;
 
     newsos6)
@@@@ -21590,6 +21854,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       ;;
 
     *nto* | *qnx*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_FC='-R$libdir'
+      hardcode_direct_FC=yes
+      hardcode_shlibpath_var_FC=no
       ;;
 
     openbsd*)
@@@@ -22198,7 +22467,7 @@@@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd* | dragonfly*)
+freebsd*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
@@@@ -22212,7 +22481,7 @@@@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
       need_version=no
       need_lib_prefix=no
       ;;
@@@@ -22235,13 +22504,24 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  *) # from 4.6 on, and DragonFly
+  *) # from 4.6 on
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   esac
   ;;
 
+dragonfly*)
+  version_type=linux
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
@@@@ -22329,12 +22609,7 @@@@ interix[3-9]*)
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
+    *) version_type=irix ;;
   esac
   need_lib_prefix=no
   need_version=no
@@@@ -22427,19 +22702,36 @@@@ fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+midnightbsd*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+mirbsd*)
+  version_type=linux
+  sys_lib_search_path_spec="/usr/lib"
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 netbsd*)
-  version_type=sunos
+  version_type=linux
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
+  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='NetBSD ld.elf_so'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
@@@@ -22465,7 +22757,7 @@@@ newsos6)
   ;;
 
 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.
@@@@ -22473,7 +22765,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
     *)				need_version=no  ;;
   esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
   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
@@@@ -22883,7 +23175,10 @@@@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Go did not exist at the time GCC didn't implicitly link libc in.
@@@@ -23003,9 +23298,16 @@@@ lt_prog_compiler_static_GO=
       ;;
 
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_GO='-fno-common'
+      lt_prog_compiler_static_GO=''
+      ;;
+
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic_GO=
       ;;
 
     haiku*)
@@@@ -23033,6 +23335,13 @@@@ lt_prog_compiler_static_GO=
       # Instead, we relocate shared libraries at runtime.
       ;;
 
+    mint*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_GO=no
+      enable_shared=no
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@@@ -23185,6 +23494,15 @@@@ lt_prog_compiler_static_GO=
       esac
       ;;
 
+    mirbsd*)
+      case $cc_basename in
+      # pkgsrc f77 is f2c, which uses gcc underneath.
+      f77*)
+	lt_prog_compiler_wl_GO='-Wl,'
+	;;
+      esac
+      ;;
+
     newsos6)
       lt_prog_compiler_pic_GO='-KPIC'
       lt_prog_compiler_static_GO='-Bstatic'
@@@@ -23260,6 +23578,9 @@@@ lt_prog_compiler_static_GO=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic_GO=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic_GO=
     ;;
@@@@ -23790,16 +24111,29 @@@@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_GO='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
+    mirbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GO=yes
+	hardcode_shlibpath_var_GO=no
+	hardcode_direct_absolute_GO=yes
+	archive_cmds_GO='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GO='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GO='${wl}-E'
       else
-	archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	ld_shlibs_GO=no
       fi
       ;;
 
+    netbsd*)
+      archive_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GO='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
+      hardcode_direct_GO=yes
+      hardcode_shlibpath_var_GO=no
+      output_verbose_link_cmd=func_echo_all
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GO=no
@@@@ -24208,7 +24542,7 @@@@ fi
   allow_undefined_flag_GO="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -24381,15 +24715,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       link_all_deplibs_GO=yes
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_GO='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    mirbsd*)
+     if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GO=yes
+	hardcode_shlibpath_var_GO=no
+	hardcode_direct_absolute_GO=yes
+	archive_cmds_GO='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	archive_expsym_cmds_GO='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GO='${wl}-E'
+	whole_archive_flag_spec_GO="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	archive_cmds_GO='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	ld_shlibs_GO=no
       fi
-      hardcode_libdir_flag_spec_GO='-R$libdir'
+      ;;
+
+    netbsd*)
+      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
       hardcode_direct_GO=yes
       hardcode_shlibpath_var_GO=no
+      output_verbose_link_cmd=func_echo_all
       ;;
 
     newsos6)
@@@@ -24401,6 +24748,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       ;;
 
     *nto* | *qnx*)
+      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GO='-R$libdir'
+      hardcode_direct_GO=yes
+      hardcode_shlibpath_var_GO=no
       ;;
 
     openbsd*)
@@@@ -24980,7 +25332,10 @@@@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
@@@@ -25100,9 +25455,16 @@@@ lt_prog_compiler_static_GCJ=
       ;;
 
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_GCJ='-fno-common'
+      lt_prog_compiler_static_GCJ=''
+      ;;
+
+    *mint*)
+      # FreeMiNT does not support shared libraries at all
+      lt_prog_compiler_pic_GCJ=
       ;;
 
     haiku*)
@@@@ -25130,6 +25492,13 @@@@ lt_prog_compiler_static_GCJ=
       # Instead, we relocate shared libraries at runtime.
       ;;
 
+    mint*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared_GCJ=no
+      enable_shared=no
+      ;;
+
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
@@@@ -25282,6 +25651,15 @@@@ lt_prog_compiler_static_GCJ=
       esac
       ;;
 
+    mirbsd*)
+      case $cc_basename in
+      # pkgsrc f77 is f2c, which uses gcc underneath.
+      f77*)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	;;
+      esac
+      ;;
+
     newsos6)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@@@ -25357,6 +25735,9 @@@@ lt_prog_compiler_static_GCJ=
 
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
+  mint*)
+    lt_prog_compiler_pic_GCJ=
+    ;;
   *djgpp*)
     lt_prog_compiler_pic_GCJ=
     ;;
@@@@ -25887,16 +26268,29 @@@@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
+    mirbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	hardcode_direct_absolute_GCJ=yes
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GCJ='${wl}-E'
       else
-	archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	ld_shlibs_GCJ=no
       fi
       ;;
 
+    netbsd*)
+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      output_verbose_link_cmd=func_echo_all
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GCJ=no
@@@@ -26305,7 +26699,7 @@@@ fi
   allow_undefined_flag_GCJ="$_lt_dar_allow_undefined"
   case $cc_basename in
      ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
+     *) _lt_dar_can_shared=yes ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
     output_verbose_link_cmd=func_echo_all
@@@@ -26478,15 +26872,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+    mirbsd*)
+     if test -f /usr/libexec/ld.so; then
+	hardcode_direct_GCJ=yes
+	hardcode_shlibpath_var_GCJ=no
+	hardcode_direct_absolute_GCJ=yes
+	archive_cmds_GCJ='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_GCJ='${wl}-E'
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	ld_shlibs_GCJ=no
       fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      ;;
+
+    netbsd*)
+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
       hardcode_direct_GCJ=yes
       hardcode_shlibpath_var_GCJ=no
+      output_verbose_link_cmd=func_echo_all
       ;;
 
     newsos6)
@@@@ -26498,6 +26905,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
       ;;
 
     *nto* | *qnx*)
+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
       ;;
 
     openbsd*)
@@@@ -27075,7 +27487,10 @@@@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 lt_cv_prog_compiler_c_o_RC=yes
 
@


1.85
log
@be compatible with "nm -p" on Solaris 11.3

It now differentiates between bss and common symbols, and lists variables
in the latter section with symbol type "C", like GNU nm(1) does.
So add "C" to the list of letters that the global_symbol_pipe script
accepts on Solaris.
Bump PKGREVISION of libtool-base.
@
text
@d1 1
a1 1
$NetBSD$
@


1.84
log
@revert libtool
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.82 2014/09/01 12:39:15 jperkin Exp $
d3 1
a3 1
--- configure.orig	2011-10-17 10:18:58.000000000 +0000
d57 9
@


1.83
log
@adding devel/py-hgnested

hgnested is a Mercurial extension to work with nested repositories.

It was inspired by the forest extension.

The extension allows to apply common Mercurial commands to all the nested
repositories at once like pull, push etc. It also allows to fetch a complete
tree of repositories through ssh or http.

To enable the "hgnested" extension, create an entry for it in your hgrc, like
this:

    [extensions]
    hgnested =

See `hg help hgnested` for the complete list of commands.

For more information please visit the following website:

	http://code.google.com/p/hgnested/
@
text
@d454 1
a454 1
+	      archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h $wl$soname -o $lib'
d456 1
a456 1
+		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
@


1.82
log
@GCC 4.7's gfortran on SunOS generates verbose output which includes spaces
in-between "-l" and the library name.  This confuses libtool which parses
the compiler output, and results in trying to pass arguments such as
"-l-lgfortran" and failing.

In addition there are multiple BUILDLINK_DIR references, but only the first
is stripped, resulting in "-L-L/path".

Fix both these issues and bump PKGREVISION of libtool-fortran.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.81 2014/06/15 14:42:05 joerg Exp $
d454 1
a454 1
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
d456 1
a456 1
+		$CC -shared $pic_flag ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
@


1.81
log
@Don't use -nostdlib for C++ with GCC on Solaris. Bump revision of
libtool-base.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2014-06-15 14:27:26.000000000 +0000
d465 20
a484 1
@@@@ -15236,9 +15331,15 @@@@ lt_prog_compiler_static_CXX=
d501 1
a501 1
@@@@ -15316,6 +15417,9 @@@@ lt_prog_compiler_static_CXX=
d511 1
a511 1
@@@@ -15513,6 +15617,9 @@@@ lt_prog_compiler_static_CXX=
d521 1
a521 1
@@@@ -16184,7 +16291,7 @@@@ dgux*)
d530 1
a530 1
@@@@ -16198,7 +16305,7 @@@@ freebsd* | dragonfly*)
d539 1
a539 1
@@@@ -16221,13 +16328,24 @@@@ freebsd* | dragonfly*)
d565 1
a565 1
@@@@ -16315,12 +16433,7 @@@@ interix[3-9]*)
d579 1
a579 1
@@@@ -16419,19 +16532,36 @@@@ fi
d626 1
a626 1
@@@@ -16457,7 +16587,7 @@@@ newsos6)
d635 1
a635 1
@@@@ -16465,7 +16595,7 @@@@ openbsd*)
d644 1
a644 1
@@@@ -17039,7 +17169,10 @@@@ $RM -r conftest*
d656 1
a656 1
@@@@ -17131,9 +17264,16 @@@@ lt_prog_compiler_static_F77=
d674 1
a674 1
@@@@ -17161,6 +17301,13 @@@@ lt_prog_compiler_static_F77=
d688 1
a688 1
@@@@ -17313,6 +17460,15 @@@@ lt_prog_compiler_static_F77=
d704 1
a704 1
@@@@ -17388,6 +17544,9 @@@@ lt_prog_compiler_static_F77=
d714 1
a714 1
@@@@ -17918,16 +18077,29 @@@@ _LT_EOF
d750 1
a750 1
@@@@ -18324,7 +18496,7 @@@@ fi
d759 1
a759 1
@@@@ -18498,15 +18670,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d793 1
a793 1
@@@@ -18518,6 +18703,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d805 1
a805 1
@@@@ -19126,7 +19316,7 @@@@ dgux*)
d814 1
a814 1
@@@@ -19140,7 +19330,7 @@@@ freebsd* | dragonfly*)
d823 1
a823 1
@@@@ -19163,13 +19353,24 @@@@ freebsd* | dragonfly*)
d849 1
a849 1
@@@@ -19257,12 +19458,7 @@@@ interix[3-9]*)
d863 1
a863 1
@@@@ -19355,19 +19551,36 @@@@ fi
d910 1
a910 1
@@@@ -19393,7 +19606,7 @@@@ newsos6)
d919 1
a919 1
@@@@ -19401,7 +19614,7 @@@@ openbsd*)
d928 1
a928 1
@@@@ -19966,7 +20179,10 @@@@ $RM -r conftest*
d940 20
a959 1
@@@@ -20203,9 +20419,16 @@@@ lt_prog_compiler_static_FC=
d977 1
a977 1
@@@@ -20233,6 +20456,13 @@@@ lt_prog_compiler_static_FC=
d991 1
a991 1
@@@@ -20385,6 +20615,15 @@@@ lt_prog_compiler_static_FC=
d1007 1
a1007 1
@@@@ -20460,6 +20699,9 @@@@ lt_prog_compiler_static_FC=
d1017 1
a1017 1
@@@@ -20990,16 +21232,29 @@@@ _LT_EOF
d1053 1
a1053 1
@@@@ -21396,7 +21651,7 @@@@ fi
d1062 1
a1062 1
@@@@ -21570,15 +21825,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1096 1
a1096 1
@@@@ -21590,6 +21858,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1108 1
a1108 1
@@@@ -22198,7 +22471,7 @@@@ dgux*)
d1117 1
a1117 1
@@@@ -22212,7 +22485,7 @@@@ freebsd* | dragonfly*)
d1126 1
a1126 1
@@@@ -22235,13 +22508,24 @@@@ freebsd* | dragonfly*)
d1152 1
a1152 1
@@@@ -22329,12 +22613,7 @@@@ interix[3-9]*)
d1166 1
a1166 1
@@@@ -22427,19 +22706,36 @@@@ fi
d1213 1
a1213 1
@@@@ -22465,7 +22761,7 @@@@ newsos6)
d1222 1
a1222 1
@@@@ -22473,7 +22769,7 @@@@ openbsd*)
d1231 1
a1231 1
@@@@ -22883,7 +23179,10 @@@@ for cc_temp in $compiler""; do
d1243 1
a1243 1
@@@@ -23003,9 +23302,16 @@@@ lt_prog_compiler_static_GO=
d1261 1
a1261 1
@@@@ -23033,6 +23339,13 @@@@ lt_prog_compiler_static_GO=
d1275 1
a1275 1
@@@@ -23185,6 +23498,15 @@@@ lt_prog_compiler_static_GO=
d1291 1
a1291 1
@@@@ -23260,6 +23582,9 @@@@ lt_prog_compiler_static_GO=
d1301 1
a1301 1
@@@@ -23790,16 +24115,29 @@@@ _LT_EOF
d1337 1
a1337 1
@@@@ -24208,7 +24546,7 @@@@ fi
d1346 1
a1346 1
@@@@ -24381,15 +24719,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1380 1
a1380 1
@@@@ -24401,6 +24752,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1392 1
a1392 1
@@@@ -24980,7 +25336,10 @@@@ for cc_temp in $compiler""; do
d1404 1
a1404 1
@@@@ -25100,9 +25459,16 @@@@ lt_prog_compiler_static_GCJ=
d1422 1
a1422 1
@@@@ -25130,6 +25496,13 @@@@ lt_prog_compiler_static_GCJ=
d1436 1
a1436 1
@@@@ -25282,6 +25655,15 @@@@ lt_prog_compiler_static_GCJ=
d1452 1
a1452 1
@@@@ -25357,6 +25739,9 @@@@ lt_prog_compiler_static_GCJ=
d1462 1
a1462 1
@@@@ -25887,16 +26272,29 @@@@ _LT_EOF
d1498 1
a1498 1
@@@@ -26305,7 +26703,7 @@@@ fi
d1507 1
a1507 1
@@@@ -26478,15 +26876,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1541 1
a1541 1
@@@@ -26498,6 +26909,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1553 1
a1553 1
@@@@ -27075,7 +27491,10 @@@@ for cc_temp in $compiler""; do
@


1.80
log
@Revert. Not approved and not correct.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.78 2014/03/08 19:57:25 joerg Exp $
d3 1
a3 1
--- configure.orig	2014-03-06 15:38:07.000000000 +0000
d429 2
a430 1
@@@@ -14853,9 +14961,9 @@@@ fi
d433 1
a433 1
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
d435 1
a435 2
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
d437 8
a444 8
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
@@@@ -14864,9 +14972,9 @@@@ fi
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
d446 1
a446 2
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
d448 18
a465 5
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
@@@@ -15236,9 +15344,15 @@@@ lt_prog_compiler_static_CXX=
d482 1
a482 1
@@@@ -15316,6 +15430,9 @@@@ lt_prog_compiler_static_CXX=
d492 1
a492 1
@@@@ -15513,6 +15630,9 @@@@ lt_prog_compiler_static_CXX=
d502 1
a502 1
@@@@ -16184,7 +16304,7 @@@@ dgux*)
d511 1
a511 1
@@@@ -16198,7 +16318,7 @@@@ freebsd* | dragonfly*)
d520 1
a520 1
@@@@ -16221,13 +16341,24 @@@@ freebsd* | dragonfly*)
d546 1
a546 1
@@@@ -16315,12 +16446,7 @@@@ interix[3-9]*)
d560 1
a560 1
@@@@ -16419,19 +16545,36 @@@@ fi
d607 1
a607 1
@@@@ -16457,7 +16600,7 @@@@ newsos6)
d616 1
a616 1
@@@@ -16465,7 +16608,7 @@@@ openbsd*)
d625 1
a625 1
@@@@ -17039,7 +17182,10 @@@@ $RM -r conftest*
d637 1
a637 1
@@@@ -17131,9 +17277,16 @@@@ lt_prog_compiler_static_F77=
d655 1
a655 1
@@@@ -17161,6 +17314,13 @@@@ lt_prog_compiler_static_F77=
d669 1
a669 1
@@@@ -17313,6 +17473,15 @@@@ lt_prog_compiler_static_F77=
d685 1
a685 1
@@@@ -17388,6 +17557,9 @@@@ lt_prog_compiler_static_F77=
d695 1
a695 1
@@@@ -17918,16 +18090,29 @@@@ _LT_EOF
d731 1
a731 1
@@@@ -18324,7 +18509,7 @@@@ fi
d740 1
a740 1
@@@@ -18498,15 +18683,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d774 1
a774 1
@@@@ -18518,6 +18716,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d786 1
a786 1
@@@@ -19126,7 +19329,7 @@@@ dgux*)
d795 1
a795 1
@@@@ -19140,7 +19343,7 @@@@ freebsd* | dragonfly*)
d804 1
a804 1
@@@@ -19163,13 +19366,24 @@@@ freebsd* | dragonfly*)
d830 1
a830 1
@@@@ -19257,12 +19471,7 @@@@ interix[3-9]*)
d844 1
a844 1
@@@@ -19355,19 +19564,36 @@@@ fi
d891 1
a891 1
@@@@ -19393,7 +19619,7 @@@@ newsos6)
d900 1
a900 1
@@@@ -19401,7 +19627,7 @@@@ openbsd*)
d909 1
a909 1
@@@@ -19966,7 +20192,10 @@@@ $RM -r conftest*
d921 1
a921 1
@@@@ -20203,9 +20432,16 @@@@ lt_prog_compiler_static_FC=
d939 1
a939 1
@@@@ -20233,6 +20469,13 @@@@ lt_prog_compiler_static_FC=
d953 1
a953 1
@@@@ -20385,6 +20628,15 @@@@ lt_prog_compiler_static_FC=
d969 1
a969 1
@@@@ -20460,6 +20712,9 @@@@ lt_prog_compiler_static_FC=
d979 1
a979 1
@@@@ -20990,16 +21245,29 @@@@ _LT_EOF
d1015 1
a1015 1
@@@@ -21396,7 +21664,7 @@@@ fi
d1024 1
a1024 1
@@@@ -21570,15 +21838,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1058 1
a1058 1
@@@@ -21590,6 +21871,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1070 1
a1070 1
@@@@ -22198,7 +22484,7 @@@@ dgux*)
d1079 1
a1079 1
@@@@ -22212,7 +22498,7 @@@@ freebsd* | dragonfly*)
d1088 1
a1088 1
@@@@ -22235,13 +22521,24 @@@@ freebsd* | dragonfly*)
d1114 1
a1114 1
@@@@ -22329,12 +22626,7 @@@@ interix[3-9]*)
d1128 1
a1128 1
@@@@ -22427,19 +22719,36 @@@@ fi
d1175 1
a1175 1
@@@@ -22465,7 +22774,7 @@@@ newsos6)
d1184 1
a1184 1
@@@@ -22473,7 +22782,7 @@@@ openbsd*)
d1193 1
a1193 1
@@@@ -22883,7 +23192,10 @@@@ for cc_temp in $compiler""; do
d1205 1
a1205 1
@@@@ -23003,9 +23315,16 @@@@ lt_prog_compiler_static_GO=
d1223 1
a1223 1
@@@@ -23033,6 +23352,13 @@@@ lt_prog_compiler_static_GO=
d1237 1
a1237 1
@@@@ -23185,6 +23511,15 @@@@ lt_prog_compiler_static_GO=
d1253 1
a1253 1
@@@@ -23260,6 +23595,9 @@@@ lt_prog_compiler_static_GO=
d1263 1
a1263 1
@@@@ -23790,16 +24128,29 @@@@ _LT_EOF
d1299 1
a1299 1
@@@@ -24208,7 +24559,7 @@@@ fi
d1308 1
a1308 1
@@@@ -24381,15 +24732,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1342 1
a1342 1
@@@@ -24401,6 +24765,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1354 1
a1354 1
@@@@ -24980,7 +25349,10 @@@@ for cc_temp in $compiler""; do
d1366 1
a1366 1
@@@@ -25100,9 +25472,16 @@@@ lt_prog_compiler_static_GCJ=
d1384 1
a1384 1
@@@@ -25130,6 +25509,13 @@@@ lt_prog_compiler_static_GCJ=
d1398 1
a1398 1
@@@@ -25282,6 +25668,15 @@@@ lt_prog_compiler_static_GCJ=
d1414 1
a1414 1
@@@@ -25357,6 +25752,9 @@@@ lt_prog_compiler_static_GCJ=
d1424 1
a1424 1
@@@@ -25887,16 +26285,29 @@@@ _LT_EOF
d1460 1
a1460 1
@@@@ -26305,7 +26716,7 @@@@ fi
d1469 1
a1469 1
@@@@ -26478,15 +26889,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1503 1
a1503 1
@@@@ -26498,6 +26922,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1515 1
a1515 1
@@@@ -27075,7 +27504,10 @@@@ for cc_temp in $compiler""; do
@


1.79
log
@Permit libtool to generate -fstack-protector* on all platforms in --mode=link
while suppressing -nostdlib (for the moment on SunOS g++ platforms only)
allowing it to actually work with g++... gcc was never affected by -nostdlib.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2014-05-04 20:22:44.682564874 +0000
d5 1
a5 980
@@@@ -1,13 +1,11 @@@@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for GNU Libtool 2.4.2.
+# Generated by GNU Autoconf 2.69 for GNU Libtool 2.4.2.
 #
 # Report bugs to <bug-libtool@@gnu.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@@@ -136,6 +134,31 @@@@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@@@ -169,7 +192,8 @@@@ if ( set x; as_fn_ret_success y && test
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@@@ -222,21 +246,25 @@@@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@@@ -339,6 +367,14 @@@@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@@@ -460,6 +496,10 @@@@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@@@ -494,16 +534,16 @@@@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@@@ -515,28 +555,8 @@@@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@@@ -692,6 +712,7 @@@@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@@@ -719,6 +740,10 @@@@ build_os
 build_vendor
 build_cpu
 build
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@@@ -788,6 +813,7 @@@@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_ltdl_install
 enable_dependency_tracking
 enable_shared
@@@@ -1270,8 +1296,6 @@@@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@@@ -1435,9 +1459,13 @@@@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
   --disable-ltdl-install  do not install libltdl
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@@@ -1540,9 +1568,9 @@@@ test -n "$ac_init_help" && exit $ac_stat
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Libtool configure 2.4.2
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@@@ -1655,7 +1683,7 @@@@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@@@ -2016,7 +2044,7 @@@@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@@@ -2100,7 +2128,7 @@@@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@@@ -2184,7 +2212,7 @@@@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@@@ -2207,7 +2235,7 @@@@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Libtool $as_me 2.4.2, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@@
 
@@@@ -2685,7 +2713,7 @@@@ echo
 ## Automake Initialisation. ##
 ## ------------------------ ##
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@@@ -2724,7 +2752,7 @@@@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@@@ -2782,9 +2810,6 @@@@ test -z "$INSTALL_DATA" && INSTALL_DATA=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@@@ -2795,32 +2820,40 @@@@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@@@ -2832,6 +2865,16 @@@@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@@@ -2854,12 +2897,12 @@@@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@@@ -2871,10 +2914,10 @@@@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@@@ -2893,7 +2936,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -2933,7 +2976,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -2984,7 +3027,7 @@@@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@@@ -3013,12 +3056,6 @@@@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@@@ -3037,7 +3074,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -3101,6 +3138,45 @@@@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@@@ -3151,18 +3227,70 @@@@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
 
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
+Please tell bug-automake@@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
 
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
 
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 
 
 ## ------------------------- ##
@@@@ -3347,7 +3475,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -3387,7 +3515,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -3440,7 +3568,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -3481,7 +3609,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@@@ -3539,7 +3667,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -3583,7 +3711,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -4029,8 +4157,7 @@@@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@@@ -4114,6 +4241,65 @@@@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@@@ -4133,7 +4319,7 @@@@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@@@ -4166,6 +4352,7 @@@@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@@@ -4188,8 +4375,9 @@@@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@@@ -4223,16 +4411,16 @@@@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@@@ -4241,16 +4429,16 @@@@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@@@ -4304,131 +4492,6 @@@@ else
 fi
 
 
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@@@ -4687,7 +4750,7 @@@@ do
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@@@ -4763,7 +4826,7 @@@@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@@@ -4829,7 +4892,7 @@@@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@@@ -4896,7 +4959,7 @@@@ do
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@@@ -5152,7 +5215,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -5196,7 +5259,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -5335,7 +5398,7 @@@@ else
d14 1
a14 19
@@@@ -5620,7 +5683,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -5660,7 +5723,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -5829,12 +5892,19 @@@@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
d39 1
a39 1
@@@@ -5844,7 +5914,7 @@@@ newos6*)
d48 1
a48 73
@@@@ -5963,7 +6033,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6003,7 +6073,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6104,7 +6174,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6148,7 +6218,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6273,7 +6343,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6313,7 +6383,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6372,7 +6442,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6412,7 +6482,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -6473,7 +6543,7 @@@@ fi
d57 1
a57 163
@@@@ -7061,7 +7131,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7101,7 +7171,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7181,7 +7251,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7221,7 +7291,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7273,7 +7343,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7313,7 +7383,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7365,7 +7435,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7405,7 +7475,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7457,7 +7527,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7497,7 +7567,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7549,7 +7619,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7589,7 +7659,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7958,7 +8028,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -7998,7 +8068,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AS="as"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -8050,7 +8120,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -8090,7 +8160,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -8142,7 +8212,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -8182,7 +8252,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -8493,7 +8563,10 @@@@ for cc_temp in $compiler""; do
d69 1
a69 1
@@@@ -8806,9 +8879,16 @@@@ lt_prog_compiler_static=
d87 1
a87 1
@@@@ -8836,6 +8916,13 @@@@ lt_prog_compiler_static=
d101 1
a101 1
@@@@ -8988,6 +9075,15 @@@@ lt_prog_compiler_static=
d117 1
a117 1
@@@@ -9063,6 +9159,9 @@@@ lt_prog_compiler_static=
d127 1
a127 1
@@@@ -9608,16 +9707,29 @@@@ _LT_EOF
d163 1
a163 1
@@@@ -10026,7 +10138,7 @@@@ fi
d172 1
a172 1
@@@@ -10238,15 +10350,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d206 1
a206 1
@@@@ -10258,6 +10383,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d218 1
a218 1
@@@@ -11031,7 +11161,7 @@@@ dgux*)
d227 1
a227 1
@@@@ -11045,7 +11175,7 @@@@ freebsd* | dragonfly*)
d236 1
a236 1
@@@@ -11068,13 +11198,24 @@@@ freebsd* | dragonfly*)
d262 1
a262 1
@@@@ -11162,12 +11303,7 @@@@ interix[3-9]*)
d276 1
a276 1
@@@@ -11266,45 +11402,62 @@@@ fi
a279 2
-netbsd*)
-  version_type=sunos
d282 2
a283 11
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
d286 5
a290 8
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   ;;
 
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
d299 6
a304 7
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
 
-*nto* | *qnx*)
-  version_type=qnx
+netbsd*)
d308 9
a316 1
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
d318 1
a318 1
   soname_spec='${libname}${release}${shared_ext}$major'
d321 1
a321 20
-  shlibpath_overrides_runpath=no
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  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'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
d323 1
a323 1
   dynamic_linker='ldqnx.so'
d332 1
a332 1
@@@@ -11312,7 +11465,7 @@@@ openbsd*)
d341 1
a341 1
@@@@ -12847,6 +13000,9 @@@@ else
d351 1
a351 75
@@@@ -13169,7 +13325,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -13213,7 +13369,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -13409,8 +13565,9 @@@@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@@@ -13444,16 +13601,16 @@@@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@@@ -13462,16 +13619,16 @@@@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@@@ -13536,9 +13693,7 @@@@ func_stripname_cnf ()
d362 1
a362 1
@@@@ -13786,7 +13941,10 @@@@ $RM -r conftest*
d374 1
a374 1
@@@@ -14282,7 +14440,7 @@@@ fi
d383 1
a383 1
@@@@ -14651,6 +14809,22 @@@@ fi
d406 1
a406 1
@@@@ -14665,15 +14839,13 @@@@ fi
d429 1
a429 1
@@@@ -14853,9 +15025,9 @@@@ fi
d434 1
a434 1
+	        archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
d437 1
a437 1
+		  $CC -shared $pic_flag ${wl}-M $wl$lib.exp ${wl}-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
d441 1
a441 1
@@@@ -14864,9 +15036,9 @@@@ fi
d446 1
a446 1
+	        archive_cmds_CXX='$CC -G $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
d449 1
a449 1
+		  $CC -G ${wl}-M $wl$lib.exp ${wl}-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
d453 1
a453 1
@@@@ -15236,9 +15408,15 @@@@ lt_prog_compiler_static_CXX=
d470 1
a470 1
@@@@ -15316,6 +15494,9 @@@@ lt_prog_compiler_static_CXX=
d480 1
a480 1
@@@@ -15513,6 +15694,9 @@@@ lt_prog_compiler_static_CXX=
d490 1
a490 1
@@@@ -16184,7 +16368,7 @@@@ dgux*)
d499 1
a499 1
@@@@ -16198,7 +16382,7 @@@@ freebsd* | dragonfly*)
d508 1
a508 1
@@@@ -16221,13 +16405,24 @@@@ freebsd* | dragonfly*)
d534 1
a534 1
@@@@ -16315,12 +16510,7 @@@@ interix[3-9]*)
d548 1
a548 1
@@@@ -16419,19 +16609,36 @@@@ fi
d595 1
a595 1
@@@@ -16457,7 +16664,7 @@@@ newsos6)
d604 1
a604 1
@@@@ -16465,7 +16672,7 @@@@ openbsd*)
d613 1
a613 37
@@@@ -16730,7 +16937,7 @@@@ ac_compile='$F77 -c $FFLAGS conftest.$ac
 ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@@@ -16748,7 +16955,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -16774,7 +16981,7 @@@@ fi
 fi
 if test -z "$F77"; then
   ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn
+  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@@@ -16792,7 +16999,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_F77="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -17039,7 +17246,10 @@@@ $RM -r conftest*
d625 1
a625 1
@@@@ -17131,9 +17341,16 @@@@ lt_prog_compiler_static_F77=
d643 1
a643 1
@@@@ -17161,6 +17378,13 @@@@ lt_prog_compiler_static_F77=
d657 1
a657 1
@@@@ -17313,6 +17537,15 @@@@ lt_prog_compiler_static_F77=
d673 1
a673 1
@@@@ -17388,6 +17621,9 @@@@ lt_prog_compiler_static_F77=
d683 1
a683 1
@@@@ -17918,16 +18154,29 @@@@ _LT_EOF
d719 1
a719 1
@@@@ -18324,7 +18573,7 @@@@ fi
d728 1
a728 1
@@@@ -18498,15 +18747,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d762 1
a762 1
@@@@ -18518,6 +18780,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d774 1
a774 1
@@@@ -19126,7 +19393,7 @@@@ dgux*)
d783 1
a783 1
@@@@ -19140,7 +19407,7 @@@@ freebsd* | dragonfly*)
d792 1
a792 1
@@@@ -19163,13 +19430,24 @@@@ freebsd* | dragonfly*)
d818 1
a818 1
@@@@ -19257,12 +19535,7 @@@@ interix[3-9]*)
d832 1
a832 1
@@@@ -19355,19 +19628,36 @@@@ fi
d879 1
a879 1
@@@@ -19393,7 +19683,7 @@@@ newsos6)
d888 1
a888 1
@@@@ -19401,7 +19691,7 @@@@ openbsd*)
d897 1
a897 49
@@@@ -19659,7 +19949,7 @@@@ ac_compile='$FC -c $FCFLAGS $ac_fcflags_
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_fc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@@@ -19677,7 +19967,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -19703,7 +19993,7 @@@@ fi
 fi
 if test -z "$FC"; then
   ac_ct_FC=$FC
-  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
+  for ac_prog in gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@@@ -19721,7 +20011,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_FC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -19854,6 +20144,11 @@@@ else
   fi
 fi
 
+if test $ac_compiler_gnu = yes; then
+  GFC=yes
+else
+  GFC=
+fi
 ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
 ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
@@@@ -19966,7 +20261,10 @@@@ $RM -r conftest*
d909 1
a909 1
@@@@ -20203,9 +20501,16 @@@@ lt_prog_compiler_static_FC=
d927 1
a927 1
@@@@ -20233,6 +20538,13 @@@@ lt_prog_compiler_static_FC=
d941 1
a941 1
@@@@ -20385,6 +20697,15 @@@@ lt_prog_compiler_static_FC=
d957 1
a957 1
@@@@ -20460,6 +20781,9 @@@@ lt_prog_compiler_static_FC=
d967 1
a967 1
@@@@ -20990,16 +21314,29 @@@@ _LT_EOF
d1003 1
a1003 1
@@@@ -21396,7 +21733,7 @@@@ fi
d1012 1
a1012 1
@@@@ -21570,15 +21907,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1046 1
a1046 1
@@@@ -21590,6 +21940,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1058 1
a1058 1
@@@@ -22198,7 +22553,7 @@@@ dgux*)
d1067 1
a1067 1
@@@@ -22212,7 +22567,7 @@@@ freebsd* | dragonfly*)
d1076 1
a1076 1
@@@@ -22235,13 +22590,24 @@@@ freebsd* | dragonfly*)
d1102 1
a1102 1
@@@@ -22329,12 +22695,7 @@@@ interix[3-9]*)
d1116 1
a1116 1
@@@@ -22427,19 +22788,36 @@@@ fi
d1163 1
a1163 1
@@@@ -22465,7 +22843,7 @@@@ newsos6)
d1172 1
a1172 1
@@@@ -22473,7 +22851,7 @@@@ openbsd*)
d1181 1
a1181 19
@@@@ -22743,7 +23121,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GOC="${ac_tool_prefix}gccgo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -22783,7 +23161,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_GOC="gccgo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -22883,7 +23261,10 @@@@ for cc_temp in $compiler""; do
d1193 1
a1193 1
@@@@ -23003,9 +23384,16 @@@@ lt_prog_compiler_static_GO=
d1211 1
a1211 1
@@@@ -23033,6 +23421,13 @@@@ lt_prog_compiler_static_GO=
d1225 1
a1225 1
@@@@ -23185,6 +23580,15 @@@@ lt_prog_compiler_static_GO=
d1241 1
a1241 1
@@@@ -23260,6 +23664,9 @@@@ lt_prog_compiler_static_GO=
d1251 1
a1251 1
@@@@ -23790,16 +24197,29 @@@@ _LT_EOF
d1287 1
a1287 1
@@@@ -24208,7 +24628,7 @@@@ fi
d1296 1
a1296 1
@@@@ -24381,15 +24801,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1330 1
a1330 1
@@@@ -24401,6 +24834,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1342 1
a1342 19
@@@@ -24839,7 +25277,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_GCJ="${ac_tool_prefix}gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -24879,7 +25317,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_GCJ="gcj"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -24980,7 +25418,10 @@@@ for cc_temp in $compiler""; do
d1354 1
a1354 1
@@@@ -25100,9 +25541,16 @@@@ lt_prog_compiler_static_GCJ=
d1372 1
a1372 1
@@@@ -25130,6 +25578,13 @@@@ lt_prog_compiler_static_GCJ=
d1386 1
a1386 1
@@@@ -25282,6 +25737,15 @@@@ lt_prog_compiler_static_GCJ=
d1402 1
a1402 1
@@@@ -25357,6 +25821,9 @@@@ lt_prog_compiler_static_GCJ=
d1412 1
a1412 1
@@@@ -25887,16 +26354,29 @@@@ _LT_EOF
d1448 1
a1448 1
@@@@ -26305,7 +26785,7 @@@@ fi
d1457 1
a1457 1
@@@@ -26478,15 +26958,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1491 1
a1491 1
@@@@ -26498,6 +26991,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1503 1
a1503 19
@@@@ -26936,7 +27434,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -26976,7 +27474,7 @@@@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@@@ -27075,7 +27573,10 @@@@ for cc_temp in $compiler""; do
a1514 158
@@@@ -27299,6 +27800,14 @@@@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@@@ -27646,16 +28155,16 @@@@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@@@ -27715,28 +28224,16 @@@@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@@@ -27758,7 +28255,7 @@@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # values after options handling.
 ac_log="
 This file was extended by GNU Libtool $as_me 2.4.2, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@@@ -27826,10 +28323,10 @@@@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 GNU Libtool config.status 2.4.2
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@@@ -27920,7 +28417,7 @@@@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@@@ -29365,7 +29862,7 @@@@ $as_echo "$as_me: executing $ac_file com
     "tests/atconfig":C) cat >tests/atconfig <<ATEOF
 # Configurable variable values for building test suites.
 # Generated by $0.
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
 
 # The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
 at_testdir='tests'
@@@@ -29386,7 +29883,7 @@@@ SHELL=\${CONFIG_SHELL-'$SHELL'}
 ATEOF
  ;;
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@@@ -29399,7 +29896,7 @@@@ ATEOF
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@@@ -29433,21 +29930,19 @@@@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@


1.78
log
@Don't try to extract GCC's linker line. It includes -lgcc, but not
-lgcc_s for starters. It also confuses the static-only library search in
libtool itself. Bump revision.

Based on patch from jperkin@@.
@
text
@d3 1
a3 1
--- configure.orig	2014-03-06 15:38:07.000000000 +0000
d5 980
a984 1
@@@@ -5335,7 +5335,7 @@@@ else
d993 19
a1011 1
@@@@ -5829,12 +5829,19 @@@@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
d1036 1
a1036 1
@@@@ -5844,7 +5851,7 @@@@ newos6*)
d1045 73
a1117 1
@@@@ -6473,7 +6480,7 @@@@ fi
d1126 163
a1288 1
@@@@ -8493,7 +8500,10 @@@@ for cc_temp in $compiler""; do
d1300 1
a1300 1
@@@@ -8806,9 +8816,16 @@@@ lt_prog_compiler_static=
d1318 1
a1318 1
@@@@ -8836,6 +8853,13 @@@@ lt_prog_compiler_static=
d1332 1
a1332 1
@@@@ -8988,6 +9012,15 @@@@ lt_prog_compiler_static=
d1348 1
a1348 1
@@@@ -9063,6 +9096,9 @@@@ lt_prog_compiler_static=
d1358 1
a1358 1
@@@@ -9608,16 +9644,29 @@@@ _LT_EOF
d1394 1
a1394 1
@@@@ -10026,7 +10075,7 @@@@ fi
d1403 1
a1403 1
@@@@ -10238,15 +10287,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1437 1
a1437 1
@@@@ -10258,6 +10320,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1449 1
a1449 1
@@@@ -11031,7 +11098,7 @@@@ dgux*)
d1458 1
a1458 1
@@@@ -11045,7 +11112,7 @@@@ freebsd* | dragonfly*)
d1467 1
a1467 1
@@@@ -11068,13 +11135,24 @@@@ freebsd* | dragonfly*)
d1493 1
a1493 1
@@@@ -11162,12 +11240,7 @@@@ interix[3-9]*)
d1507 1
a1507 1
@@@@ -11266,19 +11339,36 @@@@ fi
d1511 2
d1515 11
a1525 2
+  need_lib_prefix=no
+  need_version=no
d1528 8
a1535 5
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
d1544 7
a1550 6
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 netbsd*)
-  version_type=sunos
d1554 1
a1554 9
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    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='NetBSD ld.elf_so'
-  fi
d1556 1
a1556 1
+  soname_spec='${libname}${release}${shared_ext}$major'
d1559 20
a1578 1
   shlibpath_overrides_runpath=yes
d1580 1
a1580 1
@@@@ -11304,7 +11394,7 @@@@ newsos6)
d1589 1
a1589 1
@@@@ -11312,7 +11402,7 @@@@ openbsd*)
d1598 1
a1598 1
@@@@ -12847,6 +12937,9 @@@@ else
d1608 75
a1682 1
@@@@ -13536,9 +13629,7 @@@@ func_stripname_cnf ()
d1693 1
a1693 1
@@@@ -13786,7 +13877,10 @@@@ $RM -r conftest*
d1705 1
a1705 1
@@@@ -14282,7 +14376,7 @@@@ fi
d1714 1
a1714 1
@@@@ -14651,6 +14745,22 @@@@ fi
d1737 1
a1737 1
@@@@ -14665,15 +14775,13 @@@@ fi
d1760 1
a1760 1
@@@@ -14853,9 +14961,9 @@@@ fi
d1765 1
a1765 1
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
d1768 1
a1768 1
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
d1772 1
a1772 1
@@@@ -14864,9 +14972,9 @@@@ fi
d1777 1
a1777 1
+	        archive_cmds_CXX='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
d1780 1
a1780 1
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
d1784 1
a1784 1
@@@@ -15236,9 +15344,15 @@@@ lt_prog_compiler_static_CXX=
d1801 1
a1801 1
@@@@ -15316,6 +15430,9 @@@@ lt_prog_compiler_static_CXX=
d1811 1
a1811 1
@@@@ -15513,6 +15630,9 @@@@ lt_prog_compiler_static_CXX=
d1821 1
a1821 1
@@@@ -16184,7 +16304,7 @@@@ dgux*)
d1830 1
a1830 1
@@@@ -16198,7 +16318,7 @@@@ freebsd* | dragonfly*)
d1839 1
a1839 1
@@@@ -16221,13 +16341,24 @@@@ freebsd* | dragonfly*)
d1865 1
a1865 1
@@@@ -16315,12 +16446,7 @@@@ interix[3-9]*)
d1879 1
a1879 1
@@@@ -16419,19 +16545,36 @@@@ fi
d1926 1
a1926 1
@@@@ -16457,7 +16600,7 @@@@ newsos6)
d1935 1
a1935 1
@@@@ -16465,7 +16608,7 @@@@ openbsd*)
d1944 37
a1980 1
@@@@ -17039,7 +17182,10 @@@@ $RM -r conftest*
d1992 1
a1992 1
@@@@ -17131,9 +17277,16 @@@@ lt_prog_compiler_static_F77=
d2010 1
a2010 1
@@@@ -17161,6 +17314,13 @@@@ lt_prog_compiler_static_F77=
d2024 1
a2024 1
@@@@ -17313,6 +17473,15 @@@@ lt_prog_compiler_static_F77=
d2040 1
a2040 1
@@@@ -17388,6 +17557,9 @@@@ lt_prog_compiler_static_F77=
d2050 1
a2050 1
@@@@ -17918,16 +18090,29 @@@@ _LT_EOF
d2086 1
a2086 1
@@@@ -18324,7 +18509,7 @@@@ fi
d2095 1
a2095 1
@@@@ -18498,15 +18683,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2129 1
a2129 1
@@@@ -18518,6 +18716,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2141 1
a2141 1
@@@@ -19126,7 +19329,7 @@@@ dgux*)
d2150 1
a2150 1
@@@@ -19140,7 +19343,7 @@@@ freebsd* | dragonfly*)
d2159 1
a2159 1
@@@@ -19163,13 +19366,24 @@@@ freebsd* | dragonfly*)
d2185 1
a2185 1
@@@@ -19257,12 +19471,7 @@@@ interix[3-9]*)
d2199 1
a2199 1
@@@@ -19355,19 +19564,36 @@@@ fi
d2246 1
a2246 1
@@@@ -19393,7 +19619,7 @@@@ newsos6)
d2255 1
a2255 1
@@@@ -19401,7 +19627,7 @@@@ openbsd*)
d2264 49
a2312 1
@@@@ -19966,7 +20192,10 @@@@ $RM -r conftest*
d2324 1
a2324 1
@@@@ -20203,9 +20432,16 @@@@ lt_prog_compiler_static_FC=
d2342 1
a2342 1
@@@@ -20233,6 +20469,13 @@@@ lt_prog_compiler_static_FC=
d2356 1
a2356 1
@@@@ -20385,6 +20628,15 @@@@ lt_prog_compiler_static_FC=
d2372 1
a2372 1
@@@@ -20460,6 +20712,9 @@@@ lt_prog_compiler_static_FC=
d2382 1
a2382 1
@@@@ -20990,16 +21245,29 @@@@ _LT_EOF
d2418 1
a2418 1
@@@@ -21396,7 +21664,7 @@@@ fi
d2427 1
a2427 1
@@@@ -21570,15 +21838,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2461 1
a2461 1
@@@@ -21590,6 +21871,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2473 1
a2473 1
@@@@ -22198,7 +22484,7 @@@@ dgux*)
d2482 1
a2482 1
@@@@ -22212,7 +22498,7 @@@@ freebsd* | dragonfly*)
d2491 1
a2491 1
@@@@ -22235,13 +22521,24 @@@@ freebsd* | dragonfly*)
d2517 1
a2517 1
@@@@ -22329,12 +22626,7 @@@@ interix[3-9]*)
d2531 1
a2531 1
@@@@ -22427,19 +22719,36 @@@@ fi
d2578 1
a2578 1
@@@@ -22465,7 +22774,7 @@@@ newsos6)
d2587 1
a2587 1
@@@@ -22473,7 +22782,7 @@@@ openbsd*)
d2596 19
a2614 1
@@@@ -22883,7 +23192,10 @@@@ for cc_temp in $compiler""; do
d2626 1
a2626 1
@@@@ -23003,9 +23315,16 @@@@ lt_prog_compiler_static_GO=
d2644 1
a2644 1
@@@@ -23033,6 +23352,13 @@@@ lt_prog_compiler_static_GO=
d2658 1
a2658 1
@@@@ -23185,6 +23511,15 @@@@ lt_prog_compiler_static_GO=
d2674 1
a2674 1
@@@@ -23260,6 +23595,9 @@@@ lt_prog_compiler_static_GO=
d2684 1
a2684 1
@@@@ -23790,16 +24128,29 @@@@ _LT_EOF
d2720 1
a2720 1
@@@@ -24208,7 +24559,7 @@@@ fi
d2729 1
a2729 1
@@@@ -24381,15 +24732,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2763 1
a2763 1
@@@@ -24401,6 +24765,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2775 19
a2793 1
@@@@ -24980,7 +25349,10 @@@@ for cc_temp in $compiler""; do
d2805 1
a2805 1
@@@@ -25100,9 +25472,16 @@@@ lt_prog_compiler_static_GCJ=
d2823 1
a2823 1
@@@@ -25130,6 +25509,13 @@@@ lt_prog_compiler_static_GCJ=
d2837 1
a2837 1
@@@@ -25282,6 +25668,15 @@@@ lt_prog_compiler_static_GCJ=
d2853 1
a2853 1
@@@@ -25357,6 +25752,9 @@@@ lt_prog_compiler_static_GCJ=
d2863 1
a2863 1
@@@@ -25887,16 +26285,29 @@@@ _LT_EOF
d2899 1
a2899 1
@@@@ -26305,7 +26716,7 @@@@ fi
d2908 1
a2908 1
@@@@ -26478,15 +26889,28 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2942 1
a2942 1
@@@@ -26498,6 +26922,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d2954 19
a2972 1
@@@@ -27075,7 +27504,10 @@@@ for cc_temp in $compiler""; do
d2984 158
@


1.77
log
@PR 48081: Explicitly disable Fortran in libtool-base, otherwise it will
incorrectly handle the default wrapper scripts on Cygwin.

libtool bug 14579: Disable ar(1) locking on OSX. It creates more harm
than good.

Bump libtool-base and libtool-fortran.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.76 2013/07/01 15:59:06 bsiegert Exp $
d3 1
a3 1
--- configure.orig	2011-10-17 10:18:58.000000000 +0000
d127 1
a127 1
@@@@ -9608,16 +9644,28 @@@@ _LT_EOF
d157 1
d163 1
a163 1
@@@@ -10026,7 +10074,7 @@@@ fi
d172 1
a172 1
@@@@ -10238,13 +10286,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d202 1
d204 3
a206 1
@@@@ -10258,6 +10318,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d218 1
a218 1
@@@@ -11031,7 +11096,7 @@@@ dgux*)
d227 1
a227 1
@@@@ -11045,7 +11110,7 @@@@ freebsd* | dragonfly*)
d236 1
a236 1
@@@@ -11068,13 +11133,24 @@@@ freebsd* | dragonfly*)
d262 1
a262 1
@@@@ -11162,12 +11238,7 @@@@ interix[3-9]*)
d276 1
a276 1
@@@@ -11266,19 +11337,36 @@@@ fi
d323 1
a323 1
@@@@ -11304,7 +11392,7 @@@@ newsos6)
d332 1
a332 1
@@@@ -11312,7 +11400,7 @@@@ openbsd*)
d341 1
a341 1
@@@@ -12847,6 +12935,9 @@@@ else
d351 1
a351 1
@@@@ -13536,9 +13627,7 @@@@ func_stripname_cnf ()
d362 1
a362 1
@@@@ -13786,7 +13875,10 @@@@ $RM -r conftest*
d374 1
a374 1
@@@@ -14282,7 +14374,7 @@@@ fi
d383 1
a383 1
@@@@ -14651,6 +14743,22 @@@@ fi
d406 1
a406 1
@@@@ -14665,15 +14773,12 @@@@ fi
d425 1
d429 1
a429 1
@@@@ -14853,9 +14958,9 @@@@ fi
d441 1
a441 1
@@@@ -14864,9 +14969,9 @@@@ fi
d453 1
a453 1
@@@@ -15236,9 +15341,15 @@@@ lt_prog_compiler_static_CXX=
d470 1
a470 1
@@@@ -15316,6 +15427,9 @@@@ lt_prog_compiler_static_CXX=
d480 1
a480 1
@@@@ -15513,6 +15627,9 @@@@ lt_prog_compiler_static_CXX=
d490 1
a490 1
@@@@ -16184,7 +16301,7 @@@@ dgux*)
d499 1
a499 1
@@@@ -16198,7 +16315,7 @@@@ freebsd* | dragonfly*)
d508 1
a508 1
@@@@ -16221,13 +16338,24 @@@@ freebsd* | dragonfly*)
d534 1
a534 1
@@@@ -16315,12 +16443,7 @@@@ interix[3-9]*)
d548 1
a548 1
@@@@ -16419,19 +16542,36 @@@@ fi
d595 1
a595 1
@@@@ -16457,7 +16597,7 @@@@ newsos6)
d604 1
a604 1
@@@@ -16465,7 +16605,7 @@@@ openbsd*)
d613 1
a613 1
@@@@ -17039,7 +17179,10 @@@@ $RM -r conftest*
d625 1
a625 1
@@@@ -17131,9 +17274,16 @@@@ lt_prog_compiler_static_F77=
d643 1
a643 1
@@@@ -17161,6 +17311,13 @@@@ lt_prog_compiler_static_F77=
d657 1
a657 1
@@@@ -17313,6 +17470,15 @@@@ lt_prog_compiler_static_F77=
d673 1
a673 1
@@@@ -17388,6 +17554,9 @@@@ lt_prog_compiler_static_F77=
d683 1
a683 1
@@@@ -17918,16 +18087,28 @@@@ _LT_EOF
d713 1
d719 1
a719 1
@@@@ -18324,7 +18505,7 @@@@ fi
d728 1
a728 1
@@@@ -18498,13 +18679,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d758 1
d760 3
a762 1
@@@@ -18518,6 +18711,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d774 1
a774 1
@@@@ -19126,7 +19324,7 @@@@ dgux*)
d783 1
a783 1
@@@@ -19140,7 +19338,7 @@@@ freebsd* | dragonfly*)
d792 1
a792 1
@@@@ -19163,13 +19361,24 @@@@ freebsd* | dragonfly*)
d818 1
a818 1
@@@@ -19257,12 +19466,7 @@@@ interix[3-9]*)
d832 1
a832 1
@@@@ -19355,19 +19559,36 @@@@ fi
d879 1
a879 1
@@@@ -19393,7 +19614,7 @@@@ newsos6)
d888 1
a888 1
@@@@ -19401,7 +19622,7 @@@@ openbsd*)
d897 1
a897 1
@@@@ -19966,7 +20187,10 @@@@ $RM -r conftest*
d909 1
a909 1
@@@@ -20203,9 +20427,16 @@@@ lt_prog_compiler_static_FC=
d927 1
a927 1
@@@@ -20233,6 +20464,13 @@@@ lt_prog_compiler_static_FC=
d941 1
a941 1
@@@@ -20385,6 +20623,15 @@@@ lt_prog_compiler_static_FC=
d957 1
a957 1
@@@@ -20460,6 +20707,9 @@@@ lt_prog_compiler_static_FC=
d967 1
a967 1
@@@@ -20990,16 +21240,28 @@@@ _LT_EOF
d997 1
d1003 1
a1003 1
@@@@ -21396,7 +21658,7 @@@@ fi
d1012 1
a1012 1
@@@@ -21570,13 +21832,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1042 1
d1044 3
a1046 1
@@@@ -21590,6 +21864,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1058 1
a1058 1
@@@@ -22198,7 +22477,7 @@@@ dgux*)
d1067 1
a1067 1
@@@@ -22212,7 +22491,7 @@@@ freebsd* | dragonfly*)
d1076 1
a1076 1
@@@@ -22235,13 +22514,24 @@@@ freebsd* | dragonfly*)
d1102 1
a1102 1
@@@@ -22329,12 +22619,7 @@@@ interix[3-9]*)
d1116 1
a1116 1
@@@@ -22427,19 +22712,36 @@@@ fi
d1163 1
a1163 1
@@@@ -22465,7 +22767,7 @@@@ newsos6)
d1172 1
a1172 1
@@@@ -22473,7 +22775,7 @@@@ openbsd*)
d1181 1
a1181 1
@@@@ -22883,7 +23185,10 @@@@ for cc_temp in $compiler""; do
d1193 1
a1193 1
@@@@ -23003,9 +23308,16 @@@@ lt_prog_compiler_static_GO=
d1211 1
a1211 1
@@@@ -23033,6 +23345,13 @@@@ lt_prog_compiler_static_GO=
d1225 1
a1225 1
@@@@ -23185,6 +23504,15 @@@@ lt_prog_compiler_static_GO=
d1241 1
a1241 1
@@@@ -23260,6 +23588,9 @@@@ lt_prog_compiler_static_GO=
d1251 1
a1251 1
@@@@ -23790,16 +24121,28 @@@@ _LT_EOF
d1281 1
d1287 1
a1287 1
@@@@ -24208,7 +24551,7 @@@@ fi
d1296 1
a1296 1
@@@@ -24381,13 +24724,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1326 1
d1328 3
a1330 1
@@@@ -24401,6 +24756,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1342 1
a1342 1
@@@@ -24980,7 +25340,10 @@@@ for cc_temp in $compiler""; do
d1354 1
a1354 1
@@@@ -25100,9 +25463,16 @@@@ lt_prog_compiler_static_GCJ=
d1372 1
a1372 1
@@@@ -25130,6 +25500,13 @@@@ lt_prog_compiler_static_GCJ=
d1386 1
a1386 1
@@@@ -25282,6 +25659,15 @@@@ lt_prog_compiler_static_GCJ=
d1402 1
a1402 1
@@@@ -25357,6 +25743,9 @@@@ lt_prog_compiler_static_GCJ=
d1412 1
a1412 1
@@@@ -25887,16 +26276,28 @@@@ _LT_EOF
d1442 1
d1448 1
a1448 1
@@@@ -26305,7 +26706,7 @@@@ fi
d1457 1
a1457 1
@@@@ -26478,13 +26879,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1487 1
d1489 3
a1491 1
@@@@ -26498,6 +26911,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1503 1
a1503 1
@@@@ -27075,7 +27493,10 @@@@ for cc_temp in $compiler""; do
@


1.76
log
@Restore shared library support for MirBSD. Some chunks of the MirBSD diff
were lost in the last libtool update. Bump PKGREVISION of libtool-base.

ok joerg@@ (maintainer)
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2013-06-27 16:54:36.000000000 +0000
d48 9
d347 1
a347 1
@@@@ -13536,9 +13624,7 @@@@ func_stripname_cnf ()
d358 1
a358 1
@@@@ -13786,7 +13872,10 @@@@ $RM -r conftest*
d370 1
a370 1
@@@@ -14282,7 +14371,7 @@@@ fi
d379 1
a379 1
@@@@ -14651,6 +14740,22 @@@@ fi
d402 1
a402 1
@@@@ -14665,15 +14770,12 @@@@ fi
d424 1
a424 1
@@@@ -14853,9 +14955,9 @@@@ fi
d436 1
a436 1
@@@@ -14864,9 +14966,9 @@@@ fi
d448 1
a448 1
@@@@ -15236,9 +15338,15 @@@@ lt_prog_compiler_static_CXX=
d465 1
a465 1
@@@@ -15316,6 +15424,9 @@@@ lt_prog_compiler_static_CXX=
d475 1
a475 1
@@@@ -15513,6 +15624,9 @@@@ lt_prog_compiler_static_CXX=
d485 1
a485 1
@@@@ -16184,7 +16298,7 @@@@ dgux*)
d494 1
a494 1
@@@@ -16198,7 +16312,7 @@@@ freebsd* | dragonfly*)
d503 1
a503 1
@@@@ -16221,13 +16335,24 @@@@ freebsd* | dragonfly*)
d529 1
a529 1
@@@@ -16315,12 +16440,7 @@@@ interix[3-9]*)
d543 1
a543 1
@@@@ -16419,19 +16539,36 @@@@ fi
d590 1
a590 1
@@@@ -16457,7 +16594,7 @@@@ newsos6)
d599 1
a599 1
@@@@ -16465,7 +16602,7 @@@@ openbsd*)
d608 1
a608 1
@@@@ -17039,7 +17176,10 @@@@ $RM -r conftest*
d620 1
a620 1
@@@@ -17131,9 +17271,16 @@@@ lt_prog_compiler_static_F77=
d638 1
a638 1
@@@@ -17161,6 +17308,13 @@@@ lt_prog_compiler_static_F77=
d652 1
a652 1
@@@@ -17313,6 +17467,15 @@@@ lt_prog_compiler_static_F77=
d668 1
a668 1
@@@@ -17388,6 +17551,9 @@@@ lt_prog_compiler_static_F77=
d678 1
a678 1
@@@@ -17918,16 +18084,28 @@@@ _LT_EOF
d713 1
a713 1
@@@@ -18324,7 +18502,7 @@@@ fi
d722 1
a722 1
@@@@ -18498,13 +18676,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d753 1
a753 1
@@@@ -18518,6 +18708,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d765 1
a765 1
@@@@ -19126,7 +19321,7 @@@@ dgux*)
d774 1
a774 1
@@@@ -19140,7 +19335,7 @@@@ freebsd* | dragonfly*)
d783 1
a783 1
@@@@ -19163,13 +19358,24 @@@@ freebsd* | dragonfly*)
d809 1
a809 1
@@@@ -19257,12 +19463,7 @@@@ interix[3-9]*)
d823 1
a823 1
@@@@ -19355,19 +19556,36 @@@@ fi
d870 1
a870 1
@@@@ -19393,7 +19611,7 @@@@ newsos6)
d879 1
a879 1
@@@@ -19401,7 +19619,7 @@@@ openbsd*)
d888 1
a888 1
@@@@ -19966,7 +20184,10 @@@@ $RM -r conftest*
d900 1
a900 1
@@@@ -20203,9 +20424,16 @@@@ lt_prog_compiler_static_FC=
d918 1
a918 1
@@@@ -20233,6 +20461,13 @@@@ lt_prog_compiler_static_FC=
d932 1
a932 1
@@@@ -20385,6 +20620,15 @@@@ lt_prog_compiler_static_FC=
d948 1
a948 1
@@@@ -20460,6 +20704,9 @@@@ lt_prog_compiler_static_FC=
d958 1
a958 1
@@@@ -20990,16 +21237,28 @@@@ _LT_EOF
d993 1
a993 1
@@@@ -21396,7 +21655,7 @@@@ fi
d1002 1
a1002 1
@@@@ -21570,13 +21829,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1033 1
a1033 1
@@@@ -21590,6 +21861,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1045 1
a1045 1
@@@@ -22198,7 +22474,7 @@@@ dgux*)
d1054 1
a1054 1
@@@@ -22212,7 +22488,7 @@@@ freebsd* | dragonfly*)
d1063 1
a1063 1
@@@@ -22235,13 +22511,24 @@@@ freebsd* | dragonfly*)
d1089 1
a1089 1
@@@@ -22329,12 +22616,7 @@@@ interix[3-9]*)
d1103 1
a1103 1
@@@@ -22427,19 +22709,36 @@@@ fi
d1150 1
a1150 1
@@@@ -22465,7 +22764,7 @@@@ newsos6)
d1159 1
a1159 1
@@@@ -22473,7 +22772,7 @@@@ openbsd*)
d1168 1
a1168 1
@@@@ -22883,7 +23182,10 @@@@ for cc_temp in $compiler""; do
d1180 1
a1180 1
@@@@ -23003,9 +23305,16 @@@@ lt_prog_compiler_static_GO=
d1198 1
a1198 1
@@@@ -23033,6 +23342,13 @@@@ lt_prog_compiler_static_GO=
d1212 1
a1212 1
@@@@ -23185,6 +23501,15 @@@@ lt_prog_compiler_static_GO=
d1228 1
a1228 1
@@@@ -23260,6 +23585,9 @@@@ lt_prog_compiler_static_GO=
d1238 1
a1238 1
@@@@ -23790,16 +24118,28 @@@@ _LT_EOF
d1273 1
a1273 1
@@@@ -24208,7 +24548,7 @@@@ fi
d1282 1
a1282 1
@@@@ -24381,13 +24721,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1313 1
a1313 1
@@@@ -24401,6 +24753,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1325 1
a1325 1
@@@@ -24980,7 +25337,10 @@@@ for cc_temp in $compiler""; do
d1337 1
a1337 1
@@@@ -25100,9 +25460,16 @@@@ lt_prog_compiler_static_GCJ=
d1355 1
a1355 1
@@@@ -25130,6 +25497,13 @@@@ lt_prog_compiler_static_GCJ=
d1369 1
a1369 1
@@@@ -25282,6 +25656,15 @@@@ lt_prog_compiler_static_GCJ=
d1385 1
a1385 1
@@@@ -25357,6 +25740,9 @@@@ lt_prog_compiler_static_GCJ=
d1395 1
a1395 1
@@@@ -25887,16 +26273,28 @@@@ _LT_EOF
d1430 1
a1430 1
@@@@ -26305,7 +26703,7 @@@@ fi
d1439 1
a1439 1
@@@@ -26478,13 +26876,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1470 1
a1470 1
@@@@ -26498,6 +26908,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1482 1
a1482 1
@@@@ -27075,7 +27490,10 @@@@ for cc_temp in $compiler""; do
@


1.75
log
@In configure: changed _lt_dar_can_shared=$GCC to _lt_dar_can_shared=yes, so libtool can create shared libraries on Darwin/Mac OS X, when f77 is not present.
@
text
@d3 1
a3 1
--- configure.orig	2011-10-17 10:18:58.000000000 +0000
d5 9
d338 1
a338 1
@@@@ -13536,9 +13627,7 @@@@ func_stripname_cnf ()
d349 1
a349 1
@@@@ -13786,7 +13875,10 @@@@ $RM -r conftest*
d361 1
a361 1
@@@@ -14282,7 +14374,7 @@@@ fi
d370 24
a393 1
@@@@ -14665,15 +14757,12 @@@@ fi
d415 1
a415 1
@@@@ -14853,9 +14942,9 @@@@ fi
d427 1
a427 1
@@@@ -14864,9 +14953,9 @@@@ fi
d439 1
a439 1
@@@@ -15236,9 +15325,15 @@@@ lt_prog_compiler_static_CXX=
d456 1
a456 1
@@@@ -15316,6 +15411,9 @@@@ lt_prog_compiler_static_CXX=
d466 1
a466 1
@@@@ -15513,6 +15611,9 @@@@ lt_prog_compiler_static_CXX=
d476 1
a476 1
@@@@ -16184,7 +16285,7 @@@@ dgux*)
d485 1
a485 1
@@@@ -16198,7 +16299,7 @@@@ freebsd* | dragonfly*)
d494 1
a494 1
@@@@ -16221,13 +16322,24 @@@@ freebsd* | dragonfly*)
d520 1
a520 1
@@@@ -16315,12 +16427,7 @@@@ interix[3-9]*)
d534 1
a534 1
@@@@ -16419,19 +16526,36 @@@@ fi
d581 1
a581 1
@@@@ -16457,7 +16581,7 @@@@ newsos6)
d590 1
a590 1
@@@@ -16465,7 +16589,7 @@@@ openbsd*)
d599 1
a599 1
@@@@ -17039,7 +17163,10 @@@@ $RM -r conftest*
d611 1
a611 1
@@@@ -17131,9 +17258,16 @@@@ lt_prog_compiler_static_F77=
d629 1
a629 1
@@@@ -17161,6 +17295,13 @@@@ lt_prog_compiler_static_F77=
d643 1
a643 1
@@@@ -17313,6 +17454,15 @@@@ lt_prog_compiler_static_F77=
d659 1
a659 1
@@@@ -17388,6 +17538,9 @@@@ lt_prog_compiler_static_F77=
d669 1
a669 1
@@@@ -17918,16 +18071,28 @@@@ _LT_EOF
d704 1
a704 1
@@@@ -18324,7 +18489,7 @@@@ fi
d713 1
a713 1
@@@@ -18498,13 +18663,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d744 1
a744 1
@@@@ -18518,6 +18695,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d756 1
a756 1
@@@@ -19126,7 +19308,7 @@@@ dgux*)
d765 1
a765 1
@@@@ -19140,7 +19322,7 @@@@ freebsd* | dragonfly*)
d774 1
a774 1
@@@@ -19163,13 +19345,24 @@@@ freebsd* | dragonfly*)
d800 1
a800 1
@@@@ -19257,12 +19450,7 @@@@ interix[3-9]*)
d814 1
a814 1
@@@@ -19355,19 +19543,36 @@@@ fi
d861 1
a861 1
@@@@ -19393,7 +19598,7 @@@@ newsos6)
d870 1
a870 1
@@@@ -19401,7 +19606,7 @@@@ openbsd*)
d879 1
a879 1
@@@@ -19966,7 +20171,10 @@@@ $RM -r conftest*
d891 1
a891 1
@@@@ -20203,9 +20411,16 @@@@ lt_prog_compiler_static_FC=
d909 1
a909 1
@@@@ -20233,6 +20448,13 @@@@ lt_prog_compiler_static_FC=
d923 1
a923 1
@@@@ -20385,6 +20607,15 @@@@ lt_prog_compiler_static_FC=
d939 1
a939 1
@@@@ -20460,6 +20691,9 @@@@ lt_prog_compiler_static_FC=
d949 1
a949 1
@@@@ -20990,16 +21224,28 @@@@ _LT_EOF
d984 1
a984 1
@@@@ -21396,7 +21642,7 @@@@ fi
d993 1
a993 1
@@@@ -21570,13 +21816,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1024 1
a1024 1
@@@@ -21590,6 +21848,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1036 1
a1036 1
@@@@ -22198,7 +22461,7 @@@@ dgux*)
d1045 1
a1045 1
@@@@ -22212,7 +22475,7 @@@@ freebsd* | dragonfly*)
d1054 1
a1054 1
@@@@ -22235,13 +22498,24 @@@@ freebsd* | dragonfly*)
d1080 1
a1080 1
@@@@ -22329,12 +22603,7 @@@@ interix[3-9]*)
d1094 1
a1094 1
@@@@ -22427,19 +22696,36 @@@@ fi
d1141 1
a1141 1
@@@@ -22465,7 +22751,7 @@@@ newsos6)
d1150 1
a1150 1
@@@@ -22473,7 +22759,7 @@@@ openbsd*)
d1159 1
a1159 1
@@@@ -22883,7 +23169,10 @@@@ for cc_temp in $compiler""; do
d1171 1
a1171 1
@@@@ -23003,9 +23292,16 @@@@ lt_prog_compiler_static_GO=
d1189 1
a1189 1
@@@@ -23033,6 +23329,13 @@@@ lt_prog_compiler_static_GO=
d1203 1
a1203 1
@@@@ -23185,6 +23488,15 @@@@ lt_prog_compiler_static_GO=
d1219 1
a1219 1
@@@@ -23260,6 +23572,9 @@@@ lt_prog_compiler_static_GO=
d1229 1
a1229 1
@@@@ -23790,16 +24105,28 @@@@ _LT_EOF
d1264 1
a1264 1
@@@@ -24208,7 +24535,7 @@@@ fi
d1273 1
a1273 1
@@@@ -24381,13 +24708,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1304 1
a1304 1
@@@@ -24401,6 +24740,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1316 1
a1316 1
@@@@ -24980,7 +25324,10 @@@@ for cc_temp in $compiler""; do
d1328 1
a1328 1
@@@@ -25100,9 +25447,16 @@@@ lt_prog_compiler_static_GCJ=
d1346 1
a1346 1
@@@@ -25130,6 +25484,13 @@@@ lt_prog_compiler_static_GCJ=
d1360 1
a1360 1
@@@@ -25282,6 +25643,15 @@@@ lt_prog_compiler_static_GCJ=
d1376 1
a1376 1
@@@@ -25357,6 +25727,9 @@@@ lt_prog_compiler_static_GCJ=
d1386 1
a1386 1
@@@@ -25887,16 +26260,28 @@@@ _LT_EOF
d1421 1
a1421 1
@@@@ -26305,7 +26690,7 @@@@ fi
d1430 1
a1430 1
@@@@ -26478,13 +26863,25 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1461 1
a1461 1
@@@@ -26498,6 +26895,11 @@@@ $as_echo "$lt_cv_irix_exported_symbol" >
d1473 1
a1473 1
@@@@ -27075,7 +27477,10 @@@@ for cc_temp in $compiler""; do
@


1.74
log
@Update to libtool-2.4.2:
- Initial support for Go.
- On Mac OS X, try to open .dylib as well as .so in lt_dlopenext.
- sysroot support
- man pages for libtool and libtoolize
- various smaller bug fixes

pkgsrc side: remove support for pre-ELF NetBSD
@
text
@d3 1
a3 1
--- configure.orig	2013-03-03 13:53:45.000000000 +0000
d144 9
d352 9
d672 9
d952 9
d1232 9
d1389 9
@


1.73
log
@Add a special case for f77 on MirBSD. This is what the wrapper scripts call
the f2c frontend. It is not recognized as GCC even though there is a gcc
underneath. Thus, use "-Wl," to introduce linker options.

This unbreaks the build of shared libraries written in Fortran on MirBSD
(exotic combination, yes I know) such as blas.

Bump PKGREVISION.
@
text
@d3 1
a3 4
The last two chunks work around bugs in ksh on NetBSD.
The problem manifests with wl and no_builtin_flag containing newlines.

--- configure.orig	Thu Jul 26 11:26:28 2012
d5 1
a5 107
@@@@ -822,6 +822,7 @@@@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@@@ -3257,17 +3258,17 @@@@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
 
 
-
 M4SH='$(AUTOM4TE) --language=m4sh'
 
 
@@@@ -4145,6 +4146,7 @@@@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@@@ -4169,6 +4171,7 @@@@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@@@ -4228,7 +4231,7 @@@@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@@@ -5230,13 +5233,13 @@@@ if test "${lt_cv_nm_interface+set}" = se
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5233: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5236: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5236: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5239: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5239: output\"" >&5)
+  (eval echo "\"\$as_me:5242: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@@@ -5293,6 +5296,13 @@@@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT we can support fairly large cmd lengths, but it takes
+    # a while to run the tests, so let's restrict it to something
+    # reasonable.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@@@ -5299,7 +5309,7 @@@@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | mirbsd* | darwin* | dragonfly*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@@@ -5665,6 +5675,10 @@@@ gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
@@@@ -5703,6 +5717,17 @@@@ linux* | k*bsd*-gnu)
d21 10
a30 3
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@@@ -5718,7 +5743,7 @@@@ newos6*)
d39 1
a39 10
@@@@ -6439,7 +6464,7 @@@@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6442 "configure"' > conftest.$ac_ext
+  echo '#line 6467 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@@@ -7900,7 +7925,10 @@@@ for cc_temp in $compiler""; do
d43 1
a43 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d51 1
a51 15
@@@@ -8129,11 +8157,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8132: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8160: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8136: \$? = $ac_status" >&5
+   echo "$as_me:8164: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -8210,11 +8238,19 @@@@ $as_echo_n "checking for $compiler optio
d61 5
d68 2
a69 10
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@@@ -8234,6 +8270,13 @@@@ $as_echo_n "checking for $compiler optio
d83 1
a83 1
@@@@ -8356,6 +8399,15 @@@@ $as_echo_n "checking for $compiler optio
d99 1
a99 1
@@@@ -8431,6 +8483,9 @@@@ $as_echo_n "checking for $compiler optio
d109 1
a109 43
@@@@ -8468,11 +8523,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8471: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8526: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8475: \$? = $ac_status" >&5
+   echo "$as_me:8530: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -8573,11 +8628,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8631: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8580: \$? = $ac_status" >&5
+   echo "$as_me:8635: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -8628,11 +8683,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8631: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8686: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8635: \$? = $ac_status" >&5
+   echo "$as_me:8690: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -8844,6 +8899,11 @@@@ _LT_EOF
d113 1
a113 12
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@@@ -8930,7 +8990,7 @@@@ _LT_EOF
       ;;
 
     netbsd*)
d115 11
a125 3
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
d127 4
a130 2
@@@@ -9317,6 +9377,11 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var=no
d133 12
a144 9
+      haiku*)
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs=yes
+        ;;
+
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@@@ -9430,6 +9495,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d148 3
d152 1
a152 1
+      if test -f /usr/libexec/ld.so; then
d156 2
a157 2
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
d160 3
a162 1
+      else
d164 2
a165 1
+      fi
d168 8
a175 4
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@@@ -9450,6 +9529,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d181 3
d187 2
a188 10
@@@@ -10064,6 +10145,7 @@@@ beos*)
 bsdi[45]*)
   version_type=linux
   need_version=no
+  need_lib_prefix=no
   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'
@@@@ -10165,9 +10247,7 @@@@ freebsd1*)
   dynamic_linker=no
a191 2
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
d193 2
d196 1
a196 3
     objformat=`/usr/bin/objformat`
   else
@@@@ -10179,7 +10259,7 @@@@ freebsd* | dragonfly*)
d205 1
a205 1
@@@@ -10202,7 +10282,7 @@@@ freebsd* | dragonfly*)
a213 1
@@@@ -10209,6 +10289,17 @@@@ freebsd* | dragonfly*)
d229 1
a229 1
   version_type=linux
d231 1
a231 21
@@@@ -10219,6 +10310,19 @@@@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@@@ -10280,12 +10384,7 @@@@ interix[3-9]*)
d237 1
a237 1
-		version_type=linux
d245 1
a245 1
@@@@ -10375,16 +10474,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d279 7
d287 6
a292 9
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    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='NetBSD ld.elf_so'
   fi
@@@@ -10413,7 +10534,7 @@@@ newsos6)
d301 1
a301 1
@@@@ -10421,7 +10542,7 @@@@ openbsd*)
d310 1
a310 28
@@@@ -10995,7 +11116,7 @@@@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10998 "configure"
+#line 11119 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@@@ -11091,7 +11212,7 @@@@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11094 "configure"
+#line 11215 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@@@ -11764,7 +11885,7 @@@@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11767 "configure"
+#line 11888 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@@@ -11910,6 +12031,9 @@@@ else
d320 3
a322 20
@@@@ -12473,6 +12597,7 @@@@ else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@@@ -12532,7 +12657,7 @@@@ else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@@@ -12587,9 +12712,7 @@@@ else
 fi
 
d324 1
a324 1
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
d327 1
a327 1
+if test -n "$CXX" && test "X$CXX" != "Xno" ; then
d331 1
a331 1
@@@@ -12836,7 +12959,10 @@@@ $RM -r conftest*
d335 1
a335 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d343 1
a343 2
@@@@ -13613,6 +13739,22 @@@@ if test -z "$aix_libpath"; then aix_libp
         ld_shlibs_CXX=no
a345 21
+      mirbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}-E'
+	  whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  output_verbose_link_cmd='echo'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       mvs*)
         case $cc_basename in
           cxx*)
@@@@ -13628,18 +13770,37 @@@@ if test -z "$aix_libpath"; then aix_libp
 
d347 6
a352 14
         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+          # a.out is quite broken and goes directly to ld
 	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
 	  wlarc=
+          # Determine if we need to override the c++rt0 that is
+          # picked up by analysing output_verbose_link_cmds
+          if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
+            cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
+          else
+            cpprt0_file=
+          fi
 	  hardcode_libdir_flag_spec_CXX='-R$libdir'
 	  hardcode_direct_CXX=yes
 	  hardcode_shlibpath_var_CXX=no
d356 6
a361 9
+        elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
+          # Workaround some broken pre-1.5 ELF toolchains
+          output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+        else
+          # Modern ELF works sanely as-is
+          archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+          archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+          output_verbose_link_cmd='echo'
+        fi
d365 25
a389 23
-        ld_shlibs_CXX=yes
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        hardcode_libdir_flag_spec_CXX='-R$libdir'
+        hardcode_direct_CXX=yes
+        hardcode_shlibpath_var_CXX=no
+        output_verbose_link_cmd='echo'
 	;;
 
       openbsd2*)
@@@@ -14036,6 +14197,11 @@@@ $RM -f confest.$objext
 
 # PORTME: override above test on systems where it is broken
 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
+   ;;
 interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
@@@@ -14176,14 +14342,25 @@@@ $as_echo_n "checking for $compiler optio
d399 1
a399 1
       ;;
d403 1
a403 1
+      ;;
d406 1
a406 11
       lt_prog_compiler_pic_CXX=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@@@ -14246,6 +14423,9 @@@@ $as_echo_n "checking for $compiler optio
d416 1
a416 1
@@@@ -14443,6 +14623,9 @@@@ $as_echo_n "checking for $compiler optio
d426 2
a427 52
@@@@ -14477,11 +14660,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14480: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14663: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14484: \$? = $ac_status" >&5
+   echo "$as_me:14667: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -14576,11 +14759,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14579: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14762: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14583: \$? = $ac_status" >&5
+   echo "$as_me:14766: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -14628,11 +14811,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14631: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14814: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14635: \$? = $ac_status" >&5
+   echo "$as_me:14818: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -14948,6 +15131,7 @@@@ beos*)
 bsdi[45]*)
   version_type=linux
   need_version=no
+  need_lib_prefix=no
   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'
@@@@ -15048,9 +15232,7 @@@@ freebsd1*)
   dynamic_linker=no
a430 2
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
d432 2
d435 1
a435 3
     objformat=`/usr/bin/objformat`
   else
@@@@ -15062,7 +15244,7 @@@@ freebsd* | dragonfly*)
d444 1
a444 1
@@@@ -15085,7 +15267,7 @@@@ freebsd* | dragonfly*)
a452 1
@@@@ -15092,6 +15274,17 @@@@ freebsd* | dragonfly*)
d468 1
a468 1
   version_type=linux
d470 1
a470 21
@@@@ -15102,6 +15295,19 @@@@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@@@ -15163,12 +15369,7 @@@@ interix[3-9]*)
d476 1
a476 1
-		version_type=linux
d484 1
a484 1
@@@@ -15258,16 +15459,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d518 7
d526 6
a531 9
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    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='NetBSD ld.elf_so'
   fi
@@@@ -15296,7 +15519,7 @@@@ newsos6)
d540 1
a540 1
@@@@ -15304,7 +15527,7 @@@@ openbsd*)
d549 1
a549 1
@@@@ -15877,7 +16100,10 @@@@ $RM -r conftest*
d553 1
a553 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d561 1
a561 1
@@@@ -15971,11 +16197,19 @@@@ $as_echo_n "checking for $compiler optio
d571 5
d578 2
a579 10
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_F77=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@@@ -15995,6 +16229,13 @@@@ $as_echo_n "checking for $compiler optio
d593 1
a593 1
@@@@ -16117,6 +16358,15 @@@@ $as_echo_n "checking for $compiler optio
d609 1
a609 1
@@@@ -16192,6 +16442,9 @@@@ $as_echo_n "checking for $compiler optio
d619 1
a619 43
@@@@ -16226,11 +16479,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16229: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16233: \$? = $ac_status" >&5
+   echo "$as_me:16486: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -16325,11 +16578,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16328: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16581: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16332: \$? = $ac_status" >&5
+   echo "$as_me:16585: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -16377,11 +16630,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16380: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16633: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16384: \$? = $ac_status" >&5
+   echo "$as_me:16637: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -16590,6 +16843,11 @@@@ _LT_EOF
d623 1
a623 12
+    haiku*)
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs_F77=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
@@@@ -16676,7 +16934,7 @@@@ _LT_EOF
       ;;
 
     netbsd*)
d625 11
a635 3
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
d637 4
a640 2
@@@@ -17051,6 +17309,11 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var_F77=no
d643 12
a654 9
+      haiku*)
+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_F77=yes
+        ;;
+
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds_F77='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@@@ -17163,6 +17426,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d658 3
d662 1
a662 1
+      if test -f /usr/libexec/ld.so; then
d666 2
a667 2
+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
d670 3
a672 1
+      else
d674 2
a675 1
+      fi
d678 8
a685 4
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@@@ -17183,6 +17460,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d691 3
d697 2
a698 10
@@@@ -17644,6 +17923,7 @@@@ beos*)
 bsdi[45]*)
   version_type=linux
   need_version=no
+  need_lib_prefix=no
   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'
@@@@ -17744,9 +18024,7 @@@@ freebsd1*)
   dynamic_linker=no
a701 2
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
d703 2
d706 1
a706 3
     objformat=`/usr/bin/objformat`
   else
@@@@ -17758,7 +18036,7 @@@@ freebsd* | dragonfly*)
d715 1
a715 1
@@@@ -17781,7 +18059,7 @@@@ freebsd* | dragonfly*)
a723 1
@@@@ -17788,6 +18066,17 @@@@ freebsd* | dragonfly*)
d739 1
a739 1
   version_type=linux
d741 1
a741 21
@@@@ -17798,6 +18087,19 @@@@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@@@ -17859,12 +18161,7 @@@@ interix[3-9]*)
d747 1
a747 1
-		version_type=linux
d755 1
a755 1
@@@@ -17948,16 +18245,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d789 7
d797 6
a802 9
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    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='NetBSD ld.elf_so'
   fi
@@@@ -17986,7 +18305,7 @@@@ newsos6)
d811 1
a811 1
@@@@ -17994,7 +18313,7 @@@@ openbsd*)
d820 1
a820 1
@@@@ -18557,7 +18876,10 @@@@ $RM -r conftest*
d824 1
a824 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d832 1
a832 1
@@@@ -18776,11 +19098,19 @@@@ $as_echo_n "checking for $compiler optio
d842 5
d849 2
a850 10
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_FC=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@@@ -18800,6 +19130,13 @@@@ $as_echo_n "checking for $compiler optio
d864 1
a864 1
@@@@ -18922,6 +19259,15 @@@@ $as_echo_n "checking for $compiler optio
d880 1
a880 1
@@@@ -18997,6 +19343,9 @@@@ $as_echo_n "checking for $compiler optio
d890 1
a890 43
@@@@ -19031,11 +19380,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19034: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19383: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19038: \$? = $ac_status" >&5
+   echo "$as_me:19387: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -19130,11 +19479,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19133: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19137: \$? = $ac_status" >&5
+   echo "$as_me:19486: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -19182,11 +19531,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19185: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19534: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19189: \$? = $ac_status" >&5
+   echo "$as_me:19538: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -19395,6 +19744,11 @@@@ _LT_EOF
d894 1
a894 12
+    haiku*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs_FC=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct_FC=no
       hardcode_shlibpath_var_FC=no
@@@@ -19481,7 +19835,7 @@@@ _LT_EOF
       ;;
 
     netbsd*)
d896 11
a906 3
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
d908 4
a911 2
@@@@ -19856,6 +20210,11 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var_FC=no
d914 12
a925 9
+      haiku*)
+        archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_FC=yes
+        ;;
+
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds_FC='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@@@ -19968,6 +20327,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d929 3
d933 1
a933 1
+      if test -f /usr/libexec/ld.so; then
d937 2
a938 2
+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
d941 3
a943 1
+      else
d945 2
a946 1
+      fi
d949 8
a956 4
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@@@ -19988,6 +20361,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d962 3
d968 2
a969 10
@@@@ -20449,6 +20824,7 @@@@ beos*)
 bsdi[45]*)
   version_type=linux
   need_version=no
+  need_lib_prefix=no
   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'
@@@@ -20549,9 +20925,7 @@@@ freebsd1*)
   dynamic_linker=no
a972 2
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
d974 2
d977 1
a977 3
     objformat=`/usr/bin/objformat`
   else
@@@@ -20563,7 +20937,7 @@@@ freebsd* | dragonfly*)
d986 1
a986 1
@@@@ -20586,7 +20960,7 @@@@ freebsd* | dragonfly*)
a994 1
@@@@ -20593,6 +20967,17 @@@@ freebsd* | dragonfly*)
d1010 1
a1010 1
   version_type=linux
d1012 1
a1012 21
@@@@ -20603,6 +20988,19 @@@@ gnu*)
   hardcode_into_libs=yes
   ;;
 
+haiku*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
@@@@ -20664,12 +21062,7 @@@@ interix[3-9]*)
d1018 1
a1018 1
-		version_type=linux
d1026 1
a1026 1
@@@@ -20753,16 +21146,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d1060 7
d1068 6
a1073 9
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | $GREP __G95__ >/dev/null; then
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
-    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='NetBSD ld.elf_so'
   fi
@@@@ -20791,7 +21206,7 @@@@ newsos6)
d1082 1
a1082 1
@@@@ -20799,7 +21214,7 @@@@ openbsd*)
d1091 1
a1091 1
@@@@ -21205,7 +21620,10 @@@@ for cc_temp in $compiler""; do
d1095 149
a1243 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d1251 1
a1251 15
@@@@ -21242,11 +21660,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21245: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:21663: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21249: \$? = $ac_status" >&5
+   echo "$as_me:21667: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -21320,11 +21738,19 @@@@ $as_echo_n "checking for $compiler optio
d1261 5
d1268 2
a1269 10
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_GCJ=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@@@ -21344,6 +21770,13 @@@@ $as_echo_n "checking for $compiler optio
d1283 1
a1283 1
@@@@ -21466,6 +21899,15 @@@@ $as_echo_n "checking for $compiler optio
d1299 1
a1299 1
@@@@ -21541,6 +21983,9 @@@@ $as_echo_n "checking for $compiler optio
d1309 1
a1309 43
@@@@ -21575,11 +22020,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22023: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:21582: \$? = $ac_status" >&5
+   echo "$as_me:22027: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@@@ -21674,11 +22119,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21677: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22122: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21681: \$? = $ac_status" >&5
+   echo "$as_me:22126: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -21726,11 +22171,11 @@@@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:21729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:22174: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:21733: \$? = $ac_status" >&5
+   echo "$as_me:22178: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@@@ -21939,6 +22384,11 @@@@ _LT_EOF
d1313 1
a1313 12
+    haiku*)
+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs_GCJ=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@@@ -22025,7 +22475,7 @@@@ _LT_EOF
       ;;
 
     netbsd*)
d1315 11
a1325 3
+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null && echo __G95__ | $CC -cpp -E - | grep __G95__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
d1327 4
a1330 2
@@@@ -22412,6 +22862,11 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var_GCJ=no
d1333 12
a1344 9
+      haiku*)
+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_GCJ=yes
+        ;;
+
     hpux9*)
       if test "$GCC" = yes; then
 	archive_cmds_GCJ='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@@@ -22525,6 +22980,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d1348 3
d1352 1
a1352 1
+      if test -f /usr/libexec/ld.so; then
d1356 2
a1357 2
+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
d1360 3
a1362 1
+      else
d1364 2
a1365 1
+      fi
d1368 8
a1375 4
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@@@ -22545,6 +23014,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1381 3
d1387 1
a1387 1
@@@@ -23115,7 +23586,10 @@@@ for cc_temp in $compiler""; do
d1391 1
a1391 1
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
a1398 20
@@@@ -24296,6 +24770,9 @@@@ LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+printf "%s" "$lt_prog_compiler_wl" > /dev/null
+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
+
 # Quote evaled strings.
 for var in SED \
 GREP \
@@@@ -24580,6 +25057,9 @@@@ case \$lt_ECHO in
   ;;
 esac
 
+printf "%s" "$lt_prog_compiler_wl" > /dev/null
+printf "%s" "$lt_prog_compiler_no_builtin_flag" > /dev/null
+
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@


1.72
log
@Revert. Doesn't follow the patch rules for libtool, wasn't discussed
with the OWNER.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.70 2011/05/14 16:49:45 bsiegert Exp $
d6 1
a6 1
--- configure.orig	2011-04-14 15:39:05.000000000 +0000
d8 73
a80 1
@@@@ -5293,13 +5293,20 @@@@ else
d94 1
d103 1
a103 1
@@@@ -5665,6 +5672,10 @@@@ gnu*)
d114 1
a114 1
@@@@ -5703,6 +5714,17 @@@@ linux* | k*bsd*-gnu)
d132 1
a132 1
@@@@ -5718,7 +5740,7 @@@@ newos6*)
d141 10
a150 1
@@@@ -7900,7 +7922,10 @@@@ for cc_temp in $compiler""; do
d162 15
a176 1
@@@@ -8210,9 +8235,17 @@@@ $as_echo_n "checking for $compiler optio
d186 2
a187 2
+      ;;
+
d192 2
a193 2
       ;;
 
d195 3
a197 1
@@@@ -8234,6 +8267,13 @@@@ $as_echo_n "checking for $compiler optio
d211 17
a227 1
@@@@ -8431,6 +8471,9 @@@@ $as_echo_n "checking for $compiler optio
d237 43
a279 1
@@@@ -8844,6 +8887,11 @@@@ _LT_EOF
d291 1
a291 1
@@@@ -8930,7 +8978,7 @@@@ _LT_EOF
d300 1
a300 1
@@@@ -9317,6 +9365,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d312 1
a312 1
@@@@ -9430,6 +9483,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d333 1
a333 1
@@@@ -9450,6 +9517,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d342 1
a342 1
@@@@ -10064,6 +10133,7 @@@@ beos*)
d350 1
a350 1
@@@@ -10165,9 +10235,7 @@@@ freebsd1*)
d361 1
a361 1
@@@@ -10179,7 +10247,7 @@@@ freebsd* | dragonfly*)
d370 1
a370 1
@@@@ -10202,13 +10270,24 @@@@ freebsd* | dragonfly*)
d379 1
d397 1
a397 1
@@@@ -10219,6 +10298,19 @@@@ gnu*)
d417 1
a417 1
@@@@ -10280,12 +10372,7 @@@@ interix[3-9]*)
d431 1
a431 1
@@@@ -10375,16 +10462,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d474 1
a474 1
@@@@ -10413,7 +10522,7 @@@@ newsos6)
d483 1
a483 1
@@@@ -10421,7 +10530,7 @@@@ openbsd*)
d492 28
a519 1
@@@@ -11910,6 +12019,9 @@@@ else
d529 18
a546 1
@@@@ -12587,9 +12699,7 @@@@ else
d557 1
a557 1
@@@@ -12836,7 +12946,10 @@@@ $RM -r conftest*
d569 1
a569 1
@@@@ -13613,6 +13726,22 @@@@ if test -z "$aix_libpath"; then aix_libp
d592 1
a592 1
@@@@ -13628,18 +13757,37 @@@@ if test -z "$aix_libpath"; then aix_libp
d634 1
a634 1
@@@@ -14036,6 +14184,11 @@@@ $RM -f confest.$objext
d646 1
a646 1
@@@@ -14176,14 +14329,25 @@@@ $as_echo_n "checking for $compiler optio
d656 1
a656 1
+      ;;
d660 1
a660 1
       ;;
d673 1
a673 1
@@@@ -14246,6 +14410,9 @@@@ $as_echo_n "checking for $compiler optio
d683 1
a683 1
@@@@ -14443,6 +14610,9 @@@@ $as_echo_n "checking for $compiler optio
d693 43
a735 1
@@@@ -14948,6 +15118,7 @@@@ beos*)
d743 1
a743 1
@@@@ -15048,9 +15219,7 @@@@ freebsd1*)
d754 1
a754 1
@@@@ -15062,7 +15231,7 @@@@ freebsd* | dragonfly*)
d763 1
a763 1
@@@@ -15085,13 +15254,24 @@@@ freebsd* | dragonfly*)
d772 1
d790 1
a790 1
@@@@ -15102,6 +15282,19 @@@@ gnu*)
d810 1
a810 1
@@@@ -15163,12 +15356,7 @@@@ interix[3-9]*)
d824 1
a824 1
@@@@ -15258,16 +15446,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d867 1
a867 1
@@@@ -15296,7 +15506,7 @@@@ newsos6)
d876 1
a876 1
@@@@ -15304,7 +15514,7 @@@@ openbsd*)
d885 1
a885 1
@@@@ -15877,7 +16087,10 @@@@ $RM -r conftest*
d897 1
a897 1
@@@@ -15971,9 +16184,17 @@@@ $as_echo_n "checking for $compiler optio
d907 2
a908 2
+      ;;
+
d913 2
a914 2
       ;;
 
d916 3
a918 1
@@@@ -15995,6 +16216,13 @@@@ $as_echo_n "checking for $compiler optio
d932 17
a948 1
@@@@ -16192,6 +16420,9 @@@@ $as_echo_n "checking for $compiler optio
d958 43
a1000 1
@@@@ -16590,6 +16821,11 @@@@ _LT_EOF
d1012 1
a1012 1
@@@@ -16676,7 +16912,7 @@@@ _LT_EOF
d1021 1
a1021 1
@@@@ -17051,6 +17287,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d1033 1
a1033 1
@@@@ -17163,6 +17404,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d1054 1
a1054 1
@@@@ -17183,6 +17438,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1063 1
a1063 1
@@@@ -17644,6 +17901,7 @@@@ beos*)
d1071 1
a1071 1
@@@@ -17744,9 +18002,7 @@@@ freebsd1*)
d1082 1
a1082 1
@@@@ -17758,7 +18014,7 @@@@ freebsd* | dragonfly*)
d1091 1
a1091 1
@@@@ -17781,13 +18037,24 @@@@ freebsd* | dragonfly*)
d1100 1
d1118 1
a1118 1
@@@@ -17798,6 +18065,19 @@@@ gnu*)
d1138 1
a1138 1
@@@@ -17859,12 +18139,7 @@@@ interix[3-9]*)
d1152 1
a1152 1
@@@@ -17948,16 +18223,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d1195 1
a1195 1
@@@@ -17986,7 +18283,7 @@@@ newsos6)
d1204 1
a1204 1
@@@@ -17994,7 +18291,7 @@@@ openbsd*)
d1213 1
a1213 1
@@@@ -18557,7 +18854,10 @@@@ $RM -r conftest*
d1225 1
a1225 1
@@@@ -18776,9 +19076,17 @@@@ $as_echo_n "checking for $compiler optio
d1235 2
a1236 2
+      ;;
+
d1241 2
a1242 2
       ;;
 
d1244 3
a1246 1
@@@@ -18800,6 +19108,13 @@@@ $as_echo_n "checking for $compiler optio
d1260 17
a1276 1
@@@@ -18997,6 +19312,9 @@@@ $as_echo_n "checking for $compiler optio
d1286 43
a1328 1
@@@@ -19395,6 +19713,11 @@@@ _LT_EOF
d1340 1
a1340 1
@@@@ -19481,7 +19804,7 @@@@ _LT_EOF
d1349 1
a1349 1
@@@@ -19856,6 +20179,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d1361 1
a1361 1
@@@@ -19968,6 +20296,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d1382 1
a1382 1
@@@@ -19988,6 +20330,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1391 1
a1391 1
@@@@ -20449,6 +20793,7 @@@@ beos*)
d1399 1
a1399 1
@@@@ -20549,9 +20894,7 @@@@ freebsd1*)
d1410 1
a1410 1
@@@@ -20563,7 +20906,7 @@@@ freebsd* | dragonfly*)
d1419 1
a1419 1
@@@@ -20586,13 +20929,24 @@@@ freebsd* | dragonfly*)
d1428 1
d1446 1
a1446 1
@@@@ -20603,6 +20957,19 @@@@ gnu*)
d1466 1
a1466 1
@@@@ -20664,12 +21031,7 @@@@ interix[3-9]*)
d1480 1
a1480 1
@@@@ -20753,16 +21115,38 @@@@ rm -f core conftest.err conftest.$ac_obj
d1523 1
a1523 1
@@@@ -20791,7 +21175,7 @@@@ newsos6)
d1532 1
a1532 1
@@@@ -20799,7 +21183,7 @@@@ openbsd*)
d1541 1
a1541 1
@@@@ -21205,7 +21589,10 @@@@ for cc_temp in $compiler""; do
d1553 15
a1567 1
@@@@ -21320,9 +21707,17 @@@@ $as_echo_n "checking for $compiler optio
d1577 2
a1578 2
+      ;;
+
d1583 2
a1584 2
       ;;
 
d1586 3
a1588 1
@@@@ -21344,6 +21739,13 @@@@ $as_echo_n "checking for $compiler optio
d1602 17
a1618 1
@@@@ -21541,6 +21943,9 @@@@ $as_echo_n "checking for $compiler optio
d1628 43
a1670 1
@@@@ -21939,6 +22344,11 @@@@ _LT_EOF
d1682 1
a1682 1
@@@@ -22025,7 +22435,7 @@@@ _LT_EOF
d1691 1
a1691 1
@@@@ -22412,6 +22822,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d1703 1
a1703 1
@@@@ -22525,6 +22940,20 @@@@ rm -f core conftest.err conftest.$ac_obj
d1724 1
a1724 1
@@@@ -22545,6 +22974,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1733 1
a1733 1
@@@@ -23115,7 +23546,10 @@@@ for cc_temp in $compiler""; do
d1745 1
a1745 1
@@@@ -24296,6 +24730,9 @@@@ LTCC='$LTCC'
d1755 1
a1755 1
@@@@ -24580,6 +25017,9 @@@@ case \$lt_ECHO in
@


1.71
log
@Don't add -z text unconditionally to ld on SunOS. This make
-mimpure-text work again, which is needed for several packages that use
assembly optimizations.
@
text
@d6 2
a7 2
--- configure.orig	2009-11-16 14:14:55.000000000 +0100
+++ configure	2011-09-08 17:53:38.830895810 +0200
a185 12
@@@@ -9522,9 +9591,9 @@@@ rm -f core conftest.err conftest.$ac_obj
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
a758 12
@@@@ -17255,9 +17512,9 @@@@ rm -f core conftest.err conftest.$ac_obj
       no_undefined_flag_F77=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
a1025 12
@@@@ -20060,9 +20404,9 @@@@ rm -f core conftest.err conftest.$ac_obj
       no_undefined_flag_FC=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds_FC='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_FC='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
a1292 12
@@@@ -22617,9 +23048,9 @@@@ rm -f core conftest.err conftest.$ac_obj
       no_undefined_flag_GCJ=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_GCJ='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@


1.70
log
@Add MirBSD support to libtool. The patches are based on the ones from MirPorts,
which uses libtool-1.5.

Reviewed by Alistair G Crooks.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.69 2011/03/23 15:46:36 obache Exp $
d6 2
a7 2
--- configure.orig	2011-04-14 15:39:05.000000000 +0000
+++ configure
d186 12
d771 12
d1050 12
d1329 12
@


1.69
log
@Backport Haiku support, taken from upstream.
(I'm using this patch over 10 months).
@
text
@d1 1
a1 1
$NetBSD$
d6 1
a6 1
--- configure.orig	2010-06-19 07:24:20.000000000 +0000
d8 1
a8 1
@@@@ -5293,6 +5293,13 @@@@ else
d22 8
d41 19
a59 1
@@@@ -5718,7 +5729,7 @@@@ newos6*)
d68 1
a68 1
@@@@ -7900,7 +7911,10 @@@@ for cc_temp in $compiler""; do
d80 1
a80 1
@@@@ -8210,9 +8224,17 @@@@ $as_echo_n "checking for $compiler optio
d99 1
a99 1
@@@@ -8234,6 +8256,13 @@@@ $as_echo_n "checking for $compiler optio
d113 1
a113 1
@@@@ -8431,6 +8460,9 @@@@ $as_echo_n "checking for $compiler optio
d123 1
a123 1
@@@@ -8844,6 +8876,11 @@@@ _LT_EOF
d135 1
a135 1
@@@@ -8930,7 +8967,7 @@@@ _LT_EOF
d144 34
a177 1
@@@@ -9450,6 +9487,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d186 1
a186 1
@@@@ -10064,6 +10103,7 @@@@ beos*)
d194 1
a194 1
@@@@ -10165,9 +10205,7 @@@@ freebsd1*)
d205 1
a205 1
@@@@ -10179,7 +10217,7 @@@@ freebsd* | dragonfly*)
d214 1
a214 1
@@@@ -10202,13 +10240,24 @@@@ freebsd* | dragonfly*)
d240 1
a240 1
@@@@ -10219,6 +10268,19 @@@@ gnu*)
d260 1
a260 1
@@@@ -10280,12 +10342,7 @@@@ interix[3-9]*)
d274 2
a275 1
@@@@ -10376,15 +10433,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d278 23
d317 1
a317 1
@@@@ -10413,7 +10469,7 @@@@ newsos6)
d326 1
a326 1
@@@@ -10421,7 +10477,7 @@@@ openbsd*)
d335 11
a345 1
@@@@ -12587,9 +12643,7 @@@@ else
d356 1
a356 1
@@@@ -12836,7 +12890,10 @@@@ $RM -r conftest*
d368 3
a370 3
@@@@ -13305,6 +13362,11 @@@@ if test -z "$aix_libpath"; then aix_libp
       gnu*)
         ;;
d372 15
a386 4
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
d388 4
a391 4
       hpux9*)
         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
         hardcode_libdir_separator_CXX=:
@@@@ -13628,18 +13690,37 @@@@ if test -z "$aix_libpath"; then aix_libp
d433 1
a433 1
@@@@ -14036,6 +14117,11 @@@@ $RM -f confest.$objext
d445 1
a445 1
@@@@ -14176,14 +14262,25 @@@@ $as_echo_n "checking for $compiler optio
d472 1
a472 1
@@@@ -14246,6 +14343,9 @@@@ $as_echo_n "checking for $compiler optio
d482 1
a482 1
@@@@ -14443,6 +14543,9 @@@@ $as_echo_n "checking for $compiler optio
d492 1
a492 1
@@@@ -14948,6 +15051,7 @@@@ beos*)
d500 1
a500 1
@@@@ -15048,9 +15152,7 @@@@ freebsd1*)
d511 1
a511 1
@@@@ -15062,7 +15164,7 @@@@ freebsd* | dragonfly*)
d520 1
a520 1
@@@@ -15085,13 +15187,24 @@@@ freebsd* | dragonfly*)
d546 1
a546 1
@@@@ -15102,6 +15215,19 @@@@ gnu*)
d566 1
a566 1
@@@@ -15163,12 +15289,7 @@@@ interix[3-9]*)
d580 2
a581 1
@@@@ -15259,15 +15380,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d584 23
d623 1
a623 1
@@@@ -15296,7 +15416,7 @@@@ newsos6)
d632 1
a632 1
@@@@ -15304,7 +15424,7 @@@@ openbsd*)
d641 1
a641 1
@@@@ -15877,7 +15997,10 @@@@ $RM -r conftest*
d653 1
a653 1
@@@@ -15971,9 +16094,17 @@@@ $as_echo_n "checking for $compiler optio
d672 1
a672 1
@@@@ -15995,6 +16126,13 @@@@ $as_echo_n "checking for $compiler optio
d686 1
a686 1
@@@@ -16192,6 +16330,9 @@@@ $as_echo_n "checking for $compiler optio
d696 1
a696 1
@@@@ -16590,6 +16731,11 @@@@ _LT_EOF
d708 1
a708 1
@@@@ -16676,7 +16822,7 @@@@ _LT_EOF
d717 34
a750 1
@@@@ -17183,6 +17329,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d759 1
a759 1
@@@@ -17644,6 +17792,7 @@@@ beos*)
d767 1
a767 1
@@@@ -17744,9 +17893,7 @@@@ freebsd1*)
d778 1
a778 1
@@@@ -17758,7 +17905,7 @@@@ freebsd* | dragonfly*)
d787 1
a787 1
@@@@ -17781,13 +17928,24 @@@@ freebsd* | dragonfly*)
d813 1
a813 1
@@@@ -17798,6 +17956,19 @@@@ gnu*)
d833 1
a833 1
@@@@ -17859,12 +18030,7 @@@@ interix[3-9]*)
d847 2
a848 1
@@@@ -17949,15 +18115,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d851 23
d890 1
a890 1
@@@@ -17986,7 +18151,7 @@@@ newsos6)
d899 1
a899 1
@@@@ -17994,7 +18159,7 @@@@ openbsd*)
d908 1
a908 1
@@@@ -18557,7 +18722,10 @@@@ $RM -r conftest*
d920 1
a920 1
@@@@ -18776,9 +18944,17 @@@@ $as_echo_n "checking for $compiler optio
d939 1
a939 1
@@@@ -18800,6 +18976,13 @@@@ $as_echo_n "checking for $compiler optio
d953 1
a953 1
@@@@ -18997,6 +19180,9 @@@@ $as_echo_n "checking for $compiler optio
d963 1
a963 1
@@@@ -19395,6 +19581,11 @@@@ _LT_EOF
d975 1
a975 1
@@@@ -19481,7 +19672,7 @@@@ _LT_EOF
d984 34
a1017 1
@@@@ -19988,6 +20179,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1026 1
a1026 1
@@@@ -20449,6 +20642,7 @@@@ beos*)
d1034 1
a1034 1
@@@@ -20549,9 +20743,7 @@@@ freebsd1*)
d1045 1
a1045 1
@@@@ -20563,7 +20755,7 @@@@ freebsd* | dragonfly*)
d1054 1
a1054 1
@@@@ -20586,13 +20778,24 @@@@ freebsd* | dragonfly*)
d1080 1
a1080 1
@@@@ -20603,6 +20806,19 @@@@ gnu*)
d1100 1
a1100 1
@@@@ -20664,12 +20880,7 @@@@ interix[3-9]*)
d1114 2
a1115 1
@@@@ -20754,15 +20965,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d1118 23
d1157 1
a1157 1
@@@@ -20791,7 +21001,7 @@@@ newsos6)
d1166 1
a1166 1
@@@@ -20799,7 +21009,7 @@@@ openbsd*)
d1175 1
a1175 1
@@@@ -21205,7 +21415,10 @@@@ for cc_temp in $compiler""; do
d1187 1
a1187 1
@@@@ -21320,9 +21533,17 @@@@ $as_echo_n "checking for $compiler optio
d1206 1
a1206 1
@@@@ -21344,6 +21565,13 @@@@ $as_echo_n "checking for $compiler optio
d1220 1
a1220 1
@@@@ -21541,6 +21769,9 @@@@ $as_echo_n "checking for $compiler optio
d1230 1
a1230 1
@@@@ -21939,6 +22170,11 @@@@ _LT_EOF
d1242 1
a1242 1
@@@@ -22025,7 +22261,7 @@@@ _LT_EOF
d1251 34
a1284 1
@@@@ -22545,6 +22781,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1293 1
a1293 1
@@@@ -23115,7 +23353,10 @@@@ for cc_temp in $compiler""; do
d1305 1
a1305 1
@@@@ -24296,6 +24537,9 @@@@ LTCC='$LTCC'
d1315 1
a1315 1
@@@@ -24580,6 +24824,9 @@@@ case \$lt_ECHO in
@


1.68
log
@Fix support of g95 as the fortran on NetBSD.

patches approved by Joerg.  Bump libtool-base PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.67 2009/12/18 22:11:10 joerg Exp $
d6 1
a6 1
--- configure.orig	2009-11-16 13:14:55.000000000 +0000
d22 12
a33 1
@@@@ -5718,7 +5725,7 @@@@ newos6*)
d42 1
a42 1
@@@@ -7900,7 +7907,10 @@@@ for cc_temp in $compiler""; do
d54 1
a54 1
@@@@ -8210,9 +8220,11 @@@@ $as_echo_n "checking for $compiler optio
d64 6
d73 1
a73 1
@@@@ -8234,6 +8246,13 @@@@ $as_echo_n "checking for $compiler optio
d87 1
a87 1
@@@@ -8431,6 +8450,9 @@@@ $as_echo_n "checking for $compiler optio
d97 13
a109 1
@@@@ -8930,7 +8952,7 @@@@ _LT_EOF
d118 1
a118 1
@@@@ -9450,6 +9472,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d127 1
a127 1
@@@@ -10064,6 +10088,7 @@@@ beos*)
d135 1
a135 1
@@@@ -10165,9 +10190,7 @@@@ freebsd1*)
d146 1
a146 1
@@@@ -10179,7 +10202,7 @@@@ freebsd* | dragonfly*)
d155 1
a155 1
@@@@ -10202,13 +10225,24 @@@@ freebsd* | dragonfly*)
d181 21
a201 1
@@@@ -10280,12 +10314,7 @@@@ interix[3-9]*)
d215 1
a215 1
@@@@ -10376,15 +10405,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d234 1
a234 1
@@@@ -10413,7 +10441,7 @@@@ newsos6)
d243 1
a243 1
@@@@ -10421,7 +10449,7 @@@@ openbsd*)
d252 1
a252 1
@@@@ -12587,9 +12615,7 @@@@ else
d263 1
a263 1
@@@@ -12836,7 +12862,10 @@@@ $RM -r conftest*
d275 13
a287 1
@@@@ -13628,18 +13657,37 @@@@ if test -z "$aix_libpath"; then aix_libp
d329 1
a329 1
@@@@ -14036,6 +14084,11 @@@@ $RM -f confest.$objext
d341 1
a341 1
@@@@ -14176,9 +14229,15 @@@@ $as_echo_n "checking for $compiler optio
d358 11
a368 1
@@@@ -14246,6 +14305,9 @@@@ $as_echo_n "checking for $compiler optio
d378 1
a378 1
@@@@ -14443,6 +14505,9 @@@@ $as_echo_n "checking for $compiler optio
d388 1
a388 1
@@@@ -14948,6 +15013,7 @@@@ beos*)
d396 1
a396 1
@@@@ -15048,9 +15114,7 @@@@ freebsd1*)
d407 1
a407 1
@@@@ -15062,7 +15126,7 @@@@ freebsd* | dragonfly*)
d416 1
a416 1
@@@@ -15085,13 +15149,24 @@@@ freebsd* | dragonfly*)
d442 21
a462 1
@@@@ -15163,12 +15238,7 @@@@ interix[3-9]*)
d476 1
a476 1
@@@@ -15259,15 +15329,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d495 1
a495 1
@@@@ -15296,7 +15365,7 @@@@ newsos6)
d504 1
a504 1
@@@@ -15304,7 +15373,7 @@@@ openbsd*)
d513 1
a513 1
@@@@ -15877,7 +15946,10 @@@@ $RM -r conftest*
d525 1
a525 1
@@@@ -15971,9 +16043,11 @@@@ $as_echo_n "checking for $compiler optio
d535 6
d544 1
a544 1
@@@@ -15995,6 +16069,13 @@@@ $as_echo_n "checking for $compiler optio
d558 1
a558 1
@@@@ -16192,6 +16273,9 @@@@ $as_echo_n "checking for $compiler optio
d568 13
a580 1
@@@@ -16676,7 +16760,7 @@@@ _LT_EOF
d589 1
a589 1
@@@@ -17183,6 +17267,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d598 1
a598 1
@@@@ -17644,6 +17730,7 @@@@ beos*)
d606 1
a606 1
@@@@ -17744,9 +17831,7 @@@@ freebsd1*)
d617 1
a617 1
@@@@ -17758,7 +17843,7 @@@@ freebsd* | dragonfly*)
d626 1
a626 1
@@@@ -17781,13 +17866,24 @@@@ freebsd* | dragonfly*)
d652 21
a672 1
@@@@ -17859,12 +17955,7 @@@@ interix[3-9]*)
d686 1
a686 1
@@@@ -17949,15 +18040,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d705 1
a705 1
@@@@ -17986,7 +18076,7 @@@@ newsos6)
d714 1
a714 1
@@@@ -17994,7 +18084,7 @@@@ openbsd*)
d723 1
a723 1
@@@@ -18557,7 +18647,10 @@@@ $RM -r conftest*
d735 1
a735 1
@@@@ -18776,9 +18869,11 @@@@ $as_echo_n "checking for $compiler optio
d745 6
d754 1
a754 1
@@@@ -18800,6 +18895,13 @@@@ $as_echo_n "checking for $compiler optio
d768 1
a768 1
@@@@ -18997,6 +19099,9 @@@@ $as_echo_n "checking for $compiler optio
d778 13
a790 1
@@@@ -19481,7 +19586,7 @@@@ _LT_EOF
d799 1
a799 1
@@@@ -19988,6 +20093,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d808 1
a808 1
@@@@ -20449,6 +20556,7 @@@@ beos*)
d816 1
a816 1
@@@@ -20549,9 +20657,7 @@@@ freebsd1*)
d827 1
a827 1
@@@@ -20563,7 +20669,7 @@@@ freebsd* | dragonfly*)
d836 1
a836 1
@@@@ -20586,13 +20692,24 @@@@ freebsd* | dragonfly*)
d862 21
a882 1
@@@@ -20664,12 +20781,7 @@@@ interix[3-9]*)
d896 1
a896 1
@@@@ -20754,15 +20866,14 @@@@ rm -f core conftest.err conftest.$ac_obj
d915 1
a915 1
@@@@ -20791,7 +20902,7 @@@@ newsos6)
d924 1
a924 1
@@@@ -20799,7 +20910,7 @@@@ openbsd*)
d933 1
a933 1
@@@@ -21205,7 +21316,10 @@@@ for cc_temp in $compiler""; do
d945 1
a945 1
@@@@ -21320,9 +21434,11 @@@@ $as_echo_n "checking for $compiler optio
d955 6
d964 1
a964 1
@@@@ -21344,6 +21460,13 @@@@ $as_echo_n "checking for $compiler optio
d978 1
a978 1
@@@@ -21541,6 +21664,9 @@@@ $as_echo_n "checking for $compiler optio
d988 13
a1000 1
@@@@ -22025,7 +22151,7 @@@@ _LT_EOF
d1009 1
a1009 1
@@@@ -22545,6 +22671,8 @@@@ rm -f core conftest.err conftest.$ac_obj
d1018 1
a1018 1
@@@@ -23115,7 +23243,10 @@@@ for cc_temp in $compiler""; do
d1030 1
a1030 1
@@@@ -24296,6 +24429,9 @@@@ LTCC='$LTCC'
d1040 1
a1040 1
@@@@ -24580,6 +24716,9 @@@@ case \$lt_ECHO in
@


1.67
log
@Add some band aid for the not-yet-fully-analyzed issue with sh on
NetBSD. Install a prestine install.sh to not leak our modifications
into packages. Bump revision.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.66 2009/12/17 00:53:52 joerg Exp $
d6 1
a6 1
--- configure.orig	2009-12-17 01:29:54.000000000 +0100
d174 2
d177 1
a177 2
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
d393 2
d396 1
a396 2
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
d565 2
d568 1
a568 2
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
d737 2
d740 1
a740 2
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
d845 1
a845 1
@@@@ -24427,6 +24441,9 @@@@
d855 1
a855 1
@@@@ -24711,6 +24729,9 @@@@
@


1.66
log
@Fix another set of broken macro names. Regen patches.
@
text
@d1 4
a4 1
$NetBSD$
d841 20
@


1.65
log
@Fix a macro name so that the correct C++ linkage on NetBSD and QNX is
used. Bump revision of libtool-base.
@
text
@d3 1
a3 1
--- configure.orig	2009-12-16 15:15:21.000000000 +0000
d49 1
a49 1
+      =''
d60 1
a60 1
+      =no
d72 1
a72 1
+    =
d90 2
a91 2
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
d285 1
a285 1
+      =''
d289 1
a289 1
+      =
d308 1
a308 1
+    =
d438 1
a438 1
+      =''
d449 1
a449 1
+      =no
d461 1
a461 1
+    =
d479 2
a480 2
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
d609 1
a609 1
+      =''
d620 1
a620 1
+      =no
d632 1
a632 1
+    =
d650 2
a651 2
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
d780 1
a780 1
+      =''
d791 1
a791 1
+      =no
d803 1
a803 1
+    =
d821 2
a822 2
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
@


1.64
log
@Update to libtool-2.2.6b. This switches libtool to the new main branch.
Changes are many, important for pkgsrc:
- much higher speed (up to 30% faster for the overall build of libX11)
- less magic for detection of the tag

The pkgsrc integration of f2c has been changed to be more sane.
libtool itself now depends on the f2c frontend to use proper
auto-configuration and only fakes up the library. This part is
encapsulated in mk/compiler/f2c.mk.
@
text
@d3 1
a3 1
--- configure.orig	2009-12-15 16:46:54.000000000 +0100
d247 2
a248 2
+          ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+          ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
d255 5
a259 5
+        ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        ='-R$libdir'
+        =yes
+        =no
@


1.63
log
@Add support for g95 on NetBSD to libtool.
Bump PKGREVISION of libtool-base.

OKed by jeorg.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.62 2009/03/23 23:03:59 joerg Exp $
d3 1
a3 1
--- configure.orig	2008-02-02 05:38:42.000000000 +1300
d5 3
a7 1
@@@@ -630,11 +630,11 @@@@ else
d9 6
a14 19
   if test "X$echo" = Xecho; then
     # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+    if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
        echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
        test "X$echo_testing_string" = "X$echo_test_string"; then
       # This shell has a builtin print -r that does the trick.
-      echo='print -r'
+      echo='print -r -'
     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.
@@@@ -5260,6 +5260,10 @@@@ interix[3-9]*)
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
 
+interix3*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
d16 4
a19 4
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
@@@@ -5290,7 +5294,7 @@@@ newos6*)
d22 2
a23 2
 nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
d28 1
a28 24
@@@@ -6494,12 +6498,7 @@@@ fi
 
 done
 
-
-
-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=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'
@@@@ -6725,8 +6724,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
 
-fi
-
 
 
 
@@@@ -7467,7 +7464,10 @@@@ for cc_temp in $compiler""; do
d32 1
a32 1
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d35 2
a36 2
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d40 1
a40 1
@@@@ -8082,9 +8082,11 @@@@ echo $ECHO_N "checking for $compiler opt
d49 1
a49 1
+      lt_prog_compiler_static=''
d52 3
a54 3
     interix[3-9]*)
@@@@ -8118,6 +8120,11 @@@@ echo $ECHO_N "checking for $compiler opt
       esac
d57 5
a61 3
+    interix3*)
+      # Interix 3.0-3.5 -fPIC option generates borked code.
+      # (Instead, shlibs are relocated at runtime.)
d64 4
a67 6
     *)
       lt_prog_compiler_pic='-fPIC'
       ;;
@@@@ -8272,6 +8279,10 @@@@ echo $ECHO_N "checking for $compiler opt
       lt_prog_compiler_static='-Bstatic'
       ;;
d69 9
a77 21
+    nto-qnx*)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+
     *)
       lt_prog_compiler_can_build_shared=no
       ;;
@@@@ -8509,7 +8520,10 @@@@ echo $ECHO_N "checking whether the $comp
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@@@ -8678,8 +8692,19 @@@@ EOF
       fi
a79 11
+    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'
+      ;;
+
d81 1
a81 1
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d86 1
a86 2
@@@@ -8743,6 +8768,11 @@@@ _LT_EOF
       hardcode_shlibpath_var=no
d89 3
a91 32
+    nto-qnx*)
+       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@@@ -9209,6 +9239,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}--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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
+      export_dynamic_flag_spec='${wl}-E'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-h,$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'
@@@@ -9434,6 +9479,13 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var=no
d94 2
a95 11
+    nto-qnx*)
+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
     *)
       ld_shlibs=no
       ;;
@@@@ -9650,6 +9702,7 @@@@ beos*)
d103 1
a103 1
@@@@ -9748,9 +9801,7 @@@@ freebsd1*)
d114 1
a114 1
@@@@ -9762,7 +9813,7 @@@@ freebsd* | dragonfly*)
d123 1
a123 1
@@@@ -9785,13 +9836,24 @@@@ freebsd* | dragonfly*)
d149 1
a149 16
@@@@ -9860,15 +9922,22 @@@@ interix[3-9]*)
   hardcode_into_libs=yes
   ;;
 
+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=yes
+  hardcode_into_libs=yes
+  ;;
+
d163 1
a163 1
@@@@ -9933,11 +10002,11 @@@@ linux* | k*bsd*-gnu)
d171 2
a172 1
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
a173 1
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d177 5
a181 8
@@@@ -9962,13 +10031,14 @@@@ nto-qnx*)
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  dynamic_linker='QNX libc.so'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
d190 3
a192 3
@@@@ -9976,7 +10046,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
     *)                         need_version=no  ;;
d198 4
a201 2
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -11566,9 +11636,7 @@@@ echo "$as_me: error: tag name \"$tagname
d203 5
a207 7
       case $tagname in
       CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (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=cpp
d210 1
a210 1
@@@@ -11674,7 +11742,10 @@@@ for cc_temp in $compiler""; do
d214 1
a214 1
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d217 6
a222 2
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d224 41
d266 11
a276 85
 # We don't want -fno-exception wen compiling C++ code, so set the
@@@@ -12309,6 +12380,16 @@@@ if test -z "$aix_libpath"; then aix_libp
     archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
     archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
     ;;
+  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}--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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
+    ;;
   irix5* | irix6*)
     case $cc_basename in
       CC*)
@@@@ -12462,14 +12543,29 @@@@ if test -z "$aix_libpath"; then aix_libp
     ;;
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      # a.out is quite broken and goes directly to ld
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
+      # Determine if we need to override the c++rt0 that is
+      # picked up by analysing output_verbose_link_cmds
+      if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
+        cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
+      else
+        cpprt0_file=
+      fi
       hardcode_libdir_flag_spec_CXX='-R$libdir'
       hardcode_direct_CXX=yes
       hardcode_shlibpath_var_CXX=no
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    elif $CC -dumpspecs | grep -- '-lgcc -lc -lgcc' >/dev/null; then
+      # Workaround some broken pre-1.5 ELF toolchains
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+    else
+      # Modern ELF works sanely as-is
+      archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      output_verbose_link_cmd='echo'
     fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
   openbsd2*)
     # C++ shared libraries are fairly broken
@@@@ -12782,6 +12878,11 @@@@ if test -z "$aix_libpath"; then aix_libp
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
+  nto-qnx*)
+    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+    archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    output_verbose_link_cmd='echo'
+    ;;
   *)
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
@@@@ -12891,6 +12992,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
     esac
   done
 
+  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
+
   # Clean up.
   rm -f a.out a.exe
 else
@@@@ -13000,9 +13116,11 @@@@ echo $ECHO_N "checking for $compiler opt
d285 5
a289 1
+      lt_prog_compiler_static_CXX=''
d293 3
a295 1
@@@@ -13028,6 +13146,10 @@@@ echo $ECHO_N "checking for $compiler opt
d297 2
a298 14
       esac
       ;;
+    interix3*)
+      # Interix 3.0-3.5 -fPIC option generates borked code.
+      # (Instead, shlibs are relocated at runtime.)
+      ;;
     *)
       lt_prog_compiler_pic_CXX='-fPIC'
       ;;
@@@@ -13106,6 +13228,8 @@@@ echo $ECHO_N "checking for $compiler opt
 	# This is c89, which is MS Visual C++ (no shared libs)
 	# Anyone wants to do a port?
 	;;
+      interix3*)
d300 2
a301 4
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
 	  CC*)
@@@@ -13245,6 +13369,8 @@@@ echo $ECHO_N "checking for $compiler opt
d303 11
a313 8
       vxworks*)
 	;;
+      nto-qnx*)
+	;;
       *)
 	lt_prog_compiler_can_build_shared_CXX=no
 	;;
@@@@ -13618,6 +13744,7 @@@@ beos*)
d321 1
a321 1
@@@@ -13715,9 +13842,7 @@@@ freebsd1*)
d332 1
a332 1
@@@@ -13729,7 +13854,7 @@@@ freebsd* | dragonfly*)
d341 1
a341 1
@@@@ -13752,13 +13877,24 @@@@ freebsd* | dragonfly*)
d367 1
a367 16
@@@@ -13827,15 +13963,22 @@@@ interix[3-9]*)
   hardcode_into_libs=yes
   ;;
 
+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=yes
+  hardcode_into_libs=yes
+  ;;
+
d381 1
a381 1
@@@@ -13900,11 +14043,11 @@@@ linux* | k*bsd*-gnu)
d389 2
a390 1
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
a391 1
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d395 5
a399 8
@@@@ -13929,13 +14072,14 @@@@ nto-qnx*)
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  dynamic_linker='QNX libc.so'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
d408 3
a410 3
@@@@ -13943,7 +14087,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
     *)                         need_version=no  ;;
d416 2
a417 2
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -14661,7 +14805,10 @@@@ for cc_temp in $compiler""; do
d421 1
a421 1
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d424 2
a425 3
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
d427 3
a429 2
 { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
@@@@ -14742,9 +14889,11 @@@@ echo $ECHO_N "checking for $compiler opt
d438 1
a438 1
+      lt_prog_compiler_static_F77=''
d441 3
a443 3
     interix[3-9]*)
@@@@ -14778,6 +14927,11 @@@@ echo $ECHO_N "checking for $compiler opt
       esac
d446 5
a450 3
+    interix3*)
+      # Interix 3.0-3.5 -fPIC option generates borked code.
+      # (Instead, shlibs are relocated at runtime.)
d453 4
a456 6
     *)
       lt_prog_compiler_pic_F77='-fPIC'
       ;;
@@@@ -14932,6 +15086,10 @@@@ echo $ECHO_N "checking for $compiler opt
       lt_prog_compiler_static_F77='-Bstatic'
       ;;
d458 9
a466 21
+    nto-qnx*)
+      lt_prog_compiler_pic_F77='-fPIC'
+      ;;
+
     *)
       lt_prog_compiler_can_build_shared_F77=no
       ;;
@@@@ -15169,7 +15327,10 @@@@ echo $ECHO_N "checking whether the $comp
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@@@ -15338,8 +15499,19 @@@@ EOF
       fi
a468 11
+    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'
+      ;;
+
d470 1
a470 1
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d475 1
a475 2
@@@@ -15403,6 +15575,11 @@@@ _LT_EOF
       hardcode_shlibpath_var_F77=no
d478 3
a480 32
+    nto-qnx*)
+       archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@@@ -15849,6 +16026,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}--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 ${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}-h,$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'
@@@@ -16074,6 +16266,13 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var_F77=no
d483 2
a484 11
+    nto-qnx*)
+      archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_F77='-R$libdir'
+      hardcode_direct_F77=yes
+      hardcode_shlibpath_var_F77=no
+      ;;
+
     *)
       ld_shlibs_F77=no
       ;;
@@@@ -16239,6 +16438,7 @@@@ beos*)
d492 1
a492 1
@@@@ -16336,9 +16536,7 @@@@ freebsd1*)
d503 1
a503 1
@@@@ -16350,7 +16548,7 @@@@ freebsd* | dragonfly*)
d512 1
a512 1
@@@@ -16373,13 +16571,24 @@@@ freebsd* | dragonfly*)
d538 1
a538 16
@@@@ -16448,15 +16657,22 @@@@ interix[3-9]*)
   hardcode_into_libs=yes
   ;;
 
+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=yes
+  hardcode_into_libs=yes
+  ;;
+
d552 1
a552 1
@@@@ -16521,11 +16737,11 @@@@ linux* | k*bsd*-gnu)
d560 2
a561 1
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
a562 1
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d566 5
a570 8
@@@@ -16550,13 +16766,14 @@@@ nto-qnx*)
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  dynamic_linker='QNX libc.so'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
d579 3
a581 3
@@@@ -16564,7 +16781,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
     *)                         need_version=no  ;;
d587 2
a588 2
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -17242,7 +17459,10 @@@@ for cc_temp in $compiler""; do
d592 1
a592 1
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d595 2
a596 2
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d599 2
a600 2
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
@@@@ -17347,9 +17567,11 @@@@ echo $ECHO_N "checking for $compiler opt
d608 2
a609 2
       lt_prog_compiler_pic_GCJ='-fno-common'
+      lt_prog_compiler_static_GCJ=''
d612 3
a614 3
     interix[3-9]*)
@@@@ -17383,6 +17605,11 @@@@ echo $ECHO_N "checking for $compiler opt
       esac
d617 5
a621 3
+    interix3*)
+      # Interix 3.0-3.5 -fPIC option generates borked code.
+      # (Instead, shlibs are relocated at runtime.)
d624 4
a627 6
     *)
       lt_prog_compiler_pic_GCJ='-fPIC'
       ;;
@@@@ -17537,6 +17764,10 @@@@ echo $ECHO_N "checking for $compiler opt
       lt_prog_compiler_static_GCJ='-Bstatic'
       ;;
d629 9
a637 21
+    nto-qnx*)
+      lt_prog_compiler_pic_GCJ='-fPIC'
+      ;;
+
     *)
       lt_prog_compiler_can_build_shared_GCJ=no
       ;;
@@@@ -17774,7 +18005,10 @@@@ echo $ECHO_N "checking whether the $comp
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@@@ -17943,8 +18177,19 @@@@ EOF
       fi
a639 11
+    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'
+      ;;
+
d641 1
a641 1
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d643 1
a643 1
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
d646 1
a646 2
@@@@ -18008,6 +18253,11 @@@@ _LT_EOF
       hardcode_shlibpath_var_GCJ=no
d649 3
a651 32
+    nto-qnx*)
+       archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@@@ -18474,6 +18724,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}--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 ${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}-h,$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'
@@@@ -18699,6 +18964,13 @@@@ if test -z "$aix_libpath"; then aix_libp
       hardcode_shlibpath_var_GCJ=no
d654 2
a655 11
+    nto-qnx*)
+      archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec_GCJ='-R$libdir'
+      hardcode_direct_GCJ=yes
+      hardcode_shlibpath_var_GCJ=no
+      ;;
+
     *)
       ld_shlibs_GCJ=no
       ;;
@@@@ -18864,6 +19136,7 @@@@ beos*)
d663 1
a663 1
@@@@ -18961,9 +19234,7 @@@@ freebsd1*)
d674 1
a674 1
@@@@ -18975,7 +19246,7 @@@@ freebsd* | dragonfly*)
d683 1
a683 1
@@@@ -18998,13 +19269,24 @@@@ freebsd* | dragonfly*)
d709 1
a709 16
@@@@ -19073,15 +19355,22 @@@@ interix[3-9]*)
   hardcode_into_libs=yes
   ;;
 
+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=yes
+  hardcode_into_libs=yes
+  ;;
+
d723 1
a723 1
@@@@ -19146,11 +19435,11 @@@@ linux* | k*bsd*-gnu)
d731 2
a732 1
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
a733 1
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d737 5
a741 8
@@@@ -19175,13 +19464,14 @@@@ nto-qnx*)
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  dynamic_linker='QNX libc.so'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
d750 3
a752 3
@@@@ -19189,7 +19479,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
     *)                         need_version=no  ;;
d758 69
a826 2
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -19866,7 +20156,10 @@@@ for cc_temp in $compiler""; do
d830 1
a830 1
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d833 2
a834 2
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
a837 9
@@@@ -21547,7 +21840,7 @@@@ echo "$as_me: executing $ac_file command
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@


1.62
log
@PR 40405: Change soname logic for DragonFly to follow the normal major
only scheme. Properly distinguish FreeBSD and DragonFly case to prevent
further confusion. Differs from the patch in the PR as it forces the
correct branch to be used.

Bump revision of libtool-base. Claim ownership.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- configure.orig	2008-02-01 17:38:42.000000000 +0100
d122 1
a122 1
@@@@ -8678,6 +8692,17 @@@@ EOF
d138 2
a139 1
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d141 2
d643 1
a643 1
@@@@ -15338,6 +15499,17 @@@@ EOF
d659 2
a660 1
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d662 2
d894 1
a894 1
@@@@ -17943,6 +18177,17 @@@@ EOF
d910 2
a911 1
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
d913 2
@


1.61
log
@update to libtool 1.5.26 using libtool/patches/manual.README procedure:
fixes linking problems on darwin (problems with nmedit, see
http://pogma.com/2008/02/13/nmedit-libtool-exported-symbols/ )
@
text
@d3 1
a3 1
--- configure.orig	2008-11-18 16:39:10.000000000 -0500
d196 1
a196 1
@@@@ -9748,7 +9801,7 @@@@ freebsd1*)
d201 2
a203 2
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
d205 3
a207 1
@@@@ -9762,7 +9815,7 @@@@ freebsd* | dragonfly*)
d216 9
a224 1
@@@@ -9792,6 +9845,16 @@@@ freebsd* | dragonfly*)
d229 1
a229 1
+  version_type=linux # XXX tv this should be =linux; current selection has problems
d233 1
d242 1
a242 1
@@@@ -9860,15 +9923,22 @@@@ interix[3-9]*)
d271 1
a271 1
@@@@ -9933,11 +10003,11 @@@@ linux* | k*bsd*-gnu)
d285 1
a285 1
@@@@ -9962,13 +10032,14 @@@@ nto-qnx*)
d301 1
a301 1
@@@@ -9976,7 +10047,7 @@@@ openbsd*)
d310 1
a310 1
@@@@ -11566,9 +11637,7 @@@@ echo "$as_me: error: tag name \"$tagname
d321 1
a321 1
@@@@ -11674,7 +11743,10 @@@@ for cc_temp in $compiler""; do
d333 1
a333 1
@@@@ -12309,6 +12381,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d350 1
a350 1
@@@@ -12462,14 +12544,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d382 1
a382 1
@@@@ -12782,6 +12879,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d394 1
a394 1
@@@@ -12891,6 +12993,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d416 1
a416 1
@@@@ -13000,9 +13117,11 @@@@ echo $ECHO_N "checking for $compiler opt
d429 1
a429 1
@@@@ -13028,6 +13147,10 @@@@ echo $ECHO_N "checking for $compiler opt
d440 1
a440 1
@@@@ -13106,6 +13229,8 @@@@ echo $ECHO_N "checking for $compiler opt
d449 1
a449 1
@@@@ -13245,6 +13370,8 @@@@ echo $ECHO_N "checking for $compiler opt
d458 1
a458 1
@@@@ -13618,6 +13745,7 @@@@ beos*)
d466 1
a466 1
@@@@ -13715,7 +13843,7 @@@@ freebsd1*)
d471 2
a473 2
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
d475 3
a477 1
@@@@ -13729,7 +13857,7 @@@@ freebsd* | dragonfly*)
d486 9
a494 1
@@@@ -13759,6 +13887,16 @@@@ freebsd* | dragonfly*)
d499 1
a499 1
+  version_type=linux # XXX tv this should be =linux; current selection has problems
d503 1
d512 1
a512 1
@@@@ -13827,15 +13965,22 @@@@ interix[3-9]*)
d541 1
a541 1
@@@@ -13900,11 +14045,11 @@@@ linux* | k*bsd*-gnu)
d555 1
a555 1
@@@@ -13929,13 +14074,14 @@@@ nto-qnx*)
d571 1
a571 1
@@@@ -13943,7 +14089,7 @@@@ openbsd*)
d580 1
a580 1
@@@@ -14661,7 +14807,10 @@@@ for cc_temp in $compiler""; do
d592 1
a592 1
@@@@ -14742,9 +14891,11 @@@@ echo $ECHO_N "checking for $compiler opt
d605 1
a605 1
@@@@ -14778,6 +14929,11 @@@@ echo $ECHO_N "checking for $compiler opt
d617 1
a617 1
@@@@ -14932,6 +15088,10 @@@@ echo $ECHO_N "checking for $compiler opt
d628 1
a628 1
@@@@ -15169,7 +15329,10 @@@@ echo $ECHO_N "checking whether the $comp
d640 1
a640 1
@@@@ -15338,6 +15501,17 @@@@ EOF
d658 1
a658 1
@@@@ -15403,6 +15577,11 @@@@ _LT_EOF
d670 1
a670 1
@@@@ -15849,6 +16028,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d692 1
a692 1
@@@@ -16074,6 +16268,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d706 1
a706 1
@@@@ -16239,6 +16440,7 @@@@ beos*)
d714 1
a714 1
@@@@ -16336,7 +16538,7 @@@@ freebsd1*)
d719 2
a721 2
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
d723 3
a725 1
@@@@ -16350,7 +16552,7 @@@@ freebsd* | dragonfly*)
d734 9
a742 1
@@@@ -16380,6 +16582,16 @@@@ freebsd* | dragonfly*)
d747 1
a747 1
+  version_type=linux # XXX tv this should be =linux; current selection has problems
d751 1
d760 1
a760 1
@@@@ -16448,15 +16660,22 @@@@ interix[3-9]*)
d789 1
a789 1
@@@@ -16521,11 +16740,11 @@@@ linux* | k*bsd*-gnu)
d803 1
a803 1
@@@@ -16550,13 +16769,14 @@@@ nto-qnx*)
d819 1
a819 1
@@@@ -16564,7 +16784,7 @@@@ openbsd*)
d828 1
a828 1
@@@@ -17242,7 +17462,10 @@@@ for cc_temp in $compiler""; do
d840 1
a840 1
@@@@ -17347,9 +17570,11 @@@@ echo $ECHO_N "checking for $compiler opt
d853 1
a853 1
@@@@ -17383,6 +17608,11 @@@@ echo $ECHO_N "checking for $compiler opt
d865 1
a865 1
@@@@ -17537,6 +17767,10 @@@@ echo $ECHO_N "checking for $compiler opt
d876 1
a876 1
@@@@ -17774,7 +18008,10 @@@@ echo $ECHO_N "checking whether the $comp
d888 1
a888 1
@@@@ -17943,6 +18180,17 @@@@ EOF
d906 1
a906 1
@@@@ -18008,6 +18256,11 @@@@ _LT_EOF
d918 1
a918 1
@@@@ -18474,6 +18727,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d940 1
a940 1
@@@@ -18699,6 +18967,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d954 1
a954 1
@@@@ -18864,6 +19139,7 @@@@ beos*)
d962 1
a962 1
@@@@ -18961,7 +19237,7 @@@@ freebsd1*)
d967 2
a969 2
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
d971 3
a973 1
@@@@ -18975,7 +19251,7 @@@@ freebsd* | dragonfly*)
d982 9
a990 1
@@@@ -19005,6 +19281,16 @@@@ freebsd* | dragonfly*)
d995 1
a995 1
+  version_type=linux # XXX tv this should be =linux; current selection has problems
d999 1
d1008 1
a1008 1
@@@@ -19073,15 +19359,22 @@@@ interix[3-9]*)
d1037 1
a1037 1
@@@@ -19146,11 +19439,11 @@@@ linux* | k*bsd*-gnu)
d1051 1
a1051 1
@@@@ -19175,13 +19468,14 @@@@ nto-qnx*)
d1067 1
a1067 1
@@@@ -19189,7 +19483,7 @@@@ openbsd*)
d1076 1
a1076 1
@@@@ -19866,7 +20160,10 @@@@ for cc_temp in $compiler""; do
d1088 1
a1088 1
@@@@ -21547,7 +21844,7 @@@@ echo "$as_me: executing $ac_file command
@


1.60
log
@Restore basename override to get the name of the real compiler for the
decision making in libtool. This was lost during the update and broke
the build of shared C++ libraries with SunPro on Solaris. Bump revision
of libtool-base.

Noticed by salo and dmcmahill, tested by dmcmahill.
@
text
@d3 1
a3 1
--- configure.orig	2007-10-05 18:47:50.000000000 +0200
d19 1
a19 1
@@@@ -5258,6 +5258,10 @@@@ interix[3-9]*)
d30 1
a30 1
@@@@ -5288,7 +5292,7 @@@@ newos6*)
d39 1
a39 1
@@@@ -6488,12 +6492,7 @@@@ fi
d53 1
a53 1
@@@@ -6719,8 +6718,6 @@@@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
d62 1
a62 1
@@@@ -7462,7 +7459,10 @@@@ for cc_temp in $compiler""; do
d74 1
a74 1
@@@@ -7765,9 +7765,11 @@@@ echo $ECHO_N "checking for $compiler opt
d87 1
a87 1
@@@@ -7801,6 +7803,11 @@@@ echo $ECHO_N "checking for $compiler opt
d99 1
a99 1
@@@@ -7955,6 +7962,10 @@@@ echo $ECHO_N "checking for $compiler opt
d110 1
a110 1
@@@@ -8191,7 +8202,10 @@@@ echo $ECHO_N "checking whether the $comp
d122 1
a122 1
@@@@ -8360,6 +8374,17 @@@@ EOF
d140 1
a140 1
@@@@ -8425,6 +8450,11 @@@@ _LT_EOF
d152 1
a152 1
@@@@ -8892,6 +8922,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d174 1
a174 1
@@@@ -9117,6 +9162,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d188 1
a188 1
@@@@ -9333,6 +9385,7 @@@@ beos*)
d196 1
a196 1
@@@@ -9431,7 +9484,7 @@@@ freebsd1*)
d205 1
a205 1
@@@@ -9445,7 +9498,7 @@@@ freebsd* | dragonfly*)
d214 1
a214 1
@@@@ -9475,6 +9528,16 @@@@ freebsd* | dragonfly*)
d231 1
a231 1
@@@@ -9543,15 +9606,22 @@@@ interix[3-9]*)
d260 1
a260 1
@@@@ -9616,11 +9686,11 @@@@ linux* | k*bsd*-gnu)
d274 1
a274 1
@@@@ -9645,13 +9715,14 @@@@ nto-qnx*)
d290 1
a290 1
@@@@ -9659,7 +9730,7 @@@@ openbsd*)
d299 1
a299 1
@@@@ -11229,9 +11300,7 @@@@ echo "$as_me: error: tag name \"$tagname
d310 1
a310 1
@@@@ -11336,7 +11405,10 @@@@ for cc_temp in $compiler""; do
d322 1
a322 1
@@@@ -11999,6 +12071,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d339 1
a339 1
@@@@ -12152,14 +12234,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d371 1
a371 1
@@@@ -12472,6 +12569,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d383 1
a383 1
@@@@ -12582,6 +12684,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d405 1
a405 1
@@@@ -12687,9 +12804,11 @@@@ echo $ECHO_N "checking for $compiler opt
d418 1
a418 1
@@@@ -12715,6 +12834,10 @@@@ echo $ECHO_N "checking for $compiler opt
d429 1
a429 1
@@@@ -12793,6 +12916,8 @@@@ echo $ECHO_N "checking for $compiler opt
d438 1
a438 1
@@@@ -12932,6 +13057,8 @@@@ echo $ECHO_N "checking for $compiler opt
d447 1
a447 1
@@@@ -13304,6 +13431,7 @@@@ beos*)
d455 1
a455 1
@@@@ -13401,7 +13529,7 @@@@ freebsd1*)
d464 1
a464 1
@@@@ -13415,7 +13543,7 @@@@ freebsd* | dragonfly*)
d473 1
a473 1
@@@@ -13445,6 +13573,16 @@@@ freebsd* | dragonfly*)
d490 1
a490 1
@@@@ -13513,15 +13651,22 @@@@ interix[3-9]*)
d519 1
a519 1
@@@@ -13586,11 +13731,11 @@@@ linux* | k*bsd*-gnu)
d533 1
a533 1
@@@@ -13615,13 +13760,14 @@@@ nto-qnx*)
d549 1
a549 1
@@@@ -13629,7 +13775,7 @@@@ openbsd*)
d558 1
a558 1
@@@@ -14327,7 +14473,10 @@@@ for cc_temp in $compiler""; do
d570 1
a570 1
@@@@ -14408,9 +14557,11 @@@@ echo $ECHO_N "checking for $compiler opt
d583 1
a583 1
@@@@ -14444,6 +14595,11 @@@@ echo $ECHO_N "checking for $compiler opt
d595 1
a595 1
@@@@ -14598,6 +14754,10 @@@@ echo $ECHO_N "checking for $compiler opt
d606 1
a606 1
@@@@ -14834,7 +14994,10 @@@@ echo $ECHO_N "checking whether the $comp
d618 1
a618 1
@@@@ -15003,6 +15166,17 @@@@ EOF
d636 1
a636 1
@@@@ -15068,6 +15242,11 @@@@ _LT_EOF
d648 1
a648 1
@@@@ -15515,6 +15694,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d670 1
a670 1
@@@@ -15740,6 +15934,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d684 1
a684 1
@@@@ -15905,6 +16106,7 @@@@ beos*)
d692 1
a692 1
@@@@ -16002,7 +16204,7 @@@@ freebsd1*)
d701 1
a701 1
@@@@ -16016,7 +16218,7 @@@@ freebsd* | dragonfly*)
d710 1
a710 1
@@@@ -16046,6 +16248,16 @@@@ freebsd* | dragonfly*)
d727 1
a727 1
@@@@ -16114,15 +16326,22 @@@@ interix[3-9]*)
d756 1
a756 1
@@@@ -16187,11 +16406,11 @@@@ linux* | k*bsd*-gnu)
d770 1
a770 1
@@@@ -16216,13 +16435,14 @@@@ nto-qnx*)
d786 1
a786 1
@@@@ -16230,7 +16450,7 @@@@ openbsd*)
d795 1
a795 1
@@@@ -16888,7 +17108,10 @@@@ for cc_temp in $compiler""; do
d807 1
a807 1
@@@@ -16993,9 +17216,11 @@@@ echo $ECHO_N "checking for $compiler opt
d820 1
a820 1
@@@@ -17029,6 +17254,11 @@@@ echo $ECHO_N "checking for $compiler opt
d832 1
a832 1
@@@@ -17183,6 +17413,10 @@@@ echo $ECHO_N "checking for $compiler opt
d843 1
a843 1
@@@@ -17419,7 +17653,10 @@@@ echo $ECHO_N "checking whether the $comp
d855 1
a855 1
@@@@ -17588,6 +17825,17 @@@@ EOF
d873 1
a873 1
@@@@ -17653,6 +17901,11 @@@@ _LT_EOF
d885 1
a885 1
@@@@ -18120,6 +18373,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d907 1
a907 1
@@@@ -18345,6 +18613,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d921 1
a921 1
@@@@ -18510,6 +18785,7 @@@@ beos*)
d929 1
a929 1
@@@@ -18607,7 +18883,7 @@@@ freebsd1*)
d938 1
a938 1
@@@@ -18621,7 +18897,7 @@@@ freebsd* | dragonfly*)
d947 1
a947 1
@@@@ -18651,6 +18927,16 @@@@ freebsd* | dragonfly*)
d964 1
a964 1
@@@@ -18719,15 +19005,22 @@@@ interix[3-9]*)
d993 1
a993 1
@@@@ -18792,11 +19085,11 @@@@ linux* | k*bsd*-gnu)
d1007 1
a1007 1
@@@@ -18821,13 +19114,14 @@@@ nto-qnx*)
d1023 1
a1023 1
@@@@ -18835,7 +19129,7 @@@@ openbsd*)
d1032 1
a1032 1
@@@@ -19492,7 +19786,10 @@@@ for cc_temp in $compiler""; do
d1044 9
@


1.59
log
@Update to libtool 1.5.24:
- fix regression on DragonFly [patched before]
- don't remove paths to uninstalled libs [patched before]
- initial support for Sun compilers on Linux
- better suport for GNU/kNetBSD and GNU/kFreeBSD
- fixes for GCC multilib on x86_64 and similiar system.
- documentation for --tag.
- getconf ARG_MAX is used to find maximum argument length.
@
text
@d3 1
a3 1
--- configure.orig	2007-09-14 11:49:46.000000000 +0200
d62 9
a70 8
@@@@ -7668,10 +7665,6 @@@@ _lt_linker_boilerplate=`cat conftest.err
 $rm conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
a71 1
 lt_prog_compiler_no_builtin_flag=
d73 2
a74 1
@@@@ -7765,9 +7758,11 @@@@ echo $ECHO_N "checking for $compiler opt
d87 1
a87 1
@@@@ -7801,6 +7796,11 @@@@ echo $ECHO_N "checking for $compiler opt
d99 1
a99 1
@@@@ -7955,6 +7955,10 @@@@ echo $ECHO_N "checking for $compiler opt
d110 13
a122 1
@@@@ -8360,6 +8364,17 @@@@ EOF
d140 1
a140 1
@@@@ -8425,6 +8440,11 @@@@ _LT_EOF
d152 1
a152 1
@@@@ -8892,6 +8912,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d174 1
a174 1
@@@@ -9117,6 +9152,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d188 1
a188 1
@@@@ -9333,6 +9375,7 @@@@ beos*)
d196 1
a196 1
@@@@ -9431,7 +9474,7 @@@@ freebsd1*)
d205 1
a205 1
@@@@ -9445,7 +9488,7 @@@@ freebsd* | dragonfly*)
d214 1
a214 1
@@@@ -9475,6 +9518,16 @@@@ freebsd* | dragonfly*)
d231 1
a231 1
@@@@ -9543,15 +9596,22 @@@@ interix[3-9]*)
d260 1
a260 1
@@@@ -9616,11 +9676,11 @@@@ linux* | k*bsd*-gnu)
d274 1
a274 1
@@@@ -9645,13 +9705,14 @@@@ nto-qnx*)
d290 1
a290 1
@@@@ -9659,7 +9720,7 @@@@ openbsd*)
d299 1
a299 1
@@@@ -11229,9 +11290,7 @@@@ echo "$as_me: error: tag name \"$tagname
d310 13
a322 1
@@@@ -11999,6 +12058,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d339 1
a339 1
@@@@ -12152,14 +12221,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d371 1
a371 1
@@@@ -12472,6 +12556,11 @@@@ if test -z "$aix_libpath"; then aix_libp
d383 1
a383 12
@@@@ -12484,10 +12573,6 @@@@ test "$ld_shlibs_CXX" = no && can_build_
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 
 cat > conftest.$ac_ext <<EOF
 class Foo
@@@@ -12582,6 +12667,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d405 1
a405 1
@@@@ -12687,9 +12787,11 @@@@ echo $ECHO_N "checking for $compiler opt
d418 1
a418 1
@@@@ -12715,6 +12817,10 @@@@ echo $ECHO_N "checking for $compiler opt
d429 1
a429 1
@@@@ -12793,6 +12899,8 @@@@ echo $ECHO_N "checking for $compiler opt
d438 1
a438 1
@@@@ -12932,6 +13040,8 @@@@ echo $ECHO_N "checking for $compiler opt
d447 1
a447 1
@@@@ -13304,6 +13414,7 @@@@ beos*)
d455 1
a455 1
@@@@ -13401,7 +13512,7 @@@@ freebsd1*)
d464 1
a464 1
@@@@ -13415,7 +13526,7 @@@@ freebsd* | dragonfly*)
d473 1
a473 1
@@@@ -13445,6 +13556,16 @@@@ freebsd* | dragonfly*)
d490 1
a490 1
@@@@ -13513,15 +13634,22 @@@@ interix[3-9]*)
d519 1
a519 1
@@@@ -13586,11 +13714,11 @@@@ linux* | k*bsd*-gnu)
d533 1
a533 1
@@@@ -13615,13 +13743,14 @@@@ nto-qnx*)
d549 1
a549 1
@@@@ -13629,7 +13758,7 @@@@ openbsd*)
d558 13
a570 1
@@@@ -14408,9 +14537,11 @@@@ echo $ECHO_N "checking for $compiler opt
d583 1
a583 1
@@@@ -14444,6 +14575,11 @@@@ echo $ECHO_N "checking for $compiler opt
d595 1
a595 1
@@@@ -14598,6 +14734,10 @@@@ echo $ECHO_N "checking for $compiler opt
d606 13
a618 1
@@@@ -15003,6 +15143,17 @@@@ EOF
d636 1
a636 1
@@@@ -15068,6 +15219,11 @@@@ _LT_EOF
d648 1
a648 1
@@@@ -15515,6 +15671,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d670 1
a670 1
@@@@ -15740,6 +15911,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d684 1
a684 1
@@@@ -15905,6 +16083,7 @@@@ beos*)
d692 1
a692 1
@@@@ -16002,7 +16181,7 @@@@ freebsd1*)
d701 1
a701 1
@@@@ -16016,7 +16195,7 @@@@ freebsd* | dragonfly*)
d710 1
a710 1
@@@@ -16046,6 +16225,16 @@@@ freebsd* | dragonfly*)
d727 1
a727 1
@@@@ -16114,15 +16303,22 @@@@ interix[3-9]*)
d756 1
a756 1
@@@@ -16187,11 +16383,11 @@@@ linux* | k*bsd*-gnu)
d770 1
a770 1
@@@@ -16216,13 +16412,14 @@@@ nto-qnx*)
d786 1
a786 1
@@@@ -16230,7 +16427,7 @@@@ openbsd*)
d795 9
a803 8
@@@@ -16896,10 +17093,6 @@@@ archive_cmds_need_lc_GCJ=no
 
 old_archive_cmds_GCJ=$old_archive_cmds
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
a804 1
 lt_prog_compiler_no_builtin_flag_GCJ=
d806 2
a807 1
@@@@ -16993,9 +17186,11 @@@@ echo $ECHO_N "checking for $compiler opt
d820 1
a820 1
@@@@ -17029,6 +17224,11 @@@@ echo $ECHO_N "checking for $compiler opt
d832 1
a832 1
@@@@ -17183,6 +17383,10 @@@@ echo $ECHO_N "checking for $compiler opt
d843 13
a855 1
@@@@ -17588,6 +17792,17 @@@@ EOF
d873 1
a873 1
@@@@ -17653,6 +17868,11 @@@@ _LT_EOF
d885 1
a885 1
@@@@ -18120,6 +18340,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d907 1
a907 1
@@@@ -18345,6 +18580,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d921 1
a921 1
@@@@ -18510,6 +18752,7 @@@@ beos*)
d929 1
a929 1
@@@@ -18607,7 +18850,7 @@@@ freebsd1*)
d938 1
a938 1
@@@@ -18621,7 +18864,7 @@@@ freebsd* | dragonfly*)
d947 1
a947 1
@@@@ -18651,6 +18894,16 @@@@ freebsd* | dragonfly*)
d964 1
a964 1
@@@@ -18719,15 +18972,22 @@@@ interix[3-9]*)
d993 1
a993 1
@@@@ -18792,11 +19052,11 @@@@ linux* | k*bsd*-gnu)
d1007 1
a1007 1
@@@@ -18821,13 +19081,14 @@@@ nto-qnx*)
d1023 1
a1023 1
@@@@ -18835,7 +19096,7 @@@@ openbsd*)
d1032 12
@


1.58
log
@In the libtool configure script, the basename of the compiler is used
to make decisions about which compiler is being used (gcc, SunPro, etc).
To make this function "correctly" in the presence of the compiler wrapper
scripts, we need to extract the actual compiler command from the wrapper
frame work.  So adapt the section in the configure script which already
attempts to deal with some other compiler wrappers to deal with the pkgsrc
wrappers.

This should address PR pkg/33467 and PR pkg/34581.

Bump PKGREVISION.
@
text
@d3 4
a6 9
--- configure.orig	2005-12-18 22:13:49.000000000 +0000
+++ configure	2006-12-12 21:54:12.000000000 +0000
@@@@ -77,5 +77,4 @@@@
 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; }; }
@@@@ -590,9 +589,9 @@@@
d18 22
a39 63
@@@@ -1919,6 +1918,5 @@@@
 ## Automake Initialisation. ##
 ## ------------------------ ##
-am__api_version='1.9a'
-
+am__api_version="1.9"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@@@ -2097,28 +2095,24 @@@@
 
 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
@@@@ -2261,5 +2255,5 @@@@
 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
@@@@ -2361,5 +2355,5 @@@@
 
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
a40 2
 # We need awk for the "check" target.  The system "awk" is bad on
@@@@ -6600,10 +6594,5 @@@@
d52 3
a54 1
@@@@ -6839,6 +6828,4 @@@@
a60 9
@@@@ -7566,5 +7553,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d62 8
d71 4
a74 1
@@@@ -7867,7 +7858,9 @@@@
d85 72
a156 4
@@@@ -8273,5 +8266,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d158 6
a163 4
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d165 12
a176 9
   case $host_os in
@@@@ -8829,5 +8826,5 @@@@
          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 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}'
           ;;
@@@@ -9359,4 +9356,5 @@@@
d182 14
a195 6
@@@@ -9484,13 +9482,14 @@@@
     esac
   fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
d197 1
a197 5
+  version_type=linux
+  case $objformat in
+    elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
d201 34
a234 14
-    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
       ;;
@@@@ -9510,5 +9509,5 @@@@
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
@@@@ -9588,10 +9587,5 @@@@
d246 3
a248 1
@@@@ -9670,9 +9664,9 @@@@
d260 10
a269 1
@@@@ -9705,5 +9699,5 @@@@
d276 3
a278 1
@@@@ -9713,5 +9707,5 @@@@
d282 1
a282 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d285 3
a287 1
@@@@ -11305,7 +11299,5 @@@@
d293 1
a293 1
+        if test -n "$CXX" && test "X$CXX" != "Xno"; then
d296 20
a315 19
@@@@ -11412,5 +11404,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
@@@@ -11904,5 +11900,5 @@@@
           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 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}'
           ;;
@@@@ -12201,12 +12197,27 @@@@
d345 27
a371 2
@@@@ -12644,4 +12655,10 @@@@
   ;;
d373 14
a386 5
+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
+  ;;
d388 5
a392 3
 solaris*)
   case $cc_basename in
@@@@ -12696,7 +12713,9 @@@@
d403 32
a434 1
@@@@ -13318,4 +13337,5 @@@@
d440 14
a453 6
@@@@ -13443,13 +13463,14 @@@@
     esac
   fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
d455 1
a455 5
+  version_type=linux
+  case $objformat in
+    elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
d459 34
a492 14
-    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
       ;;
@@@@ -13469,5 +13490,5 @@@@
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
@@@@ -13547,10 +13568,5 @@@@
d504 3
a506 1
@@@@ -13629,9 +13645,9 @@@@
d518 10
a527 1
@@@@ -13664,5 +13680,5 @@@@
d534 3
a536 1
@@@@ -13672,5 +13688,5 @@@@
d540 1
a540 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d543 3
a545 12
@@@@ -14358,5 +14374,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
@@@@ -14437,7 +14457,9 @@@@
d556 72
a627 4
@@@@ -14843,5 +14865,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d629 6
a634 4
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d636 12
a647 9
   case $host_os in
@@@@ -15379,5 +15405,5 @@@@
          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 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}'
           ;;
@@@@ -15909,4 +15935,5 @@@@
d653 14
a666 6
@@@@ -16034,13 +16061,14 @@@@
     esac
   fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
d668 1
a668 5
+  version_type=linux
+  case $objformat in
+    elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
d672 34
a705 14
-    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
       ;;
@@@@ -16060,5 +16088,5 @@@@
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
@@@@ -16138,10 +16166,5 @@@@
d717 3
a719 1
@@@@ -16220,9 +16243,9 @@@@
d731 10
a740 1
@@@@ -16255,5 +16278,5 @@@@
d747 3
a749 1
@@@@ -16263,5 +16286,5 @@@@
d753 1
a753 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d756 9
a764 9
@@@@ -16916,5 +16939,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d766 1
d768 2
a769 1
@@@@ -17019,7 +17046,9 @@@@
d780 72
a851 4
@@@@ -17425,5 +17454,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d853 6
a858 4
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
d860 12
a871 9
   case $host_os in
@@@@ -17981,5 +18014,5 @@@@
          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 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}'
           ;;
@@@@ -18511,4 +18544,5 @@@@
d877 14
a890 6
@@@@ -18636,13 +18670,14 @@@@
     esac
   fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
d892 1
a892 5
+  version_type=linux
+  case $objformat in
+    elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+      soname_spec='${libname}${release}${shared_ext}$major'
d896 34
a929 14
-    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
       ;;
@@@@ -18662,5 +18697,5 @@@@
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
@@@@ -18740,10 +18775,5 @@@@
d941 3
a943 1
@@@@ -18822,9 +18852,9 @@@@
d955 10
a964 1
@@@@ -18857,5 +18887,5 @@@@
d971 3
a973 1
@@@@ -18865,5 +18895,5 @@@@
d977 1
a977 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
d980 1
a980 17
@@@@ -19517,5 +19547,9 @@@@
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 lt_cv_prog_compiler_c_o_RC=yes
@@@@ -20251,5 +20285,4 @@@@
 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; }; }
@


1.57
log
@Fix regression on DragonFly where two config variables were no longer being
set (thinko by person implementing the change between 1.5.18 and 1.5.22).
Bump PKGREVISION.
@
text
@d3 3
a5 4
--- configure.orig	2006-02-06 13:54:53.000000000 -0500
+++ configure
@@@@ -76,7 +76,6 @@@@ if test "x$as_myself" = x; then
   as_myself=$0
d11 1
a11 3
 fi
@@@@ -589,11 +588,11 @@@@ else
 
d23 1
a23 3
       # If we have ksh, try running configure again with it.
@@@@ -1918,8 +1917,7 @@@@ esac
 ## ------------------------ ##
d31 1
a31 3
   if test -f $ac_dir/install-sh; then
@@@@ -2096,30 +2094,26 @@@@ echo "$as_me: WARNING: \`missing' script
 fi
d74 1
a74 3
     test -d $d && rmdir $d
@@@@ -2260,7 +2254,7 @@@@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
 
d81 1
a81 3
 # run `make install-strip'.  However `strip' might not be the right
@@@@ -2360,7 +2354,7 @@@@ else
 fi
d88 1
a88 3
 # some platforms.
@@@@ -6599,12 +6593,7 @@@@ fi
 
d100 1
a100 3
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@@@ -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'
d107 10
d118 1
a118 2
@@@@ -7866,9 +7853,11 @@@@ echo $ECHO_N "checking for $compiler opt
       ;;
d129 12
a140 3
     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'
d147 1
a147 3
        *)
@@@@ -9358,6 +9347,7 @@@@ beos*)
 bsdi[45]*)
d153 1
a153 3
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
@@@@ -9483,15 +9473,16 @@@@ freebsd* | dragonfly*)
     *) objformat=elf ;;
d174 1
a174 3
   esac
@@@@ -9509,7 +9500,7 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
d181 1
a181 3
     ;;
@@@@ -9587,12 +9578,7 @@@@ interix3*)
 irix5* | irix6* | nonstopux*)
d193 1
a193 3
   need_version=no
@@@@ -9669,11 +9655,11 @@@@ knetbsd*-gnu)
   ;;
d205 1
a205 3
   else
@@@@ -9704,7 +9690,7 @@@@ nto-qnx*)
   ;;
d212 1
a212 3
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@@@ -9712,7 +9698,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
d219 1
a219 3
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -11304,9 +11290,7 @@@@ echo "$as_me: error: tag name \"$tagname
 
d228 12
a239 3
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@@@ -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'
d246 1
a246 3
        *)
@@@@ -12200,14 +12184,29 @@@@ if test -z "$aix_libpath"; then aix_libp
     ;;
d276 1
a276 3
     # C++ shared libraries are fairly broken
@@@@ -12643,6 +12642,12 @@@@ interix3*)
   postdeps_CXX=
d287 1
a287 3
   CC*)
@@@@ -12695,9 +12700,11 @@@@ echo $ECHO_N "checking for $compiler opt
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
d298 1
a298 3
       # DJGPP does not support shared libraries at all
@@@@ -13317,6 +13324,7 @@@@ beos*)
 bsdi[45]*)
d304 1
a304 3
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
@@@@ -13442,15 +13450,16 @@@@ freebsd* | dragonfly*)
     *) objformat=elf ;;
d325 1
a325 3
   esac
@@@@ -13468,7 +13477,7 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
d332 1
a332 3
     ;;
@@@@ -13546,12 +13555,7 @@@@ interix3*)
 irix5* | irix6* | nonstopux*)
d344 1
a344 3
   need_version=no
@@@@ -13628,11 +13632,11 @@@@ knetbsd*-gnu)
   ;;
d356 1
a356 3
   else
@@@@ -13663,7 +13667,7 @@@@ nto-qnx*)
   ;;
d363 1
a363 3
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@@@ -13671,7 +13675,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
d370 12
a381 3
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -14436,9 +14440,11 @@@@ echo $ECHO_N "checking for $compiler opt
       ;;
d392 12
a403 3
     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'
d410 1
a410 3
        *)
@@@@ -15908,6 +15914,7 @@@@ beos*)
 bsdi[45]*)
d416 1
a416 3
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
@@@@ -16033,15 +16040,16 @@@@ freebsd* | dragonfly*)
     *) objformat=elf ;;
d437 1
a437 3
   esac
@@@@ -16059,7 +16067,7 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
d444 1
a444 3
     ;;
@@@@ -16137,12 +16145,7 @@@@ interix3*)
 irix5* | irix6* | nonstopux*)
d456 1
a456 3
   need_version=no
@@@@ -16219,11 +16222,11 @@@@ knetbsd*-gnu)
   ;;
d468 1
a468 3
   else
@@@@ -16254,7 +16257,7 @@@@ nto-qnx*)
   ;;
d475 1
a475 3
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@@@ -16262,7 +16265,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
d482 12
a493 3
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -17018,9 +17021,11 @@@@ echo $ECHO_N "checking for $compiler opt
       ;;
d504 12
a515 3
     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'
d522 1
a522 3
        *)
@@@@ -18510,6 +18515,7 @@@@ beos*)
 bsdi[45]*)
d528 1
a528 3
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
@@@@ -18635,15 +18641,16 @@@@ freebsd* | dragonfly*)
     *) objformat=elf ;;
d549 1
a549 3
   esac
@@@@ -18661,7 +18668,7 @@@@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
d556 1
a556 3
     ;;
@@@@ -18739,12 +18746,7 @@@@ interix3*)
 irix5* | irix6* | nonstopux*)
d568 1
a568 3
   need_version=no
@@@@ -18821,11 +18823,11 @@@@ knetbsd*-gnu)
   ;;
d580 1
a580 3
   else
@@@@ -18856,7 +18858,7 @@@@ nto-qnx*)
   ;;
d587 1
a587 3
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
@@@@ -18864,7 +18866,7 @@@@ openbsd*)
     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
d594 12
a605 3
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@@@ -20250,7 +20252,6 @@@@ if test "x$as_myself" = x; then
   as_myself=$0
a610 1
 fi
@


1.56
log
@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.
@
text
@d3 1
a3 1
--- configure.orig	2006-01-30 17:05:54.000000000 -0500
d176 9
d340 9
d448 9
d556 9
@


1.55
log
@libtool-base-1.5.18nb6:

Fix major problem brought to the surface by buildlink3 on Interix.  For C++
or F77 libraries only, the soname did not always make it into the final
binary, resulting in runtime link failures in some cases and runtime linking
with a missing major version in others.

This is unfortunately a flag day for Interix + pkgsrc.  Identifying all the
PKGREVISIONs normally requiring a bump is a little too unwieldy.  However,
existing binaries not experiencing the runtime link failure will continue
to run, but will be linking against the unversioned ".so" at runtime until
the binaries have been rebuilt.

While here, fix a couple wrong assumptions in the libtool config for
Interix.  shlibvar_overrides_runpath should have been "no", and
hardcode_direct should have been "yes".
@
text
@d3 1
a3 1
--- configure.orig	2005-11-09 12:32:46.000000000 -0500
d5 9
a13 1
@@@@ -322,11 +322,11 @@@@ else
d27 65
a91 7
@@@@ -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
d94 3
a96 123
@@@@ -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
   ;;
d98 3
a100 48
+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
d109 2
a110 2
-  ac_ext=cc
+ac_ext=cc
d114 1
a114 1
@@@@ -5909,8 +5924,6 @@@@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
d123 1
a123 1
@@@@ -6936,9 +6949,11 @@@@ echo $ECHO_N "checking for $compiler opt
d135 2
a136 56
     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
d139 1
a139 1
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
d145 1
a145 23
@@@@ -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*)
d153 4
a156 4
@@@@ -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`
d176 1
a176 16
@@@@ -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
+  ;;
+
d190 1
a190 1
@@@@ -8602,11 +8663,11 @@@@ knetbsd*-gnu)
d204 1
a204 1
@@@@ -8637,14 +8698,14 @@@@ nto-qnx*)
d210 1
d213 1
a213 1
   case $host_os in
d222 1
a222 71
@@@@ -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
d230 1
a230 1
 	  ac_ext=cc
d233 1
a233 21
@@@@ -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
d236 1
a236 1
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
d242 1
a242 22
@@@@ -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
d274 3
a276 3
@@@@ -11463,6 +11560,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
     esac
   done
d278 5
a282 14
+  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
d284 4
a287 4
   # Clean up.
   rm -f a.out a.exe
 else
@@@@ -11510,9 +11622,11 @@@@ echo $ECHO_N "checking for $compiler opt
d300 1
a300 21
@@@@ -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*)
d308 4
a311 4
@@@@ -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`
d331 1
a331 16
@@@@ -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
+  ;;
+
d345 1
a345 1
@@@@ -12374,11 +12503,11 @@@@ knetbsd*-gnu)
d359 1
a359 1
@@@@ -12409,14 +12538,14 @@@@ nto-qnx*)
d365 1
d368 1
a368 1
   case $host_os in
d377 1
a377 71
@@@@ -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
d389 2
a390 56
     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
d393 1
a393 1
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
d399 1
a399 23
@@@@ -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*)
d407 4
a410 4
@@@@ -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`
d430 1
a430 16
@@@@ -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
+  ;;
+
d444 1
a444 1
@@@@ -15630,11 +15814,11 @@@@ knetbsd*-gnu)
d458 1
a458 1
@@@@ -15665,14 +15849,14 @@@@ nto-qnx*)
d464 1
d467 1
a467 1
   case $host_os in
d476 1
a476 1
@@@@ -16432,9 +16616,11 @@@@ echo $ECHO_N "checking for $compiler opt
d488 2
a489 56
     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
d492 1
a492 1
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
d498 1
a498 23
@@@@ -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*)
d506 4
a509 4
@@@@ -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`
d529 1
a529 16
@@@@ -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
+  ;;
+
d543 1
a543 1
@@@@ -18098,11 +18330,11 @@@@ knetbsd*-gnu)
d557 1
a557 1
@@@@ -18133,14 +18365,14 @@@@ nto-qnx*)
d563 1
d566 1
a566 1
   case $host_os in
d575 6
a580 96
@@@@ -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
a581 5
     fi
 
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
a582 1
 
@


1.54
log
@Another Interix fix; $soname -> $soname.exp in two places where it was not
fixed before.
@
text
@d3 1
a3 1
--- configure.orig	2005-07-03 15:36:30.000000000 -0400
d247 1
a247 1
@@@@ -7435,6 +7455,17 @@@@ EOF
d260 4
d269 1
a269 1
@@@@ -7622,7 +7653,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d279 1
a279 1
@@@@ -7682,7 +7714,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d289 1
a289 1
@@@@ -7798,7 +7831,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d298 1
a298 1
@@@@ -7913,6 +7946,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d309 1
a309 1
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d320 1
a320 1
@@@@ -8316,6 +8364,7 @@@@ beos*)
d328 1
a328 1
@@@@ -8433,15 +8482,16 @@@@ freebsd* | dragonfly*)
d351 1
a351 1
@@@@ -8517,15 +8567,22 @@@@ hpux9* | hpux10* | hpux11*)
d363 1
a363 1
+  shlibpath_overrides_runpath=yes
d380 1
a380 1
@@@@ -8602,11 +8659,11 @@@@ knetbsd*-gnu)
d394 1
a394 1
@@@@ -8637,14 +8694,14 @@@@ nto-qnx*)
d411 1
a411 1
@@@@ -8892,7 +8949,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d421 1
a421 1
@@@@ -8995,7 +9053,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d431 1
a431 1
@@@@ -9060,7 +9119,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d441 1
a441 1
@@@@ -9153,7 +9213,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d451 1
a451 1
@@@@ -9218,7 +9279,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d461 1
a461 1
@@@@ -9284,7 +9346,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d471 1
a471 1
@@@@ -9350,7 +9413,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d481 1
a481 1
@@@@ -10203,9 +10267,7 @@@@ echo "$as_me: error: tag name \"$tagname
d492 1
a492 1
@@@@ -10592,7 +10654,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d502 1
a502 1
@@@@ -10653,7 +10716,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d512 1
a512 1
@@@@ -10781,7 +10845,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d521 1
a521 1
@@@@ -10939,6 +11003,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d532 1
a532 1
+    archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d534 4
d542 1
a542 1
@@@@ -11069,14 +11143,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d574 1
a574 1
@@@@ -11463,6 +11552,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d596 1
a596 1
@@@@ -11510,9 +11614,11 @@@@ echo $ECHO_N "checking for $compiler opt
d609 1
a609 1
@@@@ -11534,6 +11640,10 @@@@ echo $ECHO_N "checking for $compiler opt
d620 1
a620 1
@@@@ -11608,6 +11718,8 @@@@ echo $ECHO_N "checking for $compiler opt
d629 1
a629 1
@@@@ -12088,6 +12200,7 @@@@ beos*)
d637 1
a637 1
@@@@ -12205,15 +12318,16 @@@@ freebsd* | dragonfly*)
d660 1
a660 1
@@@@ -12289,15 +12403,22 @@@@ hpux9* | hpux10* | hpux11*)
d672 1
a672 1
+  shlibpath_overrides_runpath=yes
d689 1
a689 1
@@@@ -12374,11 +12495,11 @@@@ knetbsd*-gnu)
d703 1
a703 1
@@@@ -12409,14 +12530,14 @@@@ nto-qnx*)
d720 1
a720 1
@@@@ -12664,7 +12785,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d730 1
a730 1
@@@@ -12767,7 +12889,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d740 1
a740 1
@@@@ -12832,7 +12955,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d750 1
a750 1
@@@@ -12925,7 +13049,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d760 1
a760 1
@@@@ -12990,7 +13115,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d770 1
a770 1
@@@@ -13056,7 +13182,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d780 1
a780 1
@@@@ -13122,7 +13249,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d790 1
a790 1
@@@@ -13984,9 +14112,11 @@@@ echo $ECHO_N "checking for $compiler opt
d803 1
a803 1
@@@@ -14015,6 +14145,11 @@@@ echo $ECHO_N "checking for $compiler opt
d815 1
a815 1
@@@@ -14483,6 +14618,17 @@@@ EOF
d828 4
d837 1
a837 1
@@@@ -14660,7 +14806,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d847 1
a847 1
@@@@ -14710,7 +14857,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d857 1
a857 1
@@@@ -14826,7 +14974,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d866 1
a866 1
@@@@ -14941,6 +15089,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d877 1
a877 1
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d888 1
a888 1
@@@@ -15344,6 +15507,7 @@@@ beos*)
d896 1
a896 1
@@@@ -15461,15 +15625,16 @@@@ freebsd* | dragonfly*)
d919 1
a919 1
@@@@ -15545,15 +15710,22 @@@@ hpux9* | hpux10* | hpux11*)
d931 1
a931 1
+  shlibpath_overrides_runpath=yes
d948 1
a948 1
@@@@ -15630,11 +15802,11 @@@@ knetbsd*-gnu)
d962 1
a962 1
@@@@ -15665,14 +15837,14 @@@@ nto-qnx*)
d979 1
a979 1
@@@@ -16432,9 +16604,11 @@@@ echo $ECHO_N "checking for $compiler opt
d992 1
a992 1
@@@@ -16463,6 +16637,11 @@@@ echo $ECHO_N "checking for $compiler opt
d1004 1
a1004 1
@@@@ -16931,6 +17110,17 @@@@ EOF
d1017 4
d1026 1
a1026 1
@@@@ -17118,7 +17308,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1036 1
a1036 1
@@@@ -17178,7 +17369,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1046 1
a1046 1
@@@@ -17294,7 +17486,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d1055 1
a1055 1
@@@@ -17409,6 +17601,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d1066 1
a1066 1
+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d1077 1
a1077 1
@@@@ -17812,6 +18019,7 @@@@ beos*)
d1085 1
a1085 1
@@@@ -17929,15 +18137,16 @@@@ freebsd* | dragonfly*)
d1108 1
a1108 1
@@@@ -18013,15 +18222,22 @@@@ hpux9* | hpux10* | hpux11*)
d1120 1
a1120 1
+  shlibpath_overrides_runpath=yes
d1137 1
a1137 1
@@@@ -18098,11 +18314,11 @@@@ knetbsd*-gnu)
d1151 1
a1151 1
@@@@ -18133,14 +18349,14 @@@@ nto-qnx*)
d1168 1
a1168 1
@@@@ -18388,7 +18604,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1178 1
a1178 1
@@@@ -18491,7 +18708,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1188 1
a1188 1
@@@@ -18556,7 +18774,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1198 1
a1198 1
@@@@ -18649,7 +18868,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1208 1
a1208 1
@@@@ -18714,7 +18934,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1218 1
a1218 1
@@@@ -18780,7 +19001,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1228 1
a1228 1
@@@@ -18846,7 +19068,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1238 1
a1238 1
@@@@ -21039,6 +21262,11 @@@@ esac
d1250 1
a1250 1
@@@@ -21077,12 +21305,6 @@@@ echo "$as_me: error: cannot find input f
d1263 1
a1263 1
@@@@ -21517,7 +21739,7 @@@@ echo "$as_me: error: $ac_sub_configure f
@


1.53
log
@libtool-base 1.5.18nb4: Fix a really nasty bug on Interix;
hardcode_libdir_flag_spec used -h rather than the correct -rpath.

Fix provided in private mail by Thorsten Glaser.
@
text
@d3 1
a3 1
--- configure.orig	2005-07-03 14:55:24.000000000 -0400
d306 1
a306 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d529 1
a529 1
+    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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d866 1
a866 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d1051 1
a1051 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
@


1.52
log
@libtool-base 1.5.18nb1: Update the patches per manual.README.

While here, since those instructions are still not being heeded, make the
warning comment extremely loud and obnoxious, and put it in both
libtool/Makefile.common and libtool-base/Makefile.
@
text
@d3 1
a3 1
--- configure.orig	2005-05-18 09:53:15.000000000 -0400
d309 1
a309 1
+      hardcode_libdir_flag_spec='${wl}-h,$libdir'
d869 1
a869 1
+      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
d1054 1
a1054 1
+      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
@


1.51
log
@Changes 1.5.18:
* Fix regression in 1.5.16 to not install libtldl data files from
  `libtoolize --ltdl'ed software packages.
* Bug Fixes.

Changes 1.5.16:
* Allow shell special characters like `$' in source file names, but not
  in object names, to enhance GCJ support.
* Detection of compiler wrappers like distcc/ccache and $host_alias prefix.
* More robust tests for PIC flag, `-c -o', in presence of warnings.
* Bug Fixes, among others for convenience archives regression on Solaris
  and timestamp-preserving `libtoolize --copy --ltdl'.
@
text
@d3 1
a3 1
--- configure.orig	Mon May 16 11:33:42 2005
d19 130
a148 1
@@@@ -4522,6 +4522,10 @@@@ hpux10.20* | hpux11*)
d159 41
a199 1
@@@@ -5674,12 +5678,7 @@@@ fi
d213 1
a213 1
@@@@ -5909,8 +5908,6 @@@@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
d222 1
a222 1
@@@@ -6936,9 +6933,11 @@@@ echo $ECHO_N "checking for $compiler opt
d235 1
a235 1
@@@@ -6967,6 +6966,11 @@@@ echo $ECHO_N "checking for $compiler opt
d247 1
a247 1
@@@@ -7435,6 +7439,17 @@@@ EOF
d265 21
a285 1
@@@@ -7798,7 +7813,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d294 1
a294 1
@@@@ -7913,6 +7928,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d316 1
a316 1
@@@@ -8316,6 +8346,7 @@@@ beos*)
d324 1
a324 1
@@@@ -8433,15 +8464,16 @@@@ freebsd* | dragonfly*)
d347 1
a347 1
@@@@ -8517,15 +8549,22 @@@@ hpux9* | hpux10* | hpux11*)
d376 1
a376 1
@@@@ -8602,11 +8641,11 @@@@ knetbsd*-gnu)
d390 1
a390 1
@@@@ -8637,14 +8676,14 @@@@ nto-qnx*)
d407 71
a477 1
@@@@ -10203,9 +10242,7 @@@@ echo "$as_me: error: tag name \"$tagname
d488 21
a508 1
@@@@ -10781,7 +10818,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d517 1
a517 1
@@@@ -10939,6 +10976,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d534 1
a534 1
@@@@ -11069,14 +11116,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d566 1
a566 1
@@@@ -11463,6 +11525,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d588 1
a588 1
@@@@ -11510,9 +11587,11 @@@@ echo $ECHO_N "checking for $compiler opt
d601 1
a601 1
@@@@ -11534,6 +11613,10 @@@@ echo $ECHO_N "checking for $compiler opt
d612 1
a612 1
@@@@ -11608,6 +11691,8 @@@@ echo $ECHO_N "checking for $compiler opt
d621 1
a621 1
@@@@ -12088,6 +12173,7 @@@@ beos*)
d629 1
a629 1
@@@@ -12205,15 +12291,16 @@@@ freebsd* | dragonfly*)
d652 1
a652 1
@@@@ -12289,15 +12376,22 @@@@ hpux9* | hpux10* | hpux11*)
d681 1
a681 1
@@@@ -12374,11 +12468,11 @@@@ knetbsd*-gnu)
d695 1
a695 1
@@@@ -12409,14 +12503,14 @@@@ nto-qnx*)
d712 71
a782 1
@@@@ -13984,9 +14078,11 @@@@ echo $ECHO_N "checking for $compiler opt
d795 1
a795 1
@@@@ -14015,6 +14111,11 @@@@ echo $ECHO_N "checking for $compiler opt
d807 1
a807 1
@@@@ -14483,6 +14584,17 @@@@ EOF
d825 21
a845 1
@@@@ -14826,7 +14938,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d854 1
a854 1
@@@@ -14941,6 +15053,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d876 1
a876 1
@@@@ -15344,6 +15471,7 @@@@ beos*)
d884 1
a884 1
@@@@ -15461,15 +15589,16 @@@@ freebsd* | dragonfly*)
d907 1
a907 1
@@@@ -15545,15 +15674,22 @@@@ hpux9* | hpux10* | hpux11*)
d936 1
a936 1
@@@@ -15630,11 +15766,11 @@@@ knetbsd*-gnu)
d950 1
a950 1
@@@@ -15665,14 +15801,14 @@@@ nto-qnx*)
d967 1
a967 1
@@@@ -16432,9 +16568,11 @@@@ echo $ECHO_N "checking for $compiler opt
d980 1
a980 1
@@@@ -16463,6 +16601,11 @@@@ echo $ECHO_N "checking for $compiler opt
d992 1
a992 1
@@@@ -16931,6 +17074,17 @@@@ EOF
d1010 21
a1030 1
@@@@ -17294,7 +17448,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d1039 1
a1039 1
@@@@ -17409,6 +17563,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d1061 1
a1061 1
@@@@ -17812,6 +17981,7 @@@@ beos*)
d1069 1
a1069 1
@@@@ -17929,15 +18099,16 @@@@ freebsd* | dragonfly*)
d1092 1
a1092 1
@@@@ -18013,15 +18184,22 @@@@ hpux9* | hpux10* | hpux11*)
d1121 1
a1121 1
@@@@ -18098,11 +18276,11 @@@@ knetbsd*-gnu)
d1135 1
a1135 1
@@@@ -18133,14 +18311,14 @@@@ nto-qnx*)
d1152 104
@


1.50
log
@Update to 1.5.14, and switch DragonFly to version_type=linux.
Change summary since 1.5.10:

	* ltmain.in: Add -pthread like flags when linking executables too.

	* ltmain.in (func_extract_archives) [darwin]: This didn't actually
	work on a real fat archive, should do now.

	* tests/func_extract_archives.test: remove darwin fat tests which
	did not actually work.

	* ltmain.in (link mode): Allow five digits in version-info

	* ltmain.in (link mode): With piecewise (partial) linking, fix
	intermediate output name for subdir-objects.

	* ltmain.in [darwin]: Don't add installed libs to temp_rpath when
	building executables on darwin, or other systems which use
	hardcode_automatic. It may break our wrapper scripts.

	* ltmain.in [darwin]: Allow -framework foo through when given on
	the command line.

	* ltmain.in [irix]: Preserve processor option for SGI Compiler
	(-r[0-9][0-9]*).

	* ltmain.in: Don't pass through compiler-like thread flags when
	using $LD to do the linking. Use compiler_flags instead.
	Reported by Mark_Andrews@@isc.org.

	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: While "parsing"
	/etc/ld.so.conf, skip comments.

	* ltmain.in (func_extract_archives): Not all shells grok
	`read -r' (unnecessary in this case).
	Reported by Ralf Menzel <menzel@@ls6.cs.uni-dortmund.de>.

	* libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for
	whole_archive_flag_spec.  Missing backport reported by Ralf Menzel

	* libtool.m4 [linux] (AC_LIBTOOL_PROG_COMPILER_PIC): match
	$cc_basename, not $CC against icc.  Also, for symmetry match
	icpc* and ecpc* (ia64 version of icpc).

	* m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret
	`include' statements in toplevel ld.so.conf file.

	* config/ltmain.in (func_mode_link): When linking an installed
	libtool library on the command line using -lfoo we need to find
	the library in the search paths and add it's dependency_libs to
	the link in the conv pass so that any libtool libs listed are
	correctly expanded in the link pass.
@
text
@d3 1
a3 1
--- configure.orig	2005-02-28 12:31:33.000000000 -0500
d19 1
a19 1
@@@@ -4534,6 +4534,10 @@@@ hpux10.20* | hpux11*)
d30 1
a30 1
@@@@ -5690,12 +5694,7 @@@@ fi
d44 1
a44 1
@@@@ -5925,8 +5924,6 @@@@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS 
d53 1
a53 1
@@@@ -6921,9 +6918,11 @@@@ echo $ECHO_N "checking for $compiler opt
d66 1
a66 1
@@@@ -6952,6 +6951,11 @@@@ echo $ECHO_N "checking for $compiler opt
d78 1
a78 1
@@@@ -7349,6 +7353,17 @@@@ EOF
d96 1
a96 1
@@@@ -7754,7 +7769,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d105 1
a105 1
@@@@ -7869,6 +7884,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d127 1
a127 1
@@@@ -8260,6 +8290,7 @@@@ beos*)
d135 1
a135 1
@@@@ -8377,15 +8408,16 @@@@ freebsd* | dragonfly*)
d158 1
a158 1
@@@@ -8461,15 +8493,22 @@@@ hpux9* | hpux10* | hpux11*)
d187 1
a187 1
@@@@ -8546,11 +8585,11 @@@@ knetbsd*-gnu)
d201 1
a201 1
@@@@ -8581,10 +8620,10 @@@@ nto-qnx*)
d208 5
a212 1
   need_version=no
d218 1
a218 1
@@@@ -10150,9 +10189,7 @@@@ echo "$as_me: error: tag name \"$tagname
d229 1
a229 1
@@@@ -10707,7 +10744,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d238 1
a238 1
@@@@ -10865,6 +10902,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d254 2
a255 2
       CC)
@@@@ -10994,14 +11041,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d287 1
a287 1
@@@@ -11384,6 +11446,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d309 1
a309 1
@@@@ -11431,9 +11508,11 @@@@ echo $ECHO_N "checking for $compiler opt
d322 1
a322 1
@@@@ -11455,6 +11534,10 @@@@ echo $ECHO_N "checking for $compiler opt
d333 1
a333 1
@@@@ -11529,6 +11612,8 @@@@ echo $ECHO_N "checking for $compiler opt
d341 2
a342 2
 	  CC)
@@@@ -12005,6 +12090,7 @@@@ beos*)
d350 1
a350 1
@@@@ -12122,15 +12208,16 @@@@ freebsd* | dragonfly*)
d373 1
a373 1
@@@@ -12206,15 +12293,22 @@@@ hpux9* | hpux10* | hpux11*)
d402 1
a402 1
@@@@ -12291,11 +12385,11 @@@@ knetbsd*-gnu)
d416 1
a416 1
@@@@ -12326,10 +12420,10 @@@@ nto-qnx*)
d423 5
a427 1
   need_version=no
d433 1
a433 1
@@@@ -13879,9 +13973,11 @@@@ echo $ECHO_N "checking for $compiler opt
d446 1
a446 1
@@@@ -13910,6 +14006,11 @@@@ echo $ECHO_N "checking for $compiler opt
d458 1
a458 1
@@@@ -14307,6 +14408,17 @@@@ EOF
d476 1
a476 1
@@@@ -14692,7 +14804,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d485 1
a485 1
@@@@ -14807,6 +14919,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d507 1
a507 1
@@@@ -15198,6 +15325,7 @@@@ beos*)
d515 1
a515 1
@@@@ -15315,15 +15443,16 @@@@ freebsd* | dragonfly*)
d538 1
a538 1
@@@@ -15399,15 +15528,22 @@@@ hpux9* | hpux10* | hpux11*)
d567 1
a567 1
@@@@ -15484,11 +15620,11 @@@@ knetbsd*-gnu)
d581 1
a581 1
@@@@ -15519,10 +15655,10 @@@@ nto-qnx*)
d588 5
a592 1
   need_version=no
d598 1
a598 1
@@@@ -16254,9 +16390,11 @@@@ echo $ECHO_N "checking for $compiler opt
d611 1
a611 1
@@@@ -16285,6 +16423,11 @@@@ echo $ECHO_N "checking for $compiler opt
d623 1
a623 1
@@@@ -16682,6 +16825,17 @@@@ EOF
d641 1
a641 1
@@@@ -17087,7 +17241,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d650 1
a650 1
@@@@ -17202,6 +17356,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d672 1
a672 1
@@@@ -17593,6 +17762,7 @@@@ beos*)
d680 1
a680 1
@@@@ -17710,15 +17880,16 @@@@ freebsd* | dragonfly*)
d703 1
a703 1
@@@@ -17794,15 +17965,22 @@@@ hpux9* | hpux10* | hpux11*)
d732 1
a732 1
@@@@ -17879,11 +18057,11 @@@@ knetbsd*-gnu)
d746 1
a746 1
@@@@ -17914,10 +18092,10 @@@@ nto-qnx*)
d753 5
a757 1
   need_version=no
@


1.49
log
@Merge DragonFly changes back to the .m4 files as documented in
devel/libtool/patches/manual.README.  Changes:

* don't invent another $version_type when you're just duplicating one
  already in existence (freebsd-elf)

* mark chosen $version_type as a very poor choice; this should be fixed
  to use the libtool-team-supported "linux" type in the future, but will
  cause a binpkg flag day (for DragonFly only) when that happens

PKGREVISION *not* bumped as this is a non-event for all platforms.
@
text
@d3 1
a3 1
--- configure.orig	2004-09-19 08:22:04.000000000 -0400
a18 16
@@@@ -4496,13 +4496,13 @@@@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
d53 1
a53 10
@@@@ -5974,7 +5971,7 @@@@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* )
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@@@ -6909,9 +6906,11 @@@@ echo $ECHO_N "checking for $compiler opt
d66 1
a66 1
@@@@ -6940,6 +6939,11 @@@@ echo $ECHO_N "checking for $compiler opt
d78 1
a78 1
@@@@ -7325,6 +7329,17 @@@@ EOF
d96 1
a96 1
@@@@ -7717,7 +7732,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d105 1
a105 10
@@@@ -7757,7 +7772,7 @@@@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@@@ -7832,6 +7847,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d127 1
a127 1
@@@@ -8223,6 +8253,7 @@@@ beos*)
d135 3
a137 5
@@@@ -8337,16 +8368,17 @@@@ kfreebsd*-gnu)
   ;;
 
 freebsd*)
+  version_type=linux
d143 1
d158 1
a158 18
@@@@ -8366,6 +8398,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -8422,15 +8464,22 @@@@ hpux9* | hpux10* | hpux11*)
d187 1
a187 1
@@@@ -8507,11 +8556,11 @@@@ knetbsd*-gnu)
d201 1
a201 1
@@@@ -8542,10 +8591,10 @@@@ nto-qnx*)
d214 1
a214 1
@@@@ -10105,9 +10154,7 @@@@ echo "$as_me: error: tag name \"$tagname
d221 1
a221 1
+	if test -n "$CXX" && test "X$CXX" != "Xno"; then
d225 1
a225 1
@@@@ -10659,7 +10706,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d234 1
a234 10
@@@@ -10693,7 +10740,7 @@@@ if test -z "$aix_libpath"; then aix_libp
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@@@ -10817,6 +10864,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d251 1
a251 1
@@@@ -10934,14 +10991,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d283 1
a283 1
@@@@ -11324,6 +11396,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d305 1
a305 1
@@@@ -11371,9 +11458,11 @@@@ echo $ECHO_N "checking for $compiler opt
d318 1
a318 1
@@@@ -11395,6 +11484,10 @@@@ echo $ECHO_N "checking for $compiler opt
d329 1
a329 10
@@@@ -11441,7 +11534,7 @@@@ echo $ECHO_N "checking for $compiler opt
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@@@ -11469,6 +11562,8 @@@@ echo $ECHO_N "checking for $compiler opt
d338 1
a338 1
@@@@ -11939,6 +12034,7 @@@@ beos*)
d346 3
a348 5
@@@@ -12053,16 +12149,17 @@@@ kfreebsd*-gnu)
   ;;
 
 freebsd*)
+  version_type=linux
d354 1
d369 1
a369 18
@@@@ -12082,6 +12179,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -12138,15 +12245,22 @@@@ hpux9* | hpux10* | hpux11*)
d398 1
a398 1
@@@@ -12223,11 +12337,11 @@@@ knetbsd*-gnu)
d412 1
a412 1
@@@@ -12258,10 +12372,10 @@@@ nto-qnx*)
d425 1
a425 1
@@@@ -13805,9 +13919,11 @@@@ echo $ECHO_N "checking for $compiler opt
d438 1
a438 1
@@@@ -13836,6 +13952,11 @@@@ echo $ECHO_N "checking for $compiler opt
d450 1
a450 1
@@@@ -14221,6 +14342,17 @@@@ EOF
d468 1
a468 1
@@@@ -14593,7 +14725,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d477 1
a477 10
@@@@ -14633,7 +14765,7 @@@@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@@@ -14708,6 +14840,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d499 1
a499 1
@@@@ -15099,6 +15246,7 @@@@ beos*)
d507 3
a509 5
@@@@ -15213,16 +15361,17 @@@@ kfreebsd*-gnu)
   ;;
 
 freebsd*)
+  version_type=linux
d515 1
d530 1
a530 18
@@@@ -15242,6 +15391,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -15298,15 +15457,22 @@@@ hpux9* | hpux10* | hpux11*)
d559 1
a559 1
@@@@ -15383,11 +15549,11 @@@@ knetbsd*-gnu)
d573 1
a573 1
@@@@ -15418,10 +15584,10 @@@@ nto-qnx*)
d586 1
a586 1
@@@@ -16147,9 +16313,11 @@@@ echo $ECHO_N "checking for $compiler opt
d599 1
a599 1
@@@@ -16178,6 +16346,11 @@@@ echo $ECHO_N "checking for $compiler opt
d611 1
a611 1
@@@@ -16563,6 +16736,17 @@@@ EOF
d629 1
a629 1
@@@@ -16955,7 +17139,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d638 1
a638 10
@@@@ -16995,7 +17179,7 @@@@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@@@ -17070,6 +17254,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d660 1
a660 1
@@@@ -17461,6 +17660,7 @@@@ beos*)
d668 3
a670 5
@@@@ -17575,16 +17775,17 @@@@ kfreebsd*-gnu)
   ;;
 
 freebsd*)
+  version_type=linux
d676 1
d691 1
a691 18
@@@@ -17604,6 +17805,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -17660,15 +17871,22 @@@@ hpux9* | hpux10* | hpux11*)
d720 1
a720 1
@@@@ -17745,11 +17963,11 @@@@ knetbsd*-gnu)
d734 1
a734 1
@@@@ -17780,10 +17998,10 @@@@ nto-qnx*)
@


1.48
log
@add DragonFly support from patch sent to libtool-patches:

	http://lists.gnu.org/archive/html/libtool-patches/2004-12/msg00188.html

tested with gcc2 and gcc3 in-tree compilers.

bump PKGREVISION.
@
text
@d3 1
a3 1
--- configure.orig	2004-09-19 22:22:04.000000000 +1000
d74 1
a74 1
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* )
d130 9
d198 1
a198 1
+  version_type=dragonfly
d445 1
a445 1
+  version_type=dragonfly
d633 1
a633 1
+  version_type=dragonfly
d753 9
d821 1
a821 1
+  version_type=dragonfly
@


1.47
log
@in the command run when -export-symbols is used on Darwin with xlc,
ensure there is no whitespace on the command line when passing
-install_name to the linker, as this breaks the build.

this fixes the build of audio/libaudiofile and other packages using
-export-symbols on Darwin with xlc.

bump PKGREVISION.
@
text
@d19 16
d69 9
d184 18
a201 1
@@@@ -8422,15 +8454,22 @@@@ hpux9* | hpux10* | hpux11*)
d230 1
a230 1
@@@@ -8507,11 +8546,11 @@@@ knetbsd*-gnu)
d244 1
a244 1
@@@@ -8542,10 +8581,10 @@@@ nto-qnx*)
d257 1
a257 1
@@@@ -10105,9 +10144,7 @@@@ echo "$as_me: error: tag name \"$tagname
d268 1
a268 1
@@@@ -10659,7 +10696,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d277 10
a286 1
@@@@ -10817,6 +10854,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d303 1
a303 1
@@@@ -10934,14 +10981,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d335 1
a335 1
@@@@ -11324,6 +11386,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d357 1
a357 1
@@@@ -11371,9 +11448,11 @@@@ echo $ECHO_N "checking for $compiler opt
d370 1
a370 1
@@@@ -11395,6 +11474,10 @@@@ echo $ECHO_N "checking for $compiler opt
d381 10
a390 1
@@@@ -11469,6 +11552,8 @@@@ echo $ECHO_N "checking for $compiler opt
d399 1
a399 1
@@@@ -11939,6 +12024,7 @@@@ beos*)
d407 1
a407 1
@@@@ -12053,16 +12139,17 @@@@ kfreebsd*-gnu)
d431 18
a448 1
@@@@ -12138,15 +12225,22 @@@@ hpux9* | hpux10* | hpux11*)
d477 1
a477 1
@@@@ -12223,11 +12317,11 @@@@ knetbsd*-gnu)
d491 1
a491 1
@@@@ -12258,10 +12352,10 @@@@ nto-qnx*)
d504 1
a504 1
@@@@ -13805,9 +13899,11 @@@@ echo $ECHO_N "checking for $compiler opt
d517 1
a517 1
@@@@ -13836,6 +13932,11 @@@@ echo $ECHO_N "checking for $compiler opt
d529 1
a529 1
@@@@ -14221,6 +14322,17 @@@@ EOF
d547 1
a547 1
@@@@ -14593,7 +14705,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d556 10
a565 1
@@@@ -14708,6 +14820,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d587 1
a587 1
@@@@ -15099,6 +15226,7 @@@@ beos*)
d595 1
a595 1
@@@@ -15213,16 +15341,17 @@@@ kfreebsd*-gnu)
d619 18
a636 1
@@@@ -15298,15 +15427,22 @@@@ hpux9* | hpux10* | hpux11*)
d665 1
a665 1
@@@@ -15383,11 +15519,11 @@@@ knetbsd*-gnu)
d679 1
a679 1
@@@@ -15418,10 +15554,10 @@@@ nto-qnx*)
d692 1
a692 1
@@@@ -16147,9 +16283,11 @@@@ echo $ECHO_N "checking for $compiler opt
d705 1
a705 1
@@@@ -16178,6 +16316,11 @@@@ echo $ECHO_N "checking for $compiler opt
d717 1
a717 1
@@@@ -16563,6 +16706,17 @@@@ EOF
d735 1
a735 1
@@@@ -16955,7 +17109,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d744 1
a744 1
@@@@ -17070,6 +17224,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d766 1
a766 1
@@@@ -17461,6 +17630,7 @@@@ beos*)
d774 1
a774 1
@@@@ -17575,16 +17745,17 @@@@ kfreebsd*-gnu)
d798 18
a815 1
@@@@ -17660,15 +17831,22 @@@@ hpux9* | hpux10* | hpux11*)
d844 1
a844 1
@@@@ -17745,11 +17923,11 @@@@ knetbsd*-gnu)
d858 1
a858 1
@@@@ -17780,10 +17958,10 @@@@ nto-qnx*)
@


1.47.2.1
log
@Pullup ticket 180 - requested by grant beattie
portability fix for libtool

Module Name:    pkgsrc
Committed By:   grant
Date:           Tue Dec 21 13:50:25 UTC 2004

Modified Files:
        pkgsrc/devel/libtool: distinfo
        pkgsrc/devel/libtool-base: Makefile
        pkgsrc/devel/libtool/patches: patch-ab patch-ac patch-ad

Log Message:
add DragonFly support from patch sent to libtool-patches:

        http://lists.gnu.org/archive/html/libtool-patches/2004-12/msg00188.html

tested with gcc2 and gcc3 in-tree compilers.

bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   grant
Date:           Tue Dec 21 13:52:26 UTC 2004

Modified Files:
        pkgsrc/mk/platform: DragonFly.mk

Log Message:
libtool>=1.5.10nb9 actually works on DragonFly, so require at
least that version.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.48 2004/12/21 13:50:23 grant Exp $
a18 16
@@@@ -4496,13 +4496,13 @@@@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
a52 9
@@@@ -5974,7 +5971,7 @@@@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* )
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* )
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
d159 1
a159 18
@@@@ -8366,6 +8398,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=dragonfly
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -8422,15 +8464,22 @@@@ hpux9* | hpux10* | hpux11*)
d188 1
a188 1
@@@@ -8507,11 +8556,11 @@@@ knetbsd*-gnu)
d202 1
a202 1
@@@@ -8542,10 +8591,10 @@@@ nto-qnx*)
d215 1
a215 1
@@@@ -10105,9 +10154,7 @@@@ echo "$as_me: error: tag name \"$tagname
d226 1
a226 1
@@@@ -10659,7 +10706,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d235 1
a235 10
@@@@ -10693,7 +10740,7 @@@@ if test -z "$aix_libpath"; then aix_libp
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@@@ -10817,6 +10864,16 @@@@ if test -z "$aix_libpath"; then aix_libp
d252 1
a252 1
@@@@ -10934,14 +10991,29 @@@@ if test -z "$aix_libpath"; then aix_libp
d284 1
a284 1
@@@@ -11324,6 +11396,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d306 1
a306 1
@@@@ -11371,9 +11458,11 @@@@ echo $ECHO_N "checking for $compiler opt
d319 1
a319 1
@@@@ -11395,6 +11484,10 @@@@ echo $ECHO_N "checking for $compiler opt
d330 1
a330 10
@@@@ -11441,7 +11534,7 @@@@ echo $ECHO_N "checking for $compiler opt
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@@@ -11469,6 +11562,8 @@@@ echo $ECHO_N "checking for $compiler opt
d339 1
a339 1
@@@@ -11939,6 +12034,7 @@@@ beos*)
d347 1
a347 1
@@@@ -12053,16 +12149,17 @@@@ kfreebsd*-gnu)
d371 1
a371 18
@@@@ -12082,6 +12179,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=dragonfly
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -12138,15 +12245,22 @@@@ hpux9* | hpux10* | hpux11*)
d400 1
a400 1
@@@@ -12223,11 +12337,11 @@@@ knetbsd*-gnu)
d414 1
a414 1
@@@@ -12258,10 +12372,10 @@@@ nto-qnx*)
d427 1
a427 1
@@@@ -13805,9 +13919,11 @@@@ echo $ECHO_N "checking for $compiler opt
d440 1
a440 1
@@@@ -13836,6 +13952,11 @@@@ echo $ECHO_N "checking for $compiler opt
d452 1
a452 1
@@@@ -14221,6 +14342,17 @@@@ EOF
d470 1
a470 1
@@@@ -14593,7 +14725,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d479 1
a479 10
@@@@ -14633,7 +14765,7 @@@@ if test -z "$aix_libpath"; then aix_libp
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@@@ -14708,6 +14840,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d501 1
a501 1
@@@@ -15099,6 +15246,7 @@@@ beos*)
d509 1
a509 1
@@@@ -15213,16 +15361,17 @@@@ kfreebsd*-gnu)
d533 1
a533 18
@@@@ -15242,6 +15391,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=dragonfly
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -15298,15 +15457,22 @@@@ hpux9* | hpux10* | hpux11*)
d562 1
a562 1
@@@@ -15383,11 +15549,11 @@@@ knetbsd*-gnu)
d576 1
a576 1
@@@@ -15418,10 +15584,10 @@@@ nto-qnx*)
d589 1
a589 1
@@@@ -16147,9 +16313,11 @@@@ echo $ECHO_N "checking for $compiler opt
d602 1
a602 1
@@@@ -16178,6 +16346,11 @@@@ echo $ECHO_N "checking for $compiler opt
d614 1
a614 1
@@@@ -16563,6 +16736,17 @@@@ EOF
d632 1
a632 1
@@@@ -16955,7 +17139,7 @@@@ if test -z "$aix_libpath"; then aix_libp
d641 1
a641 1
@@@@ -17070,6 +17254,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d663 1
a663 1
@@@@ -17461,6 +17660,7 @@@@ beos*)
d671 1
a671 1
@@@@ -17575,16 +17775,17 @@@@ kfreebsd*-gnu)
d695 1
a695 18
@@@@ -17604,6 +17805,16 @@@@ freebsd*)
   esac
   ;;
 
+dragonfly*)
+  version_type=dragonfly
+  need_version=no
+  need_lib_prefix=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 gnu*)
   version_type=linux
   need_lib_prefix=no
@@@@ -17660,15 +17871,22 @@@@ hpux9* | hpux10* | hpux11*)
d724 1
a724 1
@@@@ -17745,11 +17963,11 @@@@ knetbsd*-gnu)
d738 1
a738 1
@@@@ -17780,10 +17998,10 @@@@ nto-qnx*)
@


1.46
log
@Fix C++ linkage on modern NetBSD ELF by using a more standard link command.
Based on jlam's patch to tech-pkg.
Bump PKGREVISION to 1.5.0nb6.
@
text
@d3 1
a3 1
--- configure.orig	2004-09-19 08:22:04.000000000 -0400
d96 9
d226 9
d470 9
d632 9
@


1.45
log
@Another Interix fubar workaround:  C++ libs weren't linking in libtool
because Interix installs completely hosed .la files for libstdc++ and
libsupc++.  Make libtool instead trust g++ to DTRT.
@
text
@d234 3
a236 1
@@@@ -10936,6 +10983,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d238 1
d251 16
a266 1
@@@@ -11324,6 +11378,21 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d288 1
a288 1
@@@@ -11371,9 +11440,11 @@@@ echo $ECHO_N "checking for $compiler opt
d301 1
a301 1
@@@@ -11395,6 +11466,10 @@@@ echo $ECHO_N "checking for $compiler opt
d312 1
a312 1
@@@@ -11469,6 +11544,8 @@@@ echo $ECHO_N "checking for $compiler opt
d321 1
a321 1
@@@@ -11939,6 +12016,7 @@@@ beos*)
d329 1
a329 1
@@@@ -12053,16 +12131,17 @@@@ kfreebsd*-gnu)
d353 1
a353 1
@@@@ -12138,15 +12217,22 @@@@ hpux9* | hpux10* | hpux11*)
d382 1
a382 1
@@@@ -12223,11 +12309,11 @@@@ knetbsd*-gnu)
d396 1
a396 1
@@@@ -12258,10 +12344,10 @@@@ nto-qnx*)
d409 1
a409 1
@@@@ -13805,9 +13891,11 @@@@ echo $ECHO_N "checking for $compiler opt
d422 1
a422 1
@@@@ -13836,6 +13924,11 @@@@ echo $ECHO_N "checking for $compiler opt
d434 1
a434 1
@@@@ -14221,6 +14314,17 @@@@ EOF
d452 1
a452 1
@@@@ -14708,6 +14812,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d474 1
a474 1
@@@@ -15099,6 +15218,7 @@@@ beos*)
d482 1
a482 1
@@@@ -15213,16 +15333,17 @@@@ kfreebsd*-gnu)
d506 1
a506 1
@@@@ -15298,15 +15419,22 @@@@ hpux9* | hpux10* | hpux11*)
d535 1
a535 1
@@@@ -15383,11 +15511,11 @@@@ knetbsd*-gnu)
d549 1
a549 1
@@@@ -15418,10 +15546,10 @@@@ nto-qnx*)
d562 1
a562 1
@@@@ -16147,9 +16275,11 @@@@ echo $ECHO_N "checking for $compiler opt
d575 1
a575 1
@@@@ -16178,6 +16308,11 @@@@ echo $ECHO_N "checking for $compiler opt
d587 1
a587 1
@@@@ -16563,6 +16698,17 @@@@ EOF
d605 1
a605 1
@@@@ -17070,6 +17216,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d627 1
a627 1
@@@@ -17461,6 +17622,7 @@@@ beos*)
d635 1
a635 1
@@@@ -17575,16 +17737,17 @@@@ kfreebsd*-gnu)
d659 1
a659 1
@@@@ -17660,15 +17823,22 @@@@ hpux9* | hpux10* | hpux11*)
d688 1
a688 1
@@@@ -17745,11 +17915,11 @@@@ knetbsd*-gnu)
d702 1
a702 1
@@@@ -17780,10 +17950,10 @@@@ nto-qnx*)
@


1.44
log
@Quick typo fix for previous which made some libraries not build at all
on Interix.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.43 2004/10/11 16:51:56 tv Exp $
d24 1
a24 1
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
d108 1
a108 1
+      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'
d217 1
a217 1
@@@@ -10817,6 +10854,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d222 8
d234 1
a234 1
@@@@ -10936,6 +10975,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d248 1
a248 1
@@@@ -11324,6 +11370,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d258 7
d270 1
a270 1
@@@@ -11371,9 +11425,11 @@@@ echo $ECHO_N "checking for $compiler opt
d283 1
a283 1
@@@@ -11395,6 +11451,10 @@@@ echo $ECHO_N "checking for $compiler opt
d294 1
a294 1
@@@@ -11469,6 +11529,8 @@@@ echo $ECHO_N "checking for $compiler opt
d303 1
a303 1
@@@@ -11939,6 +12001,7 @@@@ beos*)
d311 1
a311 1
@@@@ -12053,16 +12116,17 @@@@ kfreebsd*-gnu)
d335 1
a335 1
@@@@ -12138,15 +12202,22 @@@@ hpux9* | hpux10* | hpux11*)
d364 1
a364 1
@@@@ -12223,11 +12294,11 @@@@ knetbsd*-gnu)
d378 1
a378 1
@@@@ -12258,10 +12329,10 @@@@ nto-qnx*)
d391 1
a391 1
@@@@ -13805,9 +13876,11 @@@@ echo $ECHO_N "checking for $compiler opt
d404 1
a404 1
@@@@ -13836,6 +13909,11 @@@@ echo $ECHO_N "checking for $compiler opt
d416 1
a416 1
@@@@ -14221,6 +14299,17 @@@@ EOF
d434 1
a434 1
@@@@ -14708,6 +14797,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d446 1
a446 1
+      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'
d456 1
a456 1
@@@@ -15099,6 +15203,7 @@@@ beos*)
d464 1
a464 1
@@@@ -15213,16 +15318,17 @@@@ kfreebsd*-gnu)
d488 1
a488 1
@@@@ -15298,15 +15404,22 @@@@ hpux9* | hpux10* | hpux11*)
d517 1
a517 1
@@@@ -15383,11 +15496,11 @@@@ knetbsd*-gnu)
d531 1
a531 1
@@@@ -15418,10 +15531,10 @@@@ nto-qnx*)
d544 1
a544 1
@@@@ -16147,9 +16260,11 @@@@ echo $ECHO_N "checking for $compiler opt
d557 1
a557 1
@@@@ -16178,6 +16293,11 @@@@ echo $ECHO_N "checking for $compiler opt
d569 1
a569 1
@@@@ -16563,6 +16683,17 @@@@ EOF
d587 1
a587 1
@@@@ -17070,6 +17201,21 @@@@ if test -z "$aix_libpath"; then aix_libp
d599 1
a599 1
+      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'
d609 1
a609 1
@@@@ -17461,6 +17607,7 @@@@ beos*)
d617 1
a617 1
@@@@ -17575,16 +17722,17 @@@@ kfreebsd*-gnu)
d641 1
a641 1
@@@@ -17660,15 +17808,22 @@@@ hpux9* | hpux10* | hpux11*)
d670 1
a670 1
@@@@ -17745,11 +17900,11 @@@@ knetbsd*-gnu)
d684 1
a684 1
@@@@ -17780,10 +17935,10 @@@@ nto-qnx*)
@


1.43
log
@Make -export-symbols work properly under Interix.  (The Interix ld(1) does
not implicitly add `_' to -retain-symbols-file values, so we have to add
it manually before doing the physical link.)
@
text
@d1 1
a1 1
$NetBSD$
d90 1
a90 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d108 1
a108 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d413 1
a413 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d431 1
a431 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d566 1
a566 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d584 1
a584 1
+      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 ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
@


1.42
log
@nb2: Make the "echo" substitute work on Interix.  Noted by
Hiramatsu Yoshifumi <hiramatu@@boreas.dti.ne.jp> in PR pkg/27182.
@
text
@d90 1
a90 1
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d96 1
a96 1
@@@@ -7832,6 +7847,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d108 1
d118 1
a118 1
@@@@ -8223,6 +8252,7 @@@@ beos*)
d126 1
a126 1
@@@@ -8337,16 +8367,17 @@@@ kfreebsd*-gnu)
d150 1
a150 1
@@@@ -8422,15 +8453,22 @@@@ hpux9* | hpux10* | hpux11*)
d179 1
a179 1
@@@@ -8507,11 +8545,11 @@@@ knetbsd*-gnu)
d193 1
a193 1
@@@@ -8542,10 +8580,10 @@@@ nto-qnx*)
d206 1
a206 1
@@@@ -10105,9 +10143,7 @@@@ echo "$as_me: error: tag name \"$tagname
d217 1
a217 1
@@@@ -10817,6 +10853,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d226 1
a226 1
@@@@ -10936,6 +10974,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d240 1
a240 1
@@@@ -11324,6 +11369,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d255 1
a255 1
@@@@ -11371,9 +11424,11 @@@@ echo $ECHO_N "checking for $compiler opt
d268 1
a268 1
@@@@ -11395,6 +11450,10 @@@@ echo $ECHO_N "checking for $compiler opt
d279 1
a279 1
@@@@ -11469,6 +11528,8 @@@@ echo $ECHO_N "checking for $compiler opt
d288 1
a288 1
@@@@ -11939,6 +12000,7 @@@@ beos*)
d296 1
a296 1
@@@@ -12053,16 +12115,17 @@@@ kfreebsd*-gnu)
d320 1
a320 1
@@@@ -12138,15 +12201,22 @@@@ hpux9* | hpux10* | hpux11*)
d349 1
a349 1
@@@@ -12223,11 +12293,11 @@@@ knetbsd*-gnu)
d363 1
a363 1
@@@@ -12258,10 +12328,10 @@@@ nto-qnx*)
d376 1
a376 1
@@@@ -13805,9 +13875,11 @@@@ echo $ECHO_N "checking for $compiler opt
d389 1
a389 1
@@@@ -13836,6 +13908,11 @@@@ echo $ECHO_N "checking for $compiler opt
d401 1
a401 1
@@@@ -14221,6 +14298,17 @@@@ EOF
d413 1
a413 1
+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d419 1
a419 1
@@@@ -14708,6 +14796,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d431 1
d441 1
a441 1
@@@@ -15099,6 +15201,7 @@@@ beos*)
d449 1
a449 1
@@@@ -15213,16 +15316,17 @@@@ kfreebsd*-gnu)
d473 1
a473 1
@@@@ -15298,15 +15402,22 @@@@ hpux9* | hpux10* | hpux11*)
d502 1
a502 1
@@@@ -15383,11 +15494,11 @@@@ knetbsd*-gnu)
d516 1
a516 1
@@@@ -15418,10 +15529,10 @@@@ nto-qnx*)
d529 1
a529 1
@@@@ -16147,9 +16258,11 @@@@ echo $ECHO_N "checking for $compiler opt
d542 1
a542 1
@@@@ -16178,6 +16291,11 @@@@ echo $ECHO_N "checking for $compiler opt
d554 1
a554 1
@@@@ -16563,6 +16681,17 @@@@ EOF
d566 1
a566 1
+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols ${wl}--image-base,$(($RANDOM %4096/2*262144+1342177280)) -o $lib'
d572 1
a572 1
@@@@ -17070,6 +17199,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d584 1
d594 1
a594 1
@@@@ -17461,6 +17604,7 @@@@ beos*)
d602 1
a602 1
@@@@ -17575,16 +17719,17 @@@@ kfreebsd*-gnu)
d626 1
a626 1
@@@@ -17660,15 +17805,22 @@@@ hpux9* | hpux10* | hpux11*)
d655 1
a655 1
@@@@ -17745,11 +17897,11 @@@@ knetbsd*-gnu)
d669 1
a669 1
@@@@ -17780,10 +17932,10 @@@@ nto-qnx*)
@


1.41
log
@Fix completely hosed test for g++ when CXX=g++.  The old test worked fine.
Revert until the hosage is tracked down and eliminated at the source.

(Bump to libtool-1.5.10nb1, and make this the required version.)
@
text
@d5 14
@


1.40
log
@Libtool fix for PR pkg/26633, and other issues.  Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
@
text
@d16 24
a39 1
@@@@ -6909,9 +6913,11 @@@@ echo $ECHO_N "checking for $compiler opt
d52 1
a52 1
@@@@ -6940,6 +6946,11 @@@@ echo $ECHO_N "checking for $compiler opt
d64 1
a64 1
@@@@ -7325,6 +7336,17 @@@@ EOF
d82 1
a82 1
@@@@ -7832,6 +7854,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d103 1
a103 1
@@@@ -8223,6 +8259,7 @@@@ beos*)
d111 1
a111 1
@@@@ -8337,16 +8374,17 @@@@ kfreebsd*-gnu)
d135 1
a135 1
@@@@ -8422,15 +8460,22 @@@@ hpux9* | hpux10* | hpux11*)
d164 1
a164 1
@@@@ -8507,11 +8552,11 @@@@ knetbsd*-gnu)
d178 1
a178 1
@@@@ -8542,10 +8587,10 @@@@ nto-qnx*)
d191 12
a202 1
@@@@ -10817,6 +10862,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d211 1
a211 1
@@@@ -10936,6 +10983,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d225 1
a225 1
@@@@ -11324,6 +11378,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d240 1
a240 1
@@@@ -11371,9 +11433,11 @@@@ echo $ECHO_N "checking for $compiler opt
d253 1
a253 1
@@@@ -11395,6 +11459,10 @@@@ echo $ECHO_N "checking for $compiler opt
d264 1
a264 1
@@@@ -11469,6 +11537,8 @@@@ echo $ECHO_N "checking for $compiler opt
d273 1
a273 1
@@@@ -11939,6 +12009,7 @@@@ beos*)
d281 1
a281 1
@@@@ -12053,16 +12124,17 @@@@ kfreebsd*-gnu)
d305 1
a305 1
@@@@ -12138,15 +12210,22 @@@@ hpux9* | hpux10* | hpux11*)
d334 1
a334 1
@@@@ -12223,11 +12302,11 @@@@ knetbsd*-gnu)
d348 1
a348 1
@@@@ -12258,10 +12337,10 @@@@ nto-qnx*)
d361 1
a361 1
@@@@ -13805,9 +13884,11 @@@@ echo $ECHO_N "checking for $compiler opt
d374 1
a374 1
@@@@ -13836,6 +13917,11 @@@@ echo $ECHO_N "checking for $compiler opt
d386 1
a386 1
@@@@ -14221,6 +14307,17 @@@@ EOF
d404 1
a404 1
@@@@ -14708,6 +14805,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d425 1
a425 1
@@@@ -15099,6 +15210,7 @@@@ beos*)
d433 1
a433 1
@@@@ -15213,16 +15325,17 @@@@ kfreebsd*-gnu)
d457 1
a457 1
@@@@ -15298,15 +15411,22 @@@@ hpux9* | hpux10* | hpux11*)
d486 1
a486 1
@@@@ -15383,11 +15503,11 @@@@ knetbsd*-gnu)
d500 1
a500 1
@@@@ -15418,10 +15538,10 @@@@ nto-qnx*)
d513 1
a513 1
@@@@ -16147,9 +16267,11 @@@@ echo $ECHO_N "checking for $compiler opt
d526 1
a526 1
@@@@ -16178,6 +16300,11 @@@@ echo $ECHO_N "checking for $compiler opt
d538 1
a538 1
@@@@ -16563,6 +16690,17 @@@@ EOF
d556 1
a556 1
@@@@ -17070,6 +17208,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d577 1
a577 1
@@@@ -17461,6 +17613,7 @@@@ beos*)
d585 1
a585 1
@@@@ -17575,16 +17728,17 @@@@ kfreebsd*-gnu)
d609 1
a609 1
@@@@ -17660,15 +17814,22 @@@@ hpux9* | hpux10* | hpux11*)
d638 1
a638 1
@@@@ -17745,11 +17906,11 @@@@ knetbsd*-gnu)
d652 1
a652 1
@@@@ -17780,10 +17941,10 @@@@ nto-qnx*)
@


1.39
log
@fix shared library names on OpenBSD after upgrade to libtool 1.5.x.

fixes PR pkg/25527 from Adrian Portelli.
@
text
@d3 1
a3 1
--- configure.orig	2004-04-11 15:35:42.000000000 +1000
d5 1
a5 19
@@@@ -4440,10 +4440,13 @@@@ beos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
+# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
+bsdi1*|bsdi2*|bsdi3*)
+  dynamic_linker=no
+  ;;
+
+bsdi*)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 cygwin*)
@@@@ -4501,6 +4504,10 @@@@ hpux10.20* | hpux11*)
d16 1
a16 1
@@@@ -6857,9 +6864,11 @@@@ echo $ECHO_N "checking for $compiler opt
d29 1
a29 1
@@@@ -6888,6 +6897,11 @@@@ echo $ECHO_N "checking for $compiler opt
d41 1
a41 1
@@@@ -7263,6 +7277,17 @@@@ EOF
d59 1
a59 1
@@@@ -7770,6 +7795,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d80 3
a82 6
@@@@ -8158,8 +8197,9 @@@@ beos*)
   ;;
 
 bsdi4*)
-  version_type=linux
+  version_type=sunos
d88 2
a89 1
@@@@ -8275,15 +8315,15 @@@@ kfreebsd*-gnu)
d92 1
a97 2
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d100 1
d108 1
d112 1
a112 1
@@@@ -8359,15 +8399,22 @@@@ hpux9* | hpux10* | hpux11*)
d117 1
a117 1
+  version_type=sunos
d137 1
a137 1
+    *) version_type=sunos ;;
d141 2
a142 1
@@@@ -8403,7 +8450,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d144 3
a146 4
 # This must be Linux ELF.
 linux*)
-  version_type=linux
+  version_type=sunos
d149 12
a160 3
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -8482,7 +8529,7 @@@@ openbsd*)
   version_type=sunos
d162 1
a162 1
   need_version=yes
d164 1
a164 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d168 1
a168 10
@@@@ -8527,7 +8574,7 @@@@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -10777,6 +10824,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d177 1
a177 1
@@@@ -10885,6 +10934,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d191 1
a191 1
@@@@ -11257,6 +11313,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d206 1
a206 1
@@@@ -11304,9 +11368,11 @@@@ echo $ECHO_N "checking for $compiler opt
d219 1
a219 1
@@@@ -11328,6 +11394,10 @@@@ echo $ECHO_N "checking for $compiler opt
d230 1
a230 1
@@@@ -11392,6 +11462,8 @@@@ echo $ECHO_N "checking for $compiler opt
d239 3
a241 6
@@@@ -11860,8 +11932,9 @@@@ beos*)
   ;;
 
 bsdi4*)
-  version_type=linux
+  version_type=sunos
d247 2
a248 1
@@@@ -11977,15 +12050,15 @@@@ kfreebsd*-gnu)
d251 1
a256 2
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d259 1
d267 1
d271 1
a271 1
@@@@ -12061,15 +12134,22 @@@@ hpux9* | hpux10* | hpux11*)
d276 1
a276 1
+  version_type=sunos
d296 1
a296 1
+    *) version_type=sunos ;;
d300 2
a301 1
@@@@ -12105,7 +12185,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d303 3
a305 4
 # This must be Linux ELF.
 linux*)
-  version_type=linux
+  version_type=sunos
d308 12
a319 3
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -12184,7 +12264,7 @@@@ openbsd*)
   version_type=sunos
d321 1
a321 1
   need_version=yes
d323 1
a323 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d327 1
a327 10
@@@@ -12229,7 +12309,7 @@@@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -13728,9 +13808,11 @@@@ echo $ECHO_N "checking for $compiler opt
d340 1
a340 1
@@@@ -13759,6 +13841,11 @@@@ echo $ECHO_N "checking for $compiler opt
d352 1
a352 1
@@@@ -14134,6 +14221,17 @@@@ EOF
d370 1
a370 1
@@@@ -14621,6 +14719,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d391 3
a393 6
@@@@ -15009,8 +15121,9 @@@@ beos*)
   ;;
 
 bsdi4*)
-  version_type=linux
+  version_type=sunos
d399 2
a400 1
@@@@ -15126,15 +15239,15 @@@@ kfreebsd*-gnu)
d403 1
a408 2
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d411 1
d419 1
d423 1
a423 1
@@@@ -15210,15 +15323,22 @@@@ hpux9* | hpux10* | hpux11*)
d428 1
a428 1
+  version_type=sunos
d448 1
a448 1
+    *) version_type=sunos ;;
d452 2
a453 1
@@@@ -15254,7 +15374,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d455 3
a457 4
 # This must be Linux ELF.
 linux*)
-  version_type=linux
+  version_type=sunos
d460 12
a471 3
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -15333,7 +15453,7 @@@@ openbsd*)
   version_type=sunos
d473 1
a473 1
   need_version=yes
d475 1
a475 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d479 1
a479 10
@@@@ -15378,7 +15498,7 @@@@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -16059,9 +16179,11 @@@@ echo $ECHO_N "checking for $compiler opt
d492 1
a492 1
@@@@ -16090,6 +16212,11 @@@@ echo $ECHO_N "checking for $compiler opt
d504 1
a504 1
@@@@ -16465,6 +16592,17 @@@@ EOF
d522 1
a522 1
@@@@ -16972,6 +17110,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d543 3
a545 6
@@@@ -17360,8 +17512,9 @@@@ beos*)
   ;;
 
 bsdi4*)
-  version_type=linux
+  version_type=sunos
d551 2
a552 1
@@@@ -17477,15 +17630,15 @@@@ kfreebsd*-gnu)
d555 1
a560 2
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
d563 1
d571 1
d575 1
a575 1
@@@@ -17561,15 +17714,22 @@@@ hpux9* | hpux10* | hpux11*)
d580 1
a580 1
+  version_type=sunos
d600 1
a600 1
+    *) version_type=sunos ;;
d604 2
a605 1
@@@@ -17605,7 +17765,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d607 3
a609 4
 # This must be Linux ELF.
 linux*)
-  version_type=linux
+  version_type=sunos
d612 12
a623 3
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@@@ -17684,7 +17844,7 @@@@ openbsd*)
   version_type=sunos
d625 1
a625 1
   need_version=yes
d627 1
a627 1
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
a630 9
@@@@ -17729,7 +17889,7 @@@@ sco3.2v5*)
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=sunos
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@


1.38
log
@fix up Darwin patches
@
text
@d3 1
a3 1
--- configure.orig	Sun Apr 11 01:35:42 2004
d169 9
d329 9
d482 9
d635 9
@


1.37
log
@Update to 1.5.6 (OK'd by skrll).

* In libtool-base, generate shlibtool with a simple sed script; no full
  build is actually needed.

Changelog:

New in 1.5.6: 2004-04-11; CVS version 1.5.5a, Libtool team:
* Installs libltdl files properly in $prefix/share/libtool/libltdl. 1.5.4
  did not install them at all.
* libltdl correctly guesses the extension for loadable modules again.

New in 1.5.4: 2004-04-03; CVS version 1.5.3a, Libtool team:
* Bug fixes.
@
text
@d3 1
a3 1
--- configure.orig	Thu Apr 22 10:23:09 2004
d34 14
a47 1
@@@@ -6888,6 +6895,11 @@@@ echo $ECHO_N "checking for $compiler opt
d59 1
a59 1
@@@@ -7263,6 +7275,17 @@@@ EOF
d77 1
a77 1
@@@@ -7770,6 +7793,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d98 1
a98 1
@@@@ -8158,8 +8195,9 @@@@ beos*)
d109 1
a109 1
@@@@ -8275,15 +8313,15 @@@@ kfreebsd*-gnu)
d131 1
a131 1
@@@@ -8359,15 +8397,22 @@@@ hpux9* | hpux10* | hpux11*)
d160 1
a160 1
@@@@ -8403,7 +8448,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d169 1
a169 1
@@@@ -8527,7 +8572,7 @@@@ sco3.2v5*)
d178 1
a178 1
@@@@ -10777,6 +10822,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d187 1
a187 1
@@@@ -10885,6 +10932,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d201 1
a201 1
@@@@ -11257,6 +11311,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d216 1
a216 1
@@@@ -11304,9 +11366,11 @@@@ echo $ECHO_N "checking for $compiler opt
d229 1
a229 1
@@@@ -11328,6 +11392,10 @@@@ echo $ECHO_N "checking for $compiler opt
d240 1
a240 1
@@@@ -11392,6 +11460,8 @@@@ echo $ECHO_N "checking for $compiler opt
d249 1
a249 1
@@@@ -11860,8 +11930,9 @@@@ beos*)
d260 1
a260 1
@@@@ -11977,15 +12048,15 @@@@ kfreebsd*-gnu)
d282 1
a282 1
@@@@ -12061,15 +12132,22 @@@@ hpux9* | hpux10* | hpux11*)
d311 1
a311 1
@@@@ -12105,7 +12183,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d320 1
a320 1
@@@@ -12229,7 +12307,7 @@@@ sco3.2v5*)
d329 14
a342 1
@@@@ -13759,6 +13837,11 @@@@ echo $ECHO_N "checking for $compiler opt
d354 1
a354 1
@@@@ -14134,6 +14217,17 @@@@ EOF
d372 1
a372 1
@@@@ -14621,6 +14715,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d393 1
a393 1
@@@@ -15009,8 +15117,9 @@@@ beos*)
d404 1
a404 1
@@@@ -15126,15 +15235,15 @@@@ kfreebsd*-gnu)
d426 1
a426 1
@@@@ -15210,15 +15319,22 @@@@ hpux9* | hpux10* | hpux11*)
d455 1
a455 1
@@@@ -15254,7 +15370,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d464 1
a464 1
@@@@ -15378,7 +15494,7 @@@@ sco3.2v5*)
d473 14
a486 1
@@@@ -16090,6 +16206,11 @@@@ echo $ECHO_N "checking for $compiler opt
d498 1
a498 1
@@@@ -16465,6 +16586,17 @@@@ EOF
d516 1
a516 1
@@@@ -16972,6 +17104,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d537 1
a537 1
@@@@ -17360,8 +17506,9 @@@@ beos*)
d548 1
a548 1
@@@@ -17477,15 +17624,15 @@@@ kfreebsd*-gnu)
d570 1
a570 1
@@@@ -17561,15 +17708,22 @@@@ hpux9* | hpux10* | hpux11*)
d599 1
a599 1
@@@@ -17605,7 +17759,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d608 1
a608 1
@@@@ -17729,7 +17883,7 @@@@ sco3.2v5*)
@


1.36
log
@Update Interix support once more (deliberately no PKGREVISION bump);
add a random image base address for shlibs that's more likely to be "out
of the way" from the rest of the OS and application.
@
text
@d3 1
a3 1
--- configure.orig	Sun Jan 25 07:36:38 2004
d5 1
a5 170
@@@@ -1156,7 +1156,7 @@@@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@@@ -1717,7 +1717,7 @@@@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p -- . 2>/dev/null; then
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
   # Keeping the `.' argument allows $(mkdir_p) to be used without
   # argument.  Indeed, we sometimes output rules like
   #   $(mkdir_p) $(somedir)
@@@@ -1730,7 +1730,7 @@@@ else
   # recognize any option.  It will interpret all options as
   # directories to create, and then abort because `.' already
   # exists.
-  for d in ./-p ./--;
+  for d in ./-p ./--version;
   do
     test -d $d && rmdir $d
   done
@@@@ -2580,7 +2580,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -2638,7 +2639,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -2754,7 +2756,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -2808,7 +2811,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -2853,7 +2857,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -2897,7 +2902,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -3042,7 +3048,9 @@@@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@@@ -3543,7 +3551,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -3601,7 +3610,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -3672,7 +3682,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -3716,7 +3727,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -3790,7 +3802,9 @@@@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
@@@@ -4002,7 +4016,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -4051,7 +4066,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -4424,10 +4440,13 @@@@ beos*)
d23 1
a23 1
@@@@ -4485,6 +4504,10 @@@@ hpux10.20* | hpux11*)
d34 1
a34 41
@@@@ -4745,7 +4768,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -5296,7 +5320,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -5466,7 +5491,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -5533,7 +5559,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -6868,6 +6895,11 @@@@ echo $ECHO_N "checking for $compiler opt
d46 1
a46 1
@@@@ -7243,6 +7275,17 @@@@ EOF
d64 1
a64 21
@@@@ -7457,7 +7500,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -7517,7 +7561,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -7748,6 +7793,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d85 1
a85 1
@@@@ -8136,8 +8195,9 @@@@ beos*)
d96 1
a96 1
@@@@ -8253,15 +8313,15 @@@@ kfreebsd*-gnu)
d118 1
a118 1
@@@@ -8337,15 +8397,22 @@@@ hpux9* | hpux10* | hpux11*)
d147 1
a147 1
@@@@ -8381,7 +8448,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d156 1
a156 1
@@@@ -8505,7 +8572,7 @@@@ sco3.2v5*)
d165 1
a165 91
@@@@ -8708,7 +8775,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -8811,7 +8879,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -8876,7 +8945,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -8969,7 +9039,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -9034,7 +9105,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -9100,7 +9172,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -9166,7 +9239,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -10411,7 +10485,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -10472,7 +10547,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -10746,6 +10822,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d174 1
a174 1
@@@@ -10854,6 +10932,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d188 1
a188 1
@@@@ -11226,6 +11311,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d203 1
a203 1
@@@@ -11273,9 +11366,11 @@@@ echo $ECHO_N "checking for $compiler opt
d216 1
a216 1
@@@@ -11297,6 +11392,10 @@@@ echo $ECHO_N "checking for $compiler opt
d227 1
a227 1
@@@@ -11361,6 +11460,8 @@@@ echo $ECHO_N "checking for $compiler opt
d236 1
a236 1
@@@@ -11829,8 +11930,9 @@@@ beos*)
d247 1
a247 1
@@@@ -11946,15 +12048,15 @@@@ kfreebsd*-gnu)
d269 1
a269 1
@@@@ -12030,15 +12132,22 @@@@ hpux9* | hpux10* | hpux11*)
d298 1
a298 1
@@@@ -12074,7 +12183,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d307 1
a307 1
@@@@ -12198,7 +12307,7 @@@@ sco3.2v5*)
d316 1
a316 71
@@@@ -12401,7 +12510,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12504,7 +12614,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12569,7 +12680,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12662,7 +12774,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12727,7 +12840,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12793,7 +12907,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -12859,7 +12974,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -13721,6 +13837,11 @@@@ echo $ECHO_N "checking for $compiler opt
d328 1
a328 1
@@@@ -14096,6 +14217,17 @@@@ EOF
d346 1
a346 21
@@@@ -14300,7 +14432,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -14350,7 +14483,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -14581,6 +14715,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d367 1
a367 1
@@@@ -14969,8 +15117,9 @@@@ beos*)
d378 1
a378 1
@@@@ -15086,15 +15235,15 @@@@ kfreebsd*-gnu)
d400 1
a400 1
@@@@ -15170,15 +15319,22 @@@@ hpux9* | hpux10* | hpux11*)
d429 1
a429 1
@@@@ -15214,7 +15370,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d438 1
a438 1
@@@@ -15338,7 +15494,7 @@@@ sco3.2v5*)
d447 1
a447 1
@@@@ -16050,6 +16206,11 @@@@ echo $ECHO_N "checking for $compiler opt
d459 1
a459 1
@@@@ -16425,6 +16586,17 @@@@ EOF
d477 1
a477 21
@@@@ -16639,7 +16811,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -16699,7 +16872,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -16930,6 +17104,20 @@@@ if test -z "$aix_libpath"; then aix_libp
d498 1
a498 1
@@@@ -17318,8 +17506,9 @@@@ beos*)
d509 1
a509 1
@@@@ -17435,15 +17624,15 @@@@ kfreebsd*-gnu)
d531 1
a531 1
@@@@ -17519,15 +17708,22 @@@@ hpux9* | hpux10* | hpux11*)
d560 1
a560 1
@@@@ -17563,7 +17759,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d569 1
a569 1
@@@@ -17687,7 +17883,7 @@@@ sco3.2v5*)
a577 122
@@@@ -17890,7 +18086,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -17993,7 +18190,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -18058,7 +18256,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -18151,7 +18350,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -18216,7 +18416,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -18282,7 +18483,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -18348,7 +18550,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@@@ -20503,6 +20706,11 @@@@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@@@ -20541,12 +20749,6 @@@@ echo "$as_me: error: cannot find input f
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@@@ -20718,14 +20920,14 @@@@ echo X"$mf" |
   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  U=`sed -n 's/^U = //p' < "$mf"`
   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
   # We invoke sed twice because it is the simplest approach to
   # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
+  for file in `sed -n '
     /^DEP_FILES = .*\\\\$/ {
       s/^DEP_FILES = //
       :loop
@@@@ -20987,7 +21189,7 @@@@ echo "$as_me: error: $ac_sub_configure f
    { (exit 1); exit 1; }; }
     fi
 
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@


1.35
log
@libtool 1.5.2nb7: Another Interix fix, this time removing any usage of
-fpic or -fPIC, as those produce horribly broken code.  Rather, shlibs
are relocated at runtime by the NT loader, and are compiled without any
special PIC option.
@
text
@d255 1
a255 1
@@@@ -7243,6 +7275,11 @@@@ EOF
d260 8
a267 2
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
d273 1
a273 1
@@@@ -7457,7 +7494,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d283 1
a283 1
@@@@ -7517,7 +7555,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d293 1
a293 1
@@@@ -7748,6 +7787,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d298 8
d307 1
a308 3
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='${wl}-h,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
d314 1
a314 1
@@@@ -8136,8 +8183,9 @@@@ beos*)
d325 1
a325 1
@@@@ -8253,15 +8301,15 @@@@ kfreebsd*-gnu)
d347 1
a347 1
@@@@ -8337,15 +8385,22 @@@@ hpux9* | hpux10* | hpux11*)
d376 1
a376 1
@@@@ -8381,7 +8436,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d385 1
a385 1
@@@@ -8505,7 +8560,7 @@@@ sco3.2v5*)
d394 1
a394 1
@@@@ -8708,7 +8763,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d404 1
a404 1
@@@@ -8811,7 +8867,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d414 1
a414 1
@@@@ -8876,7 +8933,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d424 1
a424 1
@@@@ -8969,7 +9027,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d434 1
a434 1
@@@@ -9034,7 +9093,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d444 1
a444 1
@@@@ -9100,7 +9160,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d454 1
a454 1
@@@@ -9166,7 +9227,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d464 1
a464 1
@@@@ -10411,7 +10473,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d474 1
a474 1
@@@@ -10472,7 +10535,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d484 1
a484 1
@@@@ -10746,6 +10810,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d493 1
a493 1
@@@@ -10854,6 +10920,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d507 1
a507 1
@@@@ -11226,6 +11299,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d522 1
a522 1
@@@@ -11273,9 +11354,11 @@@@ echo $ECHO_N "checking for $compiler opt
d535 1
a535 1
@@@@ -11297,6 +11380,10 @@@@ echo $ECHO_N "checking for $compiler opt
d546 1
a546 1
@@@@ -11361,6 +11448,8 @@@@ echo $ECHO_N "checking for $compiler opt
d555 1
a555 1
@@@@ -11829,8 +11918,9 @@@@ beos*)
d566 1
a566 1
@@@@ -11946,15 +12036,15 @@@@ kfreebsd*-gnu)
d588 1
a588 1
@@@@ -12030,15 +12120,22 @@@@ hpux9* | hpux10* | hpux11*)
d617 1
a617 1
@@@@ -12074,7 +12171,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d626 1
a626 1
@@@@ -12198,7 +12295,7 @@@@ sco3.2v5*)
d635 1
a635 1
@@@@ -12401,7 +12498,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d645 1
a645 1
@@@@ -12504,7 +12602,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d655 1
a655 1
@@@@ -12569,7 +12668,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d665 1
a665 1
@@@@ -12662,7 +12762,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d675 1
a675 1
@@@@ -12727,7 +12828,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d685 1
a685 1
@@@@ -12793,7 +12895,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d695 1
a695 1
@@@@ -12859,7 +12962,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d705 1
a705 1
@@@@ -13721,6 +13825,11 @@@@ echo $ECHO_N "checking for $compiler opt
d717 1
a717 1
@@@@ -14096,6 +14205,11 @@@@ EOF
d722 8
a729 2
+      archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
+      archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
d735 1
a735 1
@@@@ -14300,7 +14414,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d745 1
a745 1
@@@@ -14350,7 +14465,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d755 1
a755 1
@@@@ -14581,6 +14697,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d760 8
d769 1
a770 3
+      archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_F77='${wl}-h,$libdir'
+      export_dynamic_flag_spec_F77='${wl}-E'
d776 1
a776 1
@@@@ -14969,8 +15093,9 @@@@ beos*)
d787 1
a787 1
@@@@ -15086,15 +15211,15 @@@@ kfreebsd*-gnu)
d809 1
a809 1
@@@@ -15170,15 +15295,22 @@@@ hpux9* | hpux10* | hpux11*)
d838 1
a838 1
@@@@ -15214,7 +15346,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d847 1
a847 1
@@@@ -15338,7 +15470,7 @@@@ sco3.2v5*)
d856 1
a856 1
@@@@ -16050,6 +16182,11 @@@@ echo $ECHO_N "checking for $compiler opt
d868 1
a868 1
@@@@ -16425,6 +16562,11 @@@@ EOF
d873 8
a880 2
+      archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname -o $lib'
+      archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file $wl$export_symbols -o $lib'
d886 1
a886 1
@@@@ -16639,7 +16781,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d896 1
a896 1
@@@@ -16699,7 +16842,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d906 1
a906 1
@@@@ -16930,6 +17074,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d911 8
d920 1
a921 3
+      archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec_GCJ='${wl}-h,$libdir'
+      export_dynamic_flag_spec_GCJ='${wl}-E'
d927 1
a927 1
@@@@ -17318,8 +17470,9 @@@@ beos*)
d938 1
a938 1
@@@@ -17435,15 +17588,15 @@@@ kfreebsd*-gnu)
d960 1
a960 1
@@@@ -17519,15 +17672,22 @@@@ hpux9* | hpux10* | hpux11*)
d989 1
a989 1
@@@@ -17563,7 +17723,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d998 1
a998 1
@@@@ -17687,7 +17847,7 @@@@ sco3.2v5*)
d1007 1
a1007 1
@@@@ -17890,7 +18050,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1017 1
a1017 1
@@@@ -17993,7 +18154,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1027 1
a1027 1
@@@@ -18058,7 +18220,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1037 1
a1037 1
@@@@ -18151,7 +18314,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1047 1
a1047 1
@@@@ -18216,7 +18380,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1057 1
a1057 1
@@@@ -18282,7 +18447,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1067 1
a1067 1
@@@@ -18348,7 +18514,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1077 1
a1077 1
@@@@ -20503,6 +20670,11 @@@@ esac
d1089 1
a1089 1
@@@@ -20541,12 +20713,6 @@@@ echo "$as_me: error: cannot find input f
d1102 1
a1102 1
@@@@ -20718,14 +20884,14 @@@@ echo X"$mf" |
d1120 1
a1120 1
@@@@ -20987,7 +21153,7 @@@@ echo "$as_me: error: $ac_sub_configure f
@


1.34
log
@Move the libtool changes back to .m4 patches, but keep these out of the
way of automatic patching so automake doesn't come into play (and so that
the changes don't show up in the installed autoconf m4 fragments).

Add Interix3 support.  Bump PKGREVISION to 1.5.2nb6.
@
text
@d196 1
a196 1
+interix*)
d243 13
a255 1
@@@@ -7243,6 +7270,11 @@@@ EOF
d259 1
a259 1
+    interix*)
d267 1
a267 1
@@@@ -7457,7 +7489,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d277 1
a277 1
@@@@ -7517,7 +7550,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d287 1
a287 1
@@@@ -7748,6 +7782,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d291 1
a291 1
+    interix*)
d302 1
a302 1
@@@@ -8136,8 +8178,9 @@@@ beos*)
d313 1
a313 1
@@@@ -8253,15 +8296,15 @@@@ kfreebsd*-gnu)
d335 1
a335 1
@@@@ -8337,15 +8380,22 @@@@ hpux9* | hpux10* | hpux11*)
d339 1
a339 1
+interix*)
d345 1
a345 1
+  dynamic_linker='Interix ld.so'
d364 1
a364 1
@@@@ -8381,7 +8431,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d373 1
a373 1
@@@@ -8505,7 +8555,7 @@@@ sco3.2v5*)
d382 1
a382 1
@@@@ -8708,7 +8758,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d392 1
a392 1
@@@@ -8811,7 +8862,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d402 1
a402 1
@@@@ -8876,7 +8928,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d412 1
a412 1
@@@@ -8969,7 +9022,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d422 1
a422 1
@@@@ -9034,7 +9088,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d432 1
a432 1
@@@@ -9100,7 +9155,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d442 1
a442 1
@@@@ -9166,7 +9222,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d452 1
a452 1
@@@@ -10411,7 +10468,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d462 1
a462 1
@@@@ -10472,7 +10530,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d472 1
a472 1
@@@@ -10746,6 +10805,8 @@@@ if test -z "$aix_libpath"; then aix_libp
d476 1
a476 1
+  interix*)
d481 1
a481 1
@@@@ -10854,6 +10915,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d495 1
a495 1
@@@@ -11226,6 +11294,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d510 1
a510 1
@@@@ -11273,9 +11349,11 @@@@ echo $ECHO_N "checking for $compiler opt
d523 12
a534 1
@@@@ -11361,6 +11439,8 @@@@ echo $ECHO_N "checking for $compiler opt
d538 1
a538 1
+      interix*)
d543 1
a543 1
@@@@ -11829,8 +11909,9 @@@@ beos*)
d554 1
a554 1
@@@@ -11946,15 +12027,15 @@@@ kfreebsd*-gnu)
d576 1
a576 1
@@@@ -12030,15 +12111,22 @@@@ hpux9* | hpux10* | hpux11*)
d580 1
a580 1
+interix*)
d586 1
a586 1
+  dynamic_linker='Interix ld.so'
d605 1
a605 1
@@@@ -12074,7 +12162,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d614 1
a614 1
@@@@ -12198,7 +12286,7 @@@@ sco3.2v5*)
d623 1
a623 1
@@@@ -12401,7 +12489,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d633 1
a633 1
@@@@ -12504,7 +12593,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d643 1
a643 1
@@@@ -12569,7 +12659,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d653 1
a653 1
@@@@ -12662,7 +12753,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d663 1
a663 1
@@@@ -12727,7 +12819,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d673 1
a673 1
@@@@ -12793,7 +12886,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d683 1
a683 1
@@@@ -12859,7 +12953,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d693 13
a705 1
@@@@ -14096,6 +14191,11 @@@@ EOF
d709 1
a709 1
+    interix*)
d717 1
a717 1
@@@@ -14300,7 +14400,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d727 1
a727 1
@@@@ -14350,7 +14451,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d737 1
a737 1
@@@@ -14581,6 +14683,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d741 1
a741 1
+    interix*)
d752 1
a752 1
@@@@ -14969,8 +15079,9 @@@@ beos*)
d763 1
a763 1
@@@@ -15086,15 +15197,15 @@@@ kfreebsd*-gnu)
d785 1
a785 1
@@@@ -15170,15 +15281,22 @@@@ hpux9* | hpux10* | hpux11*)
d789 1
a789 1
+interix*)
d795 1
a795 1
+  dynamic_linker='Interix ld.so'
d814 1
a814 1
@@@@ -15214,7 +15332,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d823 1
a823 1
@@@@ -15338,7 +15456,7 @@@@ sco3.2v5*)
d832 13
a844 1
@@@@ -16425,6 +16543,11 @@@@ EOF
d848 1
a848 1
+    interix*)
d856 1
a856 1
@@@@ -16639,7 +16762,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d866 1
a866 1
@@@@ -16699,7 +16823,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d876 1
a876 1
@@@@ -16930,6 +17055,14 @@@@ if test -z "$aix_libpath"; then aix_libp
d880 1
a880 1
+    interix*)
d891 1
a891 1
@@@@ -17318,8 +17451,9 @@@@ beos*)
d902 1
a902 1
@@@@ -17435,15 +17569,15 @@@@ kfreebsd*-gnu)
d924 1
a924 1
@@@@ -17519,15 +17653,22 @@@@ hpux9* | hpux10* | hpux11*)
d928 1
a928 1
+interix*)
d934 1
a934 1
+  dynamic_linker='Interix ld.so'
d953 1
a953 1
@@@@ -17563,7 +17704,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d962 1
a962 1
@@@@ -17687,7 +17828,7 @@@@ sco3.2v5*)
d971 1
a971 1
@@@@ -17890,7 +18031,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d981 1
a981 1
@@@@ -17993,7 +18135,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d991 1
a991 1
@@@@ -18058,7 +18201,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1001 1
a1001 1
@@@@ -18151,7 +18295,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1011 1
a1011 1
@@@@ -18216,7 +18361,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1021 1
a1021 1
@@@@ -18282,7 +18428,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1031 1
a1031 1
@@@@ -18348,7 +18495,8 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l
d1041 1
a1041 1
@@@@ -20503,6 +20651,11 @@@@ esac
d1053 1
a1053 1
@@@@ -20541,12 +20694,6 @@@@ echo "$as_me: error: cannot find input f
d1066 1
a1066 1
@@@@ -20718,14 +20865,14 @@@@ echo X"$mf" |
d1084 1
a1084 1
@@@@ -20987,7 +21134,7 @@@@ echo "$as_me: error: $ac_sub_configure f
@


1.33
log
@disable -all-static for OS X since it just causes a linking error
(http://developer.apple.com/qa/qa2001/qa1118.html)
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.32 2004/02/23 10:54:08 markd Exp $
d4 171
a174 2
+++ configure	Sun Mar  7 11:35:41 2004
@@@@ -4424,10 +4424,13 @@@@ beos*)
d192 53
a244 1
@@@@ -6837,9 +6840,11 @@@@ echo $ECHO_N "checking for $compiler opt
d247 30
a276 7
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic='-fno-common'
+      lt_prog_compiler_static=''
d279 12
a290 3
     msdosdjgpp*)
@@@@ -8135,9 +8140,10 @@@@ beos*)
   shlibpath_var=LIBRARY_PATH
d293 1
a293 1
-bsdi4*)
a294 1
+bsdi*)
d301 1
a301 1
@@@@ -8253,15 +8259,15 @@@@ kfreebsd*-gnu)
d323 16
a338 1
@@@@ -8340,12 +8346,7 @@@@ hpux9* | hpux10* | hpux11*)
d352 1
a352 1
@@@@ -8381,7 +8382,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d361 1
a361 1
@@@@ -8505,7 +8506,7 @@@@ sco3.2v5*)
d370 100
a469 1
@@@@ -10854,6 +10855,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d483 1
a483 1
@@@@ -11226,6 +11234,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d498 1
a498 1
@@@@ -11273,9 +11289,11 @@@@ echo $ECHO_N "checking for $compiler opt
d506 2
a507 3
-      lt_prog_compiler_pic_CXX='-fno-common'
+      lt_prog_compiler_pic='-fno-common'
+      lt_prog_compiler_static=''
d511 10
a520 2
@@@@ -11828,9 +11846,10 @@@@ beos*)
   shlibpath_var=LIBRARY_PATH
d523 1
a523 1
-bsdi4*)
a524 1
+bsdi*)
d531 1
a531 1
@@@@ -11946,15 +11965,15 @@@@ kfreebsd*-gnu)
d553 16
a568 1
@@@@ -12033,12 +12052,7 @@@@ hpux9* | hpux10* | hpux11*)
d582 1
a582 1
@@@@ -12074,7 +12088,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d591 1
a591 1
@@@@ -12198,7 +12212,7 @@@@ sco3.2v5*)
d600 72
a671 1
@@@@ -13690,9 +13704,11 @@@@ echo $ECHO_N "checking for $compiler opt
d674 30
a703 7
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_F77='-fno-common'
+      lt_prog_compiler_static_F77=''
d706 12
a717 3
     msdosdjgpp*)
@@@@ -14968,9 +14984,10 @@@@ beos*)
   shlibpath_var=LIBRARY_PATH
d720 1
a720 1
-bsdi4*)
a721 1
+bsdi*)
d728 1
a728 1
@@@@ -15086,15 +15103,15 @@@@ kfreebsd*-gnu)
d750 16
a765 1
@@@@ -15173,12 +15190,7 @@@@ hpux9* | hpux10* | hpux11*)
d779 1
a779 1
@@@@ -15214,7 +15226,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d788 1
a788 1
@@@@ -15338,7 +15350,7 @@@@ sco3.2v5*)
d797 34
a830 1
@@@@ -16019,9 +16031,11 @@@@ echo $ECHO_N "checking for $compiler opt
d833 42
a874 7
     darwin* | rhapsody*)
-      # PIC is the default on this platform
+      # PIC is the default on this platform, and static linking of
+      # binaries generally doesn't work
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic_GCJ='-fno-common'
+      lt_prog_compiler_static_GCJ=''
d876 169
a1045 1
     msdosdjgpp*)
@


1.32
log
@Fix version_type settings for the non-NetBSD platforms in the CXX and
F77 cases.

PKGREVISION++
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- configure.orig	2004-01-26 01:36:38.000000000 +1300
+++ configure
d23 14
a36 1
@@@@ -8135,9 +8138,10 @@@@ beos*)
d49 1
a49 1
@@@@ -8253,15 +8257,15 @@@@ kfreebsd*-gnu)
d71 1
a71 1
@@@@ -8340,12 +8344,7 @@@@ hpux9* | hpux10* | hpux11*)
d85 1
a85 1
@@@@ -8381,7 +8380,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d94 1
a94 1
@@@@ -8505,7 +8504,7 @@@@ sco3.2v5*)
d103 1
a103 1
@@@@ -10854,6 +10853,13 @@@@ if test -z "$aix_libpath"; then aix_libp
d117 1
a117 1
@@@@ -11226,6 +11232,14 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_c
d132 15
a146 1
@@@@ -11828,9 +11842,10 @@@@ beos*)
d159 1
a159 1
@@@@ -11946,15 +11961,15 @@@@ kfreebsd*-gnu)
d181 1
a181 1
@@@@ -12033,12 +12048,7 @@@@ hpux9* | hpux10* | hpux11*)
d195 1
a195 1
@@@@ -12074,7 +12084,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d204 1
a204 1
@@@@ -12198,7 +12208,7 @@@@ sco3.2v5*)
d213 14
a226 1
@@@@ -14968,9 +14978,10 @@@@ beos*)
d239 1
a239 1
@@@@ -15086,15 +15097,15 @@@@ kfreebsd*-gnu)
d261 1
a261 1
@@@@ -15173,12 +15184,7 @@@@ hpux9* | hpux10* | hpux11*)
d275 1
a275 1
@@@@ -15214,7 +15220,7 @@@@ linux*oldld* | linux*aout* | linux*coff*
d284 1
a284 1
@@@@ -15338,7 +15344,7 @@@@ sco3.2v5*)
d293 13
@


1.31
log
@Fix the installation of libltdl on non-NetBSD platforms and correct a
typo in version_type for BSD/OS.

PKGREVISION++
@
text
@d3 1
a3 1
--- configure.orig	2004-01-25 12:36:38.000000000 +0000
d119 134
@


1.30
log
@The long awaited update libtool to 1.5.2.

Some pkgsrc things
	- Fix PLISTs for packages that use -release
	- Include canonicalisation of a couple of paths for the benefit
	  of qt3-*
	- the normal version=sunos patching
	- fix all library_names_spec for the standard set of symlinks

The libtool things some of which had already made it into pkgsrc libtool.

New in 1.5.2: 2004-01-25; CVS version 1.5.0a, Libtool team:
* lt_dlrealloc is an official part of the libltdl API.
* --tag, --silent and --debug options are preserved and reused when libtool
  calls itself for relinking etc.
* `-pthread' and similar options are honoured when linking shared libraries.
* -no-suppress in compile mode shows compiler output for both PIC and non-PIC
  object compilation.
* New link mode option `-precious-files-regex' to prevent accidental removal
  of files you want to keep, such as test coverage data, from the temporary
  output directory.
* Directories specified in /etc/ld.so.conf are no longer hardcoded on Linux.
* Recognises the 'R' symbol type on Solaris so read-only symbols can be
  exported.
* Bug fixes.

New in 1.5: 2003-04-14; CVS version 1.4e, Libtool team:
* First stable release of multi-language architecture.
* libtool and libltdl support for Mac OS/X.
* libltdl will now use cygwins dlopen API instead of always forcing
  LoadLibrary.
* Support auto-import patch to binutils on cygwin for much improved dll
  support.
* Bug fixes.

New in 1.4.3: 2002-10-13; CVS version 1.4.2a, Robert Boehne:
* The libltdl subdirectory now bootstraps correctly with Automake 1.5.
* srcdir != builddir builds with Automake 1.5 work correctly.
* Support for mips-compaq-nonstopux.
* New command line argument, --preserve-dup-deps prevents removal of
  duplicate dependent libraries.

New in 1.4d: 2002-01-07; CVS version 1.4c, Libtool team:
* Help strings display correctly again.
* Better error messages when library linking fails.
* Better error messages from libltdl when loading fails.
* Better search path management in libltdl with `lt_dlinsertsearchdir' call.
* Support /lib/w32api in recent cygwin releases.
* Support cross compilation to mingw.
* Support for .rc files (Windows resource compiler).
* Improved handling of mingw gcc.
* Improved handling of $PATH with entries containing spaces.
* Improved support for linking with gcc on aix4* and aix5*.
* Improved support for GCC 3.0.
* Initial support for QNX RTOS, UnixWare 7 and OpenUNIX 8.
* Bug fixes to the OpenBSD port.
* Bug fixes.

New in 1.4.2: 2001-09-11; CVS version 1.4.1a, Gary V. Vaughan:
* libltdl now builds on solaris again
* diagnose and warn about not-quite-working combinations of gcc and
  ld on solaris.
* Improved OpenBSD support.
* Improved cygwin support.
* Bugfixes.

New in 1.4.1: 2001-09-03; CVS version 1.4.0a, Libtool team:
* Better error messages from libltdl when loading fails.
* Don't leave here-doc files behind.
* Improved support for OpenBSD.
* Libtool will build with autoconf-2.50 and higher.
* Plug memory management bugs in libltdl.
* Prefer shl_load to dlopen for better operation on HP-UX.

New in 1.4b: 2001-07-09; CVS version 1.4a, Libtool team:
* Now bootstraps with autoconf-2.50 and automake-1.4-p4.
* Always try to build at least a static lib, even if both static and
  shared libs were disabled.
* Full support for C++ compiler.
* Support for GNU gcj compiler.
* libltdl can now load all modules in a given path according to user
  supplied criteria with `lt_dlforeachfile' call.
* Improved support for AIX ia64, djgpp, HPUX, hurd, OpenBSD, sco3.2*.
* Internal mutex handling no longer has namespace clashes on NCR MP-RAS.
* New pdemo and tagdemo tests.
* Bug fixes.
@
text
@d30 1
a30 1
+  version_type=sunox
@


1.29
log
@make the library names we create on Darwin be consistent with what
pkgsrc expects and what other platforms use.

note that we can't simply use version_type=sunos, since the Darwin
linker requires libtool to pass -compatibility_version and
-current_version so they are coded into the library header.

this fixes the problem of having libname.x.dylib files which were not
registered in the PLIST, and thus were leftover after package removal.

ok'd by jlam.
@
text
@d3 14
a16 7
--- ltmain.sh.orig	2001-06-14 14:06:50.000000000 +1000
+++ ltmain.sh
@@@@ -211,6 +211,8 @@@@ do
   --mode) prevopt="--mode" prev=mode ;;
   --mode=*) mode="$optarg" ;;
 
+  --preserve-dup-deps) duplicate_deps="yes" ;;
d18 94
a111 32
   --quiet | --silent)
     show=:
     ;;
@@@@ -256,7 +258,7 @@@@ if test -z "$show_help"; then
   # Infer the operation mode.
   if test -z "$mode"; then
     case $nonopt in
-    *cc | *++ | gcc* | *-gcc*)
+    *cc | *++ | gcc* | *-gcc* | *CC)
       mode=link
       for arg
       do
@@@@ -494,11 +496,21 @@@@ if test -z "$show_help"; then
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) ;;
+      "$CC "*) tagname=CC ;;
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
+      "`$echo $CC` "*) tagname=CC ;;
+      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
+	   case $base_compiler in
+	   *cc)	tagname=CC ;;
+	   *++)
+	     tagname=CXX
+	     eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	     ;;
+	   esac ;;
+      esac
d113 6
a118 157
+    if test -n "$available_tags" && test -z "$tagname"; then
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@@@ -528,8 +540,6 @@@@ if test -z "$show_help"; then
 #        else
 #          echo "$modename: using $tagname tagged configuration"
         fi
-	;;
-      esac
     fi
 
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
@@@@ -1528,11 +1538,21 @@@@ EOF
     # command doesn't match the default compiler.
     if test -n "$available_tags" && test -z "$tagname"; then
       case $base_compile in
-      "$CC "*) ;;
+      "$CC "*) tagname=CC ;;
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when ltconfig was run.
-      "`$echo $CC` "*) ;;
-      *)
+      "`$echo $CC` "*) tagname=CC ;;
+      *)   base_compiler=`echo $base_compile | awk '{ print $1 }'`
+	   case $base_compiler in
+	   *cc)	tagname=CC ;;
+	   *++)
+	     tagname=CXX
+	     eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	     ;;
+	   esac ;;
+      esac
+    fi
+    if test -n "$available_tags" && test -z "$tagname"; then
         for z in $available_tags; do
           if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
 	    # Evaluate the configuration.
@@@@ -1562,8 +1582,6 @@@@ EOF
 #       else
 #         echo "$modename: using $tagname tagged configuration"
         fi
-	;;
-      esac
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@@@ -1619,9 +1637,11 @@@@ EOF
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
       case "$libs " in
       *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
       esac
+      fi
       libs="$libs $deplib"
     done
 
@@@@ -1632,12 +1652,14 @@@@ EOF
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
+      if test "X$duplicate_deps" = "Xyes" ; then
       for pre_post_dep in $predeps $postdeps; do
         case "$pre_post_deps " in
 	*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
 	esac
 	pre_post_deps="$pre_post_deps $pre_post_dep"
       done
+      fi
       pre_post_deps=
     fi
 
@@@@ -1861,9 +1883,11 @@@@ EOF
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
+              fi
 	      tmp_libs="$tmp_libs $deplib"
 	    done
 	  elif test $linkmode != prog && test $linkmode != lib; then
@@@@ -1986,9 +2010,11 @@@@ EOF
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
 	    case "$tmp_libs " in
 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	    esac
+	    fi
 	    tmp_libs="$tmp_libs $deplib"
 	  done # for deplib
 	  continue
@@@@ -2287,9 +2313,11 @@@@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
 	    case "$tmp_libs " in
 	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	    esac
+	    fi
 	    tmp_libs="$tmp_libs $deplib"
 	  done
 
@@@@ -2564,8 +2592,8 @@@@ EOF
 	darwin)
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
+	  major=".$current"
+	  versuffix=".$current.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
@@@@ -2582,7 +2610,7 @@@@ EOF
 	  ;;
 
 	irix)
-	  major=`expr $current - $age + 1`
+	  major=`expr $current - $age`
 	  verstring="sgi$major.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
@@@@ -2642,7 +2670,16 @@@@ EOF
 	# Clear the version info if we defaulted, and they specified a release.
 	if test -z "$vinfo" && test -n "$release"; then
 	  major=
-	  verstring="0.0"
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
 	  if test "$need_version" = no; then
 	    versuffix=
 	  else
@@@@ -5053,7 +5090,7 @@@@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd='"$cmd"$args'
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
@


1.28
log
@set need_version=no on Darwin, from libtool 1.4.3.

This should fix PR 19271 from Jason Thorpe.

ok'd by nick.
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Thu Jun 14 14:06:50 2001
d154 11
@


1.27
log
@When checking for operation mode, add a case for 'CC', Irix' C++ compiler.
(Only apply this change to ltmain.sh, this time! ;-)
@
text
@d1 1
a1 1
$NetBSD: $
d3 3
a5 3
--- ltmain.sh.orig	Thu Jun 14 00:06:50 2001
+++ ltmain.sh	Wed Dec 25 14:29:20 2002
@@@@ -211,6 +211,8 @@@@
d14 1
a14 1
@@@@ -256,7 +258,7 @@@@
d23 1
a23 1
@@@@ -494,11 +496,21 @@@@
d48 1
a48 1
@@@@ -528,8 +540,6 @@@@
d57 1
a57 1
@@@@ -1528,11 +1538,21 @@@@
d82 1
a82 1
@@@@ -1562,8 +1582,6 @@@@
d91 1
a91 1
@@@@ -1619,9 +1637,11 @@@@
d103 1
a103 1
@@@@ -1632,12 +1652,14 @@@@
d118 1
a118 1
@@@@ -1861,9 +1883,11 @@@@
d130 1
a130 1
@@@@ -1986,9 +2010,11 @@@@
d142 1
a142 1
@@@@ -2287,9 +2313,11 @@@@
d154 1
a154 1
@@@@ -2582,7 +2610,7 @@@@
d163 19
a181 1
@@@@ -5053,7 +5081,7 @@@@
@


1.26
log
@Make sure that shlibs built on IRIX use the same major version number as on
others.
@
text
@d4 1
a4 1
+++ ltmain.sh	Mon Dec 23 13:23:11 2002
d14 9
@


1.25
log
@Fix a bug when inferring the CXX tag which meant that for certain
libraries the following could occur

	- a.out platforms: c++rt0.o would be missing and therefore
	  global contstructors would not work.

	- ELF platforms libstdc++ and libm would not be explicitly
	  linked in.

This affected notably libqt and explains the build failure of kdelibs2 on
arm32.

Bump PKGREVISION and require it.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- ltmain.sh.orig	Thu Jun 14 05:06:50 2001
+++ ltmain.sh
a85 3
-      case "$libs " in
-      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-      esac
d87 3
a89 3
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
a97 6
-      for pre_post_dep in $predeps $postdeps; do
-        case "$pre_post_deps " in
-	*" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	esac
-	pre_post_deps="$pre_post_deps $pre_post_dep"
-      done
d99 6
a104 6
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
a112 3
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
d114 3
a116 3
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
a124 3
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
d126 3
a128 3
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
a136 3
-	    case "$tmp_libs " in
-	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	    esac
d138 3
a140 3
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
d145 9
@


1.24
log
@Pull in a change from libtool-current that changes the dependency
recording strategy and a flag (--preserve-dup-deps) to provide the old
stratey if needed. The new strategy reduces the length of the
dependency_libs information stored in .la files and therefore the length
of link lines. This has a positive effect on performance.

Pull across the documentation updates for the change.

Bump the PKGREVISION.

This was tested by building and running both KDE and Gnome.
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Mon Feb 18 17:38:48 2002
d14 1
a14 1
@@@@ -494,11 +496,18 @@@@
d28 4
a31 1
+	   *++)	tagname=CXX ;;
d39 1
a39 1
@@@@ -528,8 +537,6 @@@@
d48 1
a48 1
@@@@ -1528,11 +1535,18 @@@@
d62 4
a65 1
+	   *++)	tagname=CXX ;;
d73 1
a73 1
@@@@ -1562,8 +1576,6 @@@@
d82 1
a82 1
@@@@ -1619,9 +1631,11 @@@@
d97 1
a97 1
@@@@ -1632,12 +1646,14 @@@@
d118 1
a118 1
@@@@ -1861,9 +1877,11 @@@@
d133 1
a133 1
@@@@ -1986,9 +2004,11 @@@@
d148 1
a148 1
@@@@ -2287,9 +2307,11 @@@@
d163 1
a163 1
@@@@ -5053,7 +5075,7 @@@@
@


1.23
log
@Fix --mode=execute quoting problem.

Bump to nb2. Fix has been sent to libtool maintainers.
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Thu Jun 14 05:06:50 2001
d5 10
a14 1
@@@@ -494,11 +494,18 @@@@
d36 1
a36 1
@@@@ -528,8 +535,6 @@@@
d45 1
a45 1
@@@@ -1528,11 +1533,18 @@@@
d67 1
a67 1
@@@@ -1562,8 +1574,6 @@@@
d76 82
a157 1
@@@@ -5053,7 +5063,7 @@@@
@


1.22
log
@Update libtool to a newer snapshot.

Notable changes are:

	* Fix memory leak in libltdl
	* Handle large dependency_libs entries in .la files better
	* Integration of a lot of the NetBSD changes
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Wed May 23 05:05:43 2001
d67 9
@


1.21
log
@If a tag has not been given, and we're using a compiler which is not one
of the ones with which libtool was built, attempt to infer the compiler
from the first word of the command line passed to libtool.

We only reach this test if libtool is about to die with a message about
lacking a specific tag, so this change is the least intrusive that can
be made.

This means that different CC options can now be recognised when compiling.

Bump version number to nb6
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.20 2001/04/03 17:06:17 skrll Exp $
d3 8
a10 3
--- ltmain.sh.orig	Mon Feb 19 05:05:23 2001
+++ ltmain.sh	Wed May  9 11:13:29 2001
@@@@ -484,7 +484,14 @@@@
d13 1
a13 1
       "`$echo $CC` "*) ;;
d15 1
d27 1
a27 1
@@@@ -514,8 +521,6 @@@@
d36 6
a41 1
@@@@ -1423,7 +1428,14 @@@@
d44 1
a44 1
       "`$echo $CC` "*) ;;
d46 1
d58 1
a58 1
@@@@ -1453,8 +1465,6 @@@@
a66 78
@@@@ -2397,7 +2407,7 @@@@
 
 	# Check that each of the things are valid numbers.
 	case "$current" in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@@@ -2406,7 +2416,7 @@@@
 	esac
 
 	case "$revision" in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@@@ -2415,7 +2425,7 @@@@
 	esac
 
 	case "$age" in
-	0 | [1-9] | [1-9][0-9]*) ;;
+	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
 	*)
 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@@@ -2612,6 +2622,9 @@@@
 	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
+          *-*-netbsd*)
+            # Don't link with libc until the a.out ld.so is fixed.
+            ;;
 	  *)
  	    # Add libc to deplibs on all other systems if necessary.
  	    if test $build_libtool_need_lc = "yes"; then
@@@@ -2771,6 +2784,40 @@@@
 	    fi
 	  done # Gone through all deplibs.
 	  ;;
+        match_pattern*)
+          set dummy $deplibs_check_method
+          match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+          for a_deplib in $deplibs; do
+            name="`expr $a_deplib : '-l\(.*\)'`"
+            # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" -a "$name" != "0"; then
+              libname=`eval \\$echo \"$libname_spec\"`
+              for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+                potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                for potent_lib in $potential_libs; do
+                  if eval echo \"$potent_lib\" 2>/dev/null \
+                      | sed 10q \
+                      | egrep "$match_pattern_regex" > /dev/null; then
+                    newdeplibs="$newdeplibs $a_deplib"
+                    a_deplib=""
+                    break 2
+                  fi
+                done
+              done
+              if test -n "$a_deplib" ; then
+                droppeddeps=yes
+                echo
+                echo "*** Warning: This library needs some functionality provided by $a_deplib."
+                echo "*** I have the capability to make that library automatically link in when"
+                echo "*** you link to this library.  But I can only do this if you have a"
+                echo "*** shared version of the library, which you do not appear to have."
+              fi
+            else
+              # Add a -L argument.
+              newdeplibs="$newdeplibs $a_deplib"
+            fi
+          done # Gone through all deplibs.
+          ;;
 	none | unknown | *)
 	  newdeplibs=""
 	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
@


1.20
log
@Implement a new deplibs_check_method called match_pattern and use it.

The use of file(1) was always disliked and it proved to cause problems
on some platforms.

Fixes pkg/12516 from Dam McMahill <mcmahill@@mtl.mit.edu>
@
text
@d1 1
a1 1
$NetBSD$
d4 52
a55 2
+++ ltmain.sh
@@@@ -2397,7 +2397,7 @@@@
d64 1
a64 1
@@@@ -2406,7 +2406,7 @@@@
d73 1
a73 1
@@@@ -2415,7 +2415,7 @@@@
d82 1
a82 1
@@@@ -2612,6 +2612,9 @@@@
d92 1
a92 1
@@@@ -2771,6 +2774,40 @@@@
@


1.19
log
@Re-enable the -release option of libtool. ELF is fully supported with a.out
support to follow. Note this in documentation.

Bump revision of libtool to nb3 and update dependencies.

Update (sort) known affected PLISTs.

Fixes pkg/12368 by Kimmo Suominen <kim@@tac.nyc.ny.us>
Fixes problems with cross/* noted on tech-pkg and packages by
	Chuck Cranor <chuck@@research.att.com>, and
	Thomas Klausner <wiz@@danbala.ifoer.tuwien.ac.at>
@
text
@d42 41
@


1.18
log
@Revert previous change it didn't work. Instead force the inclusion of a
CC tag configuration so that --tag=CC works.
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Wed Feb 28 17:56:25 2001
d5 1
a5 9
@@@@ -946,7 +946,6 @@@@
 	  continue
 	  ;;
 	release)
-	  release="-$arg"
 	  prev=
 	  continue
 	  ;;
@@@@ -2397,7 +2396,7 @@@@
d14 1
a14 1
@@@@ -2406,7 +2405,7 @@@@
d23 1
a23 1
@@@@ -2415,7 +2414,7 @@@@
d32 1
a32 1
@@@@ -2612,6 +2611,9 @@@@
@


1.17
log
@Fall back to the default configuration when unable to infer a tag.

This helps with c compilers that libtool doesn't recognise.

Bump the revision.
@
text
@d3 1
a3 1
--- ltmain.sh.orig	Mon Feb 19 05:05:23 2001
d5 1
a5 13
@@@@ -508,9 +508,8 @@@@
         # was found and let the user know that the "--tag" command
         # line option must be used.
         if test -z "$tagname"; then
-          echo "$modename: unable to infer tagged configuration"
-          echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
+          echo "$modename: warning: unable to infer tagged configuration" 1>&2
+          echo "$modename: warning: using the default" 1>&2
 #        else
 #          echo "$modename: using $tagname tagged configuration"
         fi
@@@@ -946,7 +945,6 @@@@
d13 1
a13 13
@@@@ -1447,9 +1445,8 @@@@
         # was found and let the user know that the "--tag" command
         # line option must be used.
         if test -z "$tagname"; then
-          echo "$modename: unable to infer tagged configuration"
-          echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
+          echo "$modename: warning: unable to infer tagged configuration"
+          echo "$modename: warning: using the default" 1>&2
 #       else
 #         echo "$modename: using $tagname tagged configuration"
         fi
@@@@ -2397,7 +2394,7 @@@@
d22 1
a22 1
@@@@ -2406,7 +2403,7 @@@@
d31 1
a31 1
@@@@ -2415,7 +2412,7 @@@@
d40 1
a40 1
@@@@ -2612,6 +2609,9 @@@@
@


1.16
log
@Update libtool to be based on a CVS snapshot of the multi-language branch
@
text
@d5 13
a17 1
@@@@ -946,7 +946,6 @@@@
d25 13
a37 1
@@@@ -2397,7 +2396,7 @@@@
d46 1
a46 1
@@@@ -2406,7 +2405,7 @@@@
d55 1
a55 1
@@@@ -2415,7 +2414,7 @@@@
d64 1
a64 1
@@@@ -2612,6 +2611,9 @@@@
@


1.15
log
@Improve argument checking for -version-info. Bump to nb11.
@
text
@d3 11
a13 37
--- ltmain.in.orig	Sat May 27 02:53:15 2000
+++ ltmain.in
@@@@ -819,6 +819,7 @@@@
     old_convenience=
     deplibs=
     linkopts=
+    wllinkopts=
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
@@@@ -1154,6 +1155,25 @@@@
 	continue
 	;;
 
+      -Wl,*)
+       args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+       arg=
+       IFS="${IFS=     }"; save_ifs="$IFS"; IFS=','
+       for flag in $args; do
+         IFS="$save_ifs"
+         case "$flag" in
+           *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+           flag="\"$flag\""
+           ;;
+         esac
+         arg="$arg $wl$flag"
+         linkopts="$linkopts $flag"
+         wllinkopts="$wllinkopts $wl$flag"
+       done
+       IFS="$save_ifs"
+       arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+       ;;
+
       # Some other compiler flag.
       -* | +*)
 	# Unknown arguments in both finalize_command and compile_command need
@@@@ -1656,7 +1676,7 @@@@
d22 1
a22 1
@@@@ -1665,7 +1685,7 @@@@
d31 1
a31 1
@@@@ -1674,7 +1694,7 @@@@
d40 10
a49 44
@@@@ -1772,7 +1792,7 @@@@
 	fi
 
 	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
+	if test "$avoid_version" = yes; then
 	  major=
 	  versuffix=
 	  verstring=""
@@@@ -1799,6 +1819,9 @@@@
 	  # rhapsody is a little odd...
 	  deplibs="$deplibs -framework System"
 	  ;;
+        *-*-netbsd*)
+	  # Don't link with libc until the a.out ld.so is fixed.
+	  ;;
 	*)
 	  # Add libc to deplibs on all other systems.
 	  deplibs="$deplibs -lc"
@@@@ -2103,6 +2126,16 @@@@
 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
 	fi
 
+	# Check whether we need to link in c++rt0.o on a.out because of
+	# constructors/destructors
+	if test -n "$ctor_check_cmd"; then
+	  eval cmd=\"$ctor_check_cmd\"
+	  #$show "$cmd"
+	  if $run eval "$cmd" ; then
+	    cppopts="$cpprt0"
+	  fi
+	fi
+
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec"; then
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
@@@@ -2146,6 +2179,7 @@@@
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linkopts="$linkopts $flag"
+          wllinkopts="$wllinkopts $wl$flag"
 	fi
 
 	# Do each of the archive commands.
@


1.14
log
@Move check for C++ contructors/destructors to occur earlier to prevent
passing $whole_archive_flag_spec to nm.
@
text
@d3 1
a3 1
--- ltmain.in.orig	Fri May 26 21:53:15 2000
d39 27
@


1.13
log
@On a.out systems link shared libraries against c++rt0.o only if there
actually are CTORS/DTORS in the objects that go into the library.

This makes pkgsrc under 1.3.x not blow up on C libraries that were built
with libtool.  E.g. everything that linked against -lintl would dump core.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.12 2000/11/26 11:22:40 mycroft Exp $
d3 2
a4 2
--- ltmain.in.orig0	Sat May 27 03:53:15 2000
+++ ltmain.in	Tue Jan  9 19:21:17 2001
d58 4
a61 7
@@@@ -2146,6 +2169,17 @@@@
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linkopts="$linkopts $flag"
+          wllinkopts="$wllinkopts $wl$flag"
+	fi
+
d70 10
@


1.12
log
@*SIGH*
The previous patch could cause problems in a couple of oddball cases.
So, set need_version=yes for a.out, and hack avoid-version so it works on
a.out platforms.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- ltmain.in.orig	Sat May 27 01:53:15 2000
+++ ltmain.in	Sun Nov 26 11:19:57 2000
d58 1
a58 1
@@@@ -2146,6 +2169,7 @@@@
d63 10
@


1.11
log
@Depreciate use of cc -shared as test and cc as linker in a.out case.
Bump to nb5.

This fixes PR/10908.
@
text
@d3 2
a4 2
--- ltmain.in.orig	Sat May 27 02:53:15 2000
+++ ltmain.in
d39 20
a58 1
@@@@ -2146,6 +2166,7 @@@@
@


1.10
log
@Fix aout brokenness.  Bump libtool to 1.3.5nb3.
@
text
@d3 2
a4 2
--- ltmain.in.orig	Sat May 27 03:53:15 2000
+++ ltmain.in	Sun Jun  4 19:33:08 2000
@


1.9
log
@Prepend '-Wl,' to linker flags so compiler frontend doesn't choke on
unknown linker switches.  Patch provided by Dave Sainty in private mail.
Bump libtool to 1.3.5nb2
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.8 2000/06/01 09:36:47 rh Exp $
d4 10
a13 2
+++ ltmain.in	Thu Jun  1 11:21:17 2000
@@@@ -1154,6 +1154,24 @@@@
d29 2
a30 1
+         linkopts="$linkopts $wl$flag"
d39 8
@


1.8
log
@Pull in some of the libtool-current changes to handle -Wl linker options,
making runtime library path settings work again.
Bump version to 1.3.5nb1
@
text
@d1 1
a1 1
$NetBSD$
d21 1
a21 1
+         linkopts="$linkopts $flag"
@


1.7
log
@Switch USE_LIBTOOL pkgs to use pkglibtool, and revert libtool back to a
"vanilla" libtool (pkg now called glibtool) that understands NetBSD ELF.
@
text
@d1 1
a1 1
$NetBSD: patch-ab,v 1.6 1998/08/07 10:40:26 agc Exp $
d3 5
a7 5
--- ltmain.sh.orig	Tue Jul 21 16:59:33 1998
+++ ltmain.sh	Tue Jul 21 17:02:42 1998
@@@@ -144,6 +144,8 @@@@
     prev=execute_dlfiles
     ;;
d9 17
a25 1
+  --install-la) install_la="yes" ;;
d27 3
a29 32
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
@@@@ -1841,10 +1843,12 @@@@
           IFS="$save_ifs"
         fi
 
+if test -n "$install_la"; then
         # Install the pseudo-library for information purposes.
         name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
         $show "$install_prog $file $destdir/$name"
         $run eval "$install_prog $file $destdir/$name" || exit $?
+fi
 
         # Maybe install the static library, too.
         test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@@@ -1912,6 +1916,7 @@@@
             exit 1
           fi
 
+if test -n "$install_la"; then
           finalize=yes
           for lib in $link_against_libtool_libs; do
             # Check to see that each library is installed.
@@@@ -1932,6 +1937,7 @@@@
               finalize=no
             fi
           done
+fi
 
           if test "$hardcode_action" = relink; then
             if test "$finalize" = yes; then
@


1.6
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
@


1.5
log
@Add the option --install-la to libtool (ignored except during
installation) which will enable the GNU libtool behavior of installing the
.la files.  Needed by KDE for the kdelibs and kdesupport.
@
text
@d1 2
@


1.4
log
@Eliminate ".la file is not installed" warnings - our linker doesn't
require relinking of .so-linked objects, so do not worry about
finalization.
@
text
@d1 12
a12 3
--- ltmain.sh.orig	Fri Mar 20 03:00:29 1998
+++ ltmain.sh	Fri Jul 17 10:41:15 1998
@@@@ -1841,11 +1841,6 @@@@
d16 7
a22 5
-        # Install the pseudo-library for information purposes.
-        name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-        $show "$install_prog $file $destdir/$name"
-        $run eval "$install_prog $file $destdir/$name" || exit $?
-
d25 1
a25 2
         ;;
@@@@ -1912,26 +1907,7 @@@@
d29 9
a37 21
-          finalize=yes
-          for lib in $link_against_libtool_libs; do
-            # Check to see that each library is installed.
-            libdir=
-            if test -f "$lib"; then
-              # If there is no directory component, then add one.
-              case "$lib" in
-              */* | *\\*) . $lib ;;
-              *) . ./$lib ;;
-              esac
-            fi
-            libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
-            if test -z "$libdir"; then
-              $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
-            elif test -f "$libfile"; then :
-            else
-              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-              finalize=no
-            fi
-          done
+          finalize=no
@


1.3
log
@Change libtool _not_ to install the .la file.  Though marked as "for
informational purposes," it's not used by any of the toolchain and is
pretty much useless.
@
text
@d1 2
a2 2
--- ltmain.sh.orig	Thu Jul 16 09:15:18 1998
+++ ltmain.sh	Thu Jul 16 09:15:44 1998
d15 28
@


1.2
log
@Add and activate libtool (with a.out and ELF support), a GNU utility for
making static and shared libraries in a machine-independent fashion.
@
text
@d1 14
a14 11
--- doc/Makefile.in.orig	Fri Mar 20 17:01:52 1998
+++ doc/Makefile.in	Mon Apr 27 17:22:55 1998
@@@@ -56,7 +56,7 @@@@
 LD = @@LD@@
 LIBTOOL = @@LIBTOOL@@
 LN_S = @@LN_S@@
-MAKEINFO = @@MAKEINFO@@
+MAKEINFO = @@MAKEINFO@@ --no-split
 NM = @@NM@@
 PACKAGE = @@PACKAGE@@
 RANLIB = @@RANLIB@@
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import of FreeBSD's libtool pkg (patches to follow).
@
text
@@