--- acinclude.m4~	2003-01-12 14:03:14.000000000 -0800
+++ acinclude.m4	2005-08-14 11:25:10.000000000 -0700
@@ -2254,7 +2254,7 @@
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
-    whole_archive_flag_spec='-all_load $convenience'
+    whole_archive_flag_spec='$convenience'
     ;;
 
   freebsd1*)
@@ -3178,6 +3178,15 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# A sed program that does not truncate output.
+SED="/usr/bin/sed"
+
+# An ERE matcher.
+EGREP="grep -E"
+
+# What is the maximum length of a command?
+max_cmd_len=16384
+
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="sed -e s/^X//"
 
@@ -3189,6 +3198,9 @@
 
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
+# Set the command separator (default: ~)
+_S_=${LIBTOOL_CMD_SEP-\~}
+
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
