*** ltconfig.ORIG	Sat Nov  1 22:23:08 2008
--- ltconfig	Sat Nov  1 22:23:58 2008
***************
*** 696,702 ****
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4*)
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
--- 696,702 ----
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4* | aix5* )
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
***************
*** 1115,1121 ****
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
--- 1115,1121 ----
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4* | aix5*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
***************
*** 1277,1283 ****
      fi
      ;;
  
!   aix4*)
      hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
      hardcode_libdir_separator=':'
      if test "$with_gcc" = yes; then
--- 1277,1283 ----
      fi
      ;;
  
!   aix4* | aix5*)
      hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
      hardcode_libdir_separator=':'
      if test "$with_gcc" = yes; then
***************
*** 1305,1311 ****
      allow_undefined_flag=' ${wl}-berok'
      archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
      archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!     case "$host_os" in aix4.[01]|aix4.[01].*)
        # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
        always_export_symbols=yes ;;
      esac
--- 1305,1311 ----
      allow_undefined_flag=' ${wl}-berok'
      archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
      archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!     case "$host_os" in aix4.[01]|aix4.[01].*|aix5*)
        # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
        always_export_symbols=yes ;;
      esac
***************
*** 1819,1825 ****
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
--- 1819,1825 ----
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4*|aix5*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
***************
*** 2212,2218 ****
    fi
    ;;
  
! aix4*)
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
--- 2212,2218 ----
    fi
    ;;
  
! aix4*|aix5*)
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
*** ltconfig.ORIG	Sat Nov  1 22:48:18 2008
--- ltconfig	Sat Nov  1 22:48:47 2008
***************
*** 1081,1087 ****
  hardcode_shlibpath_var=unsupported
  runpath_var=
  always_export_symbols=no
! export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
  # include_expsyms should be a list of space-separated symbols to be *always*
  # included in the symbol list
  include_expsyms=
--- 1081,1087 ----
  hardcode_shlibpath_var=unsupported
  runpath_var=
  always_export_symbols=no
! export_symbols_cmds="\$NM -BCpg \$libobjs \$convenience | awk '{ if (((\\\$2 == \"T\") || (\\\$2 == \"D\") || (\\\$2 == \"B\")) && (substr(\\\$3,1,1) != \".\")) { print \\\$3 } }' | sort -u > \$export_symbols"
  # include_expsyms should be a list of space-separated symbols to be *always*
  # included in the symbol list
  include_expsyms=