--- a/aclocal.m4	Mon Aug 13 11:12:06 2007 +0200
+++ b/aclocal.m4	Mon Aug 13 11:13:30 2007 +0200
@@ -92,7 +92,7 @@
     # PIC is the default for these OSes.
     ;;
 
-  os2*)
+  aix3* | aix4* | os2*)
     # We can build DLLs from non-PIC.
     ;;
   amigaos*)
@@ -108,7 +108,7 @@
 else
   # PORTME Check for PIC flags for the system compiler.
   case "$xehost_os" in
-  hpux9* | hpux10*)
+  hpux9* | hpux1[[0-9]]*)
     # Is there a better link_static_flag that works with the bundled CC?
     wl='-Wl,'
     dll_cflags='+Z'
@@ -568,7 +568,11 @@
     ld_dynamic_link_flags=
     ;;
 
-  sco3.2v5* | unixware* | sysv5* | sysv4* | solaris2* | solaris7*)
+  solaris2* | solaris7*)
+    ld_dynamic_link_flags=
+    ;;
+
+  sco3.2v5* | unixware* | sysv5* | sysv4*)
     ld_dynamic_link_flags="${wl}-Bexport"
     ;;