/[PAMELA software]/yoda/configure

Diff of /yoda/configure

Parent Directory | Revision Log | View Patch Patch

-revision 4.2.2.1.2.1 by kusanagi,
Tue Apr 25 11:26:32 2006 UTC
+revision 5.0 by kusanagi,
Mon Aug 29 09:45:00 2005 UTC
 Line 278 
 fi
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
  if test -z "$ECHO"; then
  if test "X${echo_test_string+set}" != Xset; then
 Line 463 
 ac_includes_default="\
  # include <unistd.h>
  #endif"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LOG4CXX_INCLUDES LOG4CXX_LDFLAGS LOG4CXX_LIBRARY LIBOBJS LTLIBOBJS'
+ ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE F77 FFLAGS ac_ct_F77 FLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL HAS_DOXYFILE ROOT_INCLUDES ROOT_LDFLAGS ROOTCINT LOG4CXX_INCLUDES LOG4CXX_LDFLAGS LOG4CXX_LIBRARY LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  # Initialize some variables set by options.
 Line 1023 
 if test -n "$ac_init_help"; then
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --disable-dependency-tracking Speeds up one-time builds
+   --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
    --enable-shared[=PKGS]
                            build shared libraries [default=yes]
    --enable-static[=PKGS]
 Line 1498 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
- am__api_version="1.7"
+ am__api_version="1.9"
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
 Line 1661 
 _ACEOF
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
  rm conftest.sed
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-Line 1675 
 else
+Line 1674 
 else
  echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+   # 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 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, and then abort because `.' already
+   # exists.
+   for d in ./-p ./--version;
+   do
+     test -d $d && rmdir $d
+   done
+   # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+   if test -f "$ac_aux_dir/mkinstalldirs"; then
+     mkdir_p='$(mkinstalldirs)'
+   else
+     mkdir_p='$(install_sh) -d'
+   fi
+ fi
  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.
-Line 1753 
 else
+Line 1785 
 else
  fi
  rmdir .tst 2>/dev/null
-  # test to see if srcdir already configured
+ # test to see if srcdir already configured
  if test "`cd $srcdir && pwd`" != "`pwd`" &&
     test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-Line 1801 
 AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+Line 1833 
 AUTOHEADER=${AUTOHEADER-"${am_missing_ru
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
- AMTAR=${AMTAR-"${am_missing_run}tar"}
  install_sh=${install_sh-"$am_aux_dir/install-sh"}
  # Installed binaries are usually stripped using `strip' when the user
-Line 1896 
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
+Line 1925 
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
+ # Always define AMTAR for backward compatibility.
+ AMTAR=${AMTAR-"${am_missing_run}tar"}
+ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-Line 2997 
 else
+Line 3033 
 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
-Line 3025 
 else
+Line 3063 
 else
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
-       # (even with -Werror).  So we grep stderr for any message
+       # or remarks (even with -Werror).  So we grep stderr for any message
-       # that says an option was ignored.
+       # that says an option was ignored or not supported.
-       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+       # When given -MP, icc 7.0 and 7.1 complain thusly:
+       #   icc: Command line warning: ignoring option '-M'; no argument required
+       # The diagnosis changed in icc 8.0:
+       #   icc: Command line remark: option '-MP' not supported
+       if (grep 'ignoring option' conftest.err ||
+           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
          am_cv_CC_dependencies_compiler_type=$depmode
          break
        fi
-Line 3151 
 fi
+Line 3194 
 fi
  # Provide some information about the compiler.
- echo "$as_me:3154:" \
+ echo "$as_me:3197:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-Line 3348 
 _ACEOF
+Line 3391 
 _ACEOF
  # flags.
  ac_save_FFLAGS=$FFLAGS
  FFLAGS="$FFLAGS $ac_verb"
- (eval echo $as_me:3351: \"$ac_link\") >&5
+ (eval echo $as_me:3394: \"$ac_link\") >&5
  ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
  echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
-Line 3426 
 _ACEOF
+Line 3469 
 _ACEOF
  # flags.
  ac_save_FFLAGS=$FFLAGS
  FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
- (eval echo $as_me:3429: \"$ac_link\") >&5
+ (eval echo $as_me:3472: \"$ac_link\") >&5
  ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
  echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
-Line 3996 
 else
+Line 4039 
 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
-Line 4024 
 else
+Line 4069 
 else
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
-       # (even with -Werror).  So we grep stderr for any message
+       # or remarks (even with -Werror).  So we grep stderr for any message
-       # that says an option was ignored.
+       # that says an option was ignored or not supported.
-       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+       # When given -MP, icc 7.0 and 7.1 complain thusly:
+       #   icc: Command line warning: ignoring option '-M'; no argument required
+       # The diagnosis changed in icc 8.0:
+       #   icc: Command line remark: option '-MP' not supported
+       if (grep 'ignoring option' conftest.err ||
+           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
          am_cv_CXX_dependencies_compiler_type=$depmode
          break
        fi
-Line 4154 
 lt_ac_count=0
+Line 4204 
 lt_ac_count=0
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-   test ! -f $lt_ac_sed && continue
+   test ! -f $lt_ac_sed && break
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-Line 4179 
 for lt_ac_sed in $lt_ac_sed_list /usr/xp
+Line 4229 
 for lt_ac_sed in $lt_ac_sed_list /usr/xp
      fi
    done
  done
+ SED=$lt_cv_path_SED
  fi
- SED=$lt_cv_path_SED
  echo "$as_me:$LINENO: result: $SED" >&5
  echo "${ECHO_T}$SED" >&6
-Line 4323 
 case $reload_flag in
+Line 4373 
 case $reload_flag in
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
-   darwin*)
-     if test "$GCC" = yes; then
-       reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-     else
-       reload_cmds='$LD$reload_flag -o $output$reload_objs'
-     fi
-     ;;
- esac
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-Line 4418 
 beos*)
+Line 4459 
 beos*)
    lt_cv_deplibs_check_method=pass_all
    ;;
- bsdi[45]*)
+ 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
-Line 4441 
 darwin* | rhapsody*)
+Line 4482 
 darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | kfreebsd*-gnu)
    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|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/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.*`
        ;;
-Line 4491 
 irix5* | irix6* | nonstopux*)
+Line 4532 
 irix5* | irix6* | nonstopux*)
  # This must be Linux ELF.
  linux*)
+   case $host_cpu in
+   alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
    lt_cv_deplibs_check_method=pass_all
    ;;
-Line 4513 
 nto-qnx*)
+Line 4563 
 nto-qnx*)
    ;;
  openbsd*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
    else
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+     lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
    fi
    ;;
-Line 4609 
 ia64-*-hpux*)
+Line 4661 
 ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
-   echo '#line 4612 "configure"' > conftest.$ac_ext
+   echo '#line 4664 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-Line 4647 
 ia64-*-hpux*)
+Line 4699 
 ia64-*-hpux*)
  x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
+   lt_cv_cc_lib64_suffix=no
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-     case "`/usr/bin/file conftest.o`" in
+     case "`/usr/bin/file conftest.$ac_objext`" in
      *32-bit*)
        case $host in
          x86_64-*linux*)
-Line 4673 
 x86_64-*linux*|ppc*-*linux*|powerpc*-*li
+Line 4726 
 x86_64-*linux*|ppc*-*linux*|powerpc*-*li
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
+           lt_cv_cc_lib64_suffix=yes
            ;;
          ppc*-*linux*|powerpc*-*linux*)
            LD="${LD-ld} -m elf64ppc"
+           lt_cv_cc_lib64_suffix=yes
            ;;
          s390*-*linux*)
            LD="${LD-ld} -m elf64_s390"
+           lt_cv_cc_lib64_suffix=yes
            ;;
          sparc*-*linux*)
            LD="${LD-ld} -m elf64_sparc"
+           lt_cv_cc_lib64_suffix=yes
            ;;
        esac
        ;;
-Line 5394 
 fi
+Line 5451 
 fi
  done
+ ac_ext=cc
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
-   ac_ext=cc
  ac_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'
-Line 5629 
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+Line 5681 
 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
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-Line 5677 
 else
+Line 5727 
 else
      lt_cv_sys_max_cmd_len=8192;
      ;;
-   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`
-     elif test -x /usr/sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-     else
-       lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-     fi
-     # And add a safety zone
-     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-     ;;
-   osf*)
-     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-     # nice to cause kernel panics so lets avoid the loop below.
-     # First set a reasonable default.
-     lt_cv_sys_max_cmd_len=16384
-     #
-     if test -x /sbin/sysconfig; then
-       case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-         *1*) lt_cv_sys_max_cmd_len=-1 ;;
-       esac
-     fi
-     ;;
-   *)
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
-     SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+     while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-     while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
                 = "XX$teststring") >/dev/null 2>&1 &&
              new_result=`expr "X$teststring" : ".*" 2>&1` &&
              lt_cv_sys_max_cmd_len=$new_result &&
-Line 5754 
 symcode='[BCDEGRST]'
+Line 5777 
 symcode='[BCDEGRST]'
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ # Transform the above into a raw symbol and a C symbol.
+ symxfrm='\1 \2\3 \3'
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-Line 5775 
 hpux*) # Its linker distinguishes data f
+Line 5801 
 hpux*) # Its linker distinguishes data f
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
- linux*)
-   if test "$host_cpu" = ia64; then
-     symcode='[ABCDGIRSTW]'
-     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-     lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   fi
-   ;;
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-Line 5813 
 esac
+Line 5832 
 esac
  # Try without a prefix undercore, then with it.
  for ac_symprfx in "" "_"; do
-   # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-   symxfrm="\\1 $ac_symprfx\\2 \\2"
    # Write the raw and C identifiers.
-   lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+   lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]\($symcode$symcode*\)[         ][      ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
    # Check to see that the pipe works correctly.
    pipe_works=no
-Line 5979 
 esac
+Line 5995 
 esac
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
- Xsed='sed -e 1s/^X//'
+ Xsed='sed -e s/^X//'
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  # Same as above, but do not quote variable references.
-Line 6284 
 if test -n "$RANLIB"; then
+Line 6300 
 if test -n "$RANLIB"; then
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
- for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-Line 6481 
 LTCC=${LTCC-"$CC"}
+Line 6486 
 LTCC=${LTCC-"$CC"}
  compiler=$CC
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
  #
  # Check for any special shared library compilation flags.
  #
-Line 6536 
 else
+Line 6527 
 else
       if test -s conftest.err; then
         # Append any errors to the config.log.
         cat conftest.err 1>&5
-        $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
-        $SED '/^$/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
-          lt_prog_compiler_static_works=yes
-        fi
       else
         lt_prog_compiler_static_works=yes
       fi
-Line 6585 
 else
+Line 6571 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6588: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6574: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:6592: \$? = $ac_status" >&5
+    echo "$as_me:6578: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-Line 6698 
 echo $ECHO_N "checking for $compiler opt
+Line 6682 
 echo $ECHO_N "checking for $compiler opt
          lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-        case $cc_basename in
-          xlc*)
-          lt_prog_compiler_pic='-qnocommon'
-          lt_prog_compiler_wl='-Wl,'
-          ;;
-        esac
-        ;;
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-Line 6743 
 echo $ECHO_N "checking for $compiler opt
+Line 6717 
 echo $ECHO_N "checking for $compiler opt
        ;;
      linux*)
-       case $cc_basename in
+       case $CC in
        icc* | ecc*)
          lt_prog_compiler_wl='-Wl,'
          lt_prog_compiler_pic='-KPIC'
          lt_prog_compiler_static='-static'
          ;;
-       pgcc* | pgf77* | pgf90*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
-         # which looks to be a dead project)
-         lt_prog_compiler_wl='-Wl,'
-         lt_prog_compiler_pic='-fpic'
-         lt_prog_compiler_static='-static'
-         ;;
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-Line 6776 
 echo $ECHO_N "checking for $compiler opt
+Line 6743 
 echo $ECHO_N "checking for $compiler opt
        ;;
      solaris*)
+       lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-       case $cc_basename in
-       f77* | f90* | f95*)
-         lt_prog_compiler_wl='-Qoption ld ';;
-       *)
-         lt_prog_compiler_wl='-Wl,';;
-       esac
        ;;
      sunos4*)
-Line 6805 
 echo $ECHO_N "checking for $compiler opt
+Line 6767 
 echo $ECHO_N "checking for $compiler opt
        fi
        ;;
-     unicos*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_can_build_shared=no
-       ;;
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-Line 6847 
 else
+Line 6804 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6850: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6807: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:6854: \$? = $ac_status" >&5
+    echo "$as_me:6811: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_prog_compiler_pic_works=yes
       fi
     fi
-Line 6909 
 else
+Line 6864 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:6912: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:6867: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:6916: \$? = $ac_status" >&5
+    echo "$as_me:6871: \$? = $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
       # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+      if test ! -s out/conftest.err; then
-      $SED '/^$/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o=yes
       fi
     fi
-Line 7000 
 echo $ECHO_N "checking whether the $comp
+Line 6953 
 echo $ECHO_N "checking whether the $comp
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-Line 7030 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
+Line 6973 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
-     # Set some defaults for GNU ld with shared library support. These
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-     export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-         whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-       else
-         whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-       *\ 2.11.*) ;; # other 2.11 versions
-       *) supports_anon_versioning=yes ;;
-     esac
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-Line 7101 
 EOF
+Line 7023 
 EOF
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
-       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-Line 7119 
 EOF
+Line 7041 
 EOF
        fi
        ;;
-     linux*)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-         tmp_addflag=
-         case $cc_basename,$host_cpu in
-         pgcc*)                          # Portland Group C compiler
-           whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag'
-           ;;
-         pgf77* | pgf90* )                       # Portland Group f77 and f90 compilers
-           whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag -Mnomain' ;;
-         ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-           tmp_addflag=' -i_dynamic' ;;
-         efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-           tmp_addflag=' -i_dynamic -nofor_main' ;;
-         ifc* | ifort*)                  # Intel Fortran compiler
-           tmp_addflag=' -nofor_main' ;;
-         esac
-         archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         if test $supports_anon_versioning = yes; then
-           archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-         fi
-       else
-         ld_shlibs=no
-       fi
-       ;;
      netbsd*)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
          archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-Line 7188 
 EOF
+Line 7079 
 EOF
        hardcode_shlibpath_var=no
        ;;
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         archive_cmds="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+         *\ 2.11.*) ;; # other 2.11 versions
+         *) supports_anon_versioning=yes ;;
+       esac
+       if test $supports_anon_versioning = yes; then
+         archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+         $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+       else
+         archive_expsym_cmds="$tmp_archive_cmds"
+       fi
+     else
+       ld_shlibs=no
+     fi
+     ;;
      *)
        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'
-Line 7198 
 EOF
+Line 7114 
 EOF
        ;;
      esac
-     if test "$ld_shlibs" = no; then
+     if test "$ld_shlibs" = yes; then
-       runpath_var=
+       runpath_var=LD_RUN_PATH
-       hardcode_libdir_flag_spec=
+       hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-       export_dynamic_flag_spec=
+       export_dynamic_flag_spec='${wl}--export-dynamic'
-       whole_archive_flag_spec=
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+         whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec=
+       fi
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-Line 7266 
 EOF
+Line 7187 
 EOF
        link_all_deplibs=yes
        if test "$GCC" = yes; then
-         case $host_os in aix4.[012]|aix4.[012].*)
+         case $host_os in aix4.012|aix4.012.*)
          # We only want to do this on AIX 4.2 and lower, the check
          # below for broken collect2 doesn't work under 4.3+
            collect2name=`${CC} -print-prog-name=collect2`
-Line 7287 
 EOF
+Line 7208 
 EOF
            fi
          esac
          shared_flag='-shared'
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag="$shared_flag "'${wl}-G'
-         fi
        else
          # not using gcc
          if test "$host_cpu" = ia64; then
-Line 7450 
 if test -z "$aix_libpath"; then aix_libp
+Line 7368 
 if test -z "$aix_libpath"; then aix_libp
        ld_shlibs=no
        ;;
-     bsdi[45]*)
+     bsdi4*)
        export_dynamic_flag_spec=-rdynamic
        ;;
-Line 7476 
 if test -z "$aix_libpath"; then aix_libp
+Line 7394 
 if test -z "$aix_libpath"; then aix_libp
        ;;
      darwin* | rhapsody*)
+     if test "$GXX" = yes ; then
+       archive_cmds_need_lc=no
        case "$host_os" in
-         rhapsody* | darwin1.[012])
+       rhapsody* | darwin1.[012])
-          allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         allow_undefined_flag='-undefined suppress'
-          ;;
+         ;;
-        *) # Darwin 1.3 on
+       *) # Darwin 1.3 on
-          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-            allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         allow_undefined_flag='-flat_namespace -undefined suppress'
-          else
+       else
-            case ${MACOSX_DEPLOYMENT_TARGET} in
+         case ${MACOSX_DEPLOYMENT_TARGET} in
 .[012])
-                allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+             allow_undefined_flag='-flat_namespace -undefined suppress'
-                ;;
+             ;;
 .*)
-                allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+             allow_undefined_flag='-undefined dynamic_lookup'
-                ;;
+             ;;
-            esac
+         esac
-          fi
+       fi
-          ;;
+         ;;
        esac
-       archive_cmds_need_lc=no
+         lt_int_apple_cc_single_mod=no
+         output_verbose_link_cmd='echo'
+         if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+           lt_int_apple_cc_single_mod=yes
+         fi
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+         else
+         archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         else
+           archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         fi
+           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}'
        hardcode_direct=no
        hardcode_automatic=yes
        hardcode_shlibpath_var=unsupported
-       whole_archive_flag_spec=''
+       whole_archive_flag_spec='-all_load $convenience'
        link_all_deplibs=yes
-     if test "$GCC" = yes ; then
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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}'
      else
-       case $cc_basename in
+       ld_shlibs=no
-         xlc*)
-          output_verbose_link_cmd='echo'
-          archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-          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}'
-           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}'
-           ;;
-        *)
-          ld_shlibs=no
-           ;;
-       esac
      fi
        ;;
-Line 7555 
 if test -z "$aix_libpath"; then aix_libp
+Line 7473 
 if test -z "$aix_libpath"; then aix_libp
        ;;
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | kfreebsd*-gnu | dragonfly*)
+     freebsd* | kfreebsd*-gnu)
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-Line 7666 
 if test -z "$aix_libpath"; then aix_libp
+Line 7584 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
          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
-Line 7712 
 if test -z "$aix_libpath"; then aix_libp
+Line 7629 
 if test -z "$aix_libpath"; then aix_libp
          allow_undefined_flag=' -expect_unresolved \*'
          archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
          archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
          # Both c and cxx compiler support -rpath directly
          hardcode_libdir_flag_spec='-rpath $libdir'
-Line 7731 
 if test -z "$aix_libpath"; then aix_libp
+Line 7648 
 if test -z "$aix_libpath"; then aix_libp
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
-         wlarc='${wl}'
          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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
-         wlarc=''
          archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
          archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
          $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-Line 7745 
 if test -z "$aix_libpath"; then aix_libp
+Line 7660 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
-       *)
+       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-         # The compiler driver will combine linker options so we
+         whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-         # cannot just pass the convience library names through
-         # without $wl, iff we do not link with $LD.
-         # Luckily, gcc supports the same syntax we need for Sun Studio.
-         # Supported since Solaris 2.6 (maybe 2.5.1?)
-         case $wlarc in
-         '')
-           whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-         *)
-           whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-         esac ;;
        esac
        link_all_deplibs=yes
        ;;
-Line 8030 
 beos*)
+Line 7935 
 beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
- bsdi[45]*)
+ bsdi4*)
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-Line 8088 
 cygwin* | mingw* | pw32*)
+Line 7993 
 cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
        ;;
      esac
      ;;
-Line 8146 
 kfreebsd*-gnu)
+Line 8051 
 kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
- freebsd* | dragonfly*)
+ freebsd*)
-   # 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`
    version_type=freebsd-$objformat
    case $version_type in
-Line 8167 
 freebsd* | dragonfly*)
+Line 8070 
 freebsd* | dragonfly*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
+   freebsd3.01* | freebsdelf3.01*)
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-Line 8291 
 linux*)
+Line 8194 
 linux*)
    # before this can be enabled.
    hardcode_into_libs=yes
-   # find out which ABI we are using
    libsuff=
-   case "$host_cpu" in
+   if test "$lt_cv_cc_lib64_suffix" = "yes"; then
-   x86_64*|s390x*|powerpc64*)
+     libsuff=64
-     echo '#line 8298 "configure"' > conftest.$ac_ext
+   fi
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   esac
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} $lt_ld_extra"
+     sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff} $lt_ld_extra"
    fi
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-Line 8377 
 nto-qnx*)
+Line 8265 
 nto-qnx*)
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   need_version=yes
-   case $host_os in
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-     *)                         need_version=no  ;;
-   esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-Line 8503 
 echo "$as_me:$LINENO: checking how to ha
+Line 8387 
 echo "$as_me:$LINENO: checking how to ha
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
-    test -n "$runpath_var" || \
+    test -n "$runpath_var " || \
-    test "X$hardcode_automatic" = "Xyes" ; then
+    test "X$hardcode_automatic"="Xyes" ; then
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-Line 9170 
 else
+Line 9054 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 9173 "configure"
+ #line 9057 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 9268 
 else
+Line 9152 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 9271 "configure"
+ #line 9155 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 9397 
 aix4* | aix5*)
+Line 9281 
 aix4* | aix5*)
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
+   ;;
+   darwin* | rhapsody*)
+   if test "$GCC" = yes; then
+     archive_cmds_need_lc=no
+     case "$host_os" in
+     rhapsody* | darwin1.[012])
+       allow_undefined_flag='-undefined suppress'
+       ;;
+     *) # Darwin 1.3 on
+       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+         allow_undefined_flag='-flat_namespace -undefined suppress'
+       else
+         case ${MACOSX_DEPLOYMENT_TARGET} in
+.[012])
+             allow_undefined_flag='-flat_namespace -undefined suppress'
+             ;;
+.*)
+             allow_undefined_flag='-undefined dynamic_lookup'
+             ;;
+         esac
+       fi
+       ;;
+     esac
+     output_verbose_link_cmd='echo'
+     archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+     module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+     archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $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}'
+     hardcode_direct=no
+     hardcode_automatic=yes
+     hardcode_shlibpath_var=unsupported
+     whole_archive_flag_spec='-all_load $convenience'
+     link_all_deplibs=yes
+   else
+     ld_shlibs=no
+   fi
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-Line 9526 
 echo "$as_me: creating $ofile" >&6;}
+Line 9447 
 echo "$as_me: creating $ofile" >&6;}
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-Line 9537 
 echo "$as_me: creating $ofile" >&6;}
+Line 9458 
 echo "$as_me: creating $ofile" >&6;}
  SED=$lt_SED
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
- Xsed="$SED -e 1s/^X//"
+ Xsed="$SED -e s/^X//"
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
  # The names of the tagged configurations supported by this script.
  available_tags=
-Line 9571 
 fast_install=$enable_fast_install
+Line 9492 
 fast_install=$enable_fast_install
  # The host system.
  host_alias=$host_alias
  host=$host
- host_os=$host_os
- # The build system.
- build_alias=$build_alias
- build=$build
- build_os=$build_os
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-Line 9653 
 max_cmd_len=$lt_cv_sys_max_cmd_len
+Line 9568 
 max_cmd_len=$lt_cv_sys_max_cmd_len
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- # Must we lock files when doing compilation?
+ # Must we lock files when doing compilation ?
  need_locks=$lt_need_locks
  # Do we need the lib prefix for modules?
-Line 9948 
 echo "$as_me: error: tag name \"$tagname
+Line 9863 
 echo "$as_me: error: tag name \"$tagname
        case $tagname in
        CXX)
-         if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+         if test -n "$CXX" && test "X$CXX" != "Xno"; then
-             ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-             (test "X$CXX" != "Xg++"))) ; then
            ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-Line 10008 
 LTCC=${LTCC-"$CC"}
+Line 9921 
 LTCC=${LTCC-"$CC"}
  compiler=$CC
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-Line 10043 
 test -z "${LDCXX+set}" || LD=$LDCXX
+Line 9942 
 test -z "${LDCXX+set}" || LD=$LDCXX
  CC=${CXX-"c++"}
  compiler=$CC
  compiler_CXX=$CC
- for cc_temp in $compiler""; do
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-Line 10266 
 case $host_os in
+Line 10156 
 case $host_os in
      link_all_deplibs_CXX=yes
      if test "$GXX" = yes; then
-       case $host_os in aix4.[012]|aix4.[012].*)
+       case $host_os in aix4.012|aix4.012.*)
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
          collect2name=`${CC} -print-prog-name=collect2`
-Line 10287 
 case $host_os in
+Line 10177 
 case $host_os in
          fi
        esac
        shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-Line 10451 
 if test -z "$aix_libpath"; then aix_libp
+Line 10338 
 if test -z "$aix_libpath"; then aix_libp
      esac
      ;;
    cygwin* | mingw* | pw32*)
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
-Line 10475 
 if test -z "$aix_libpath"; then aix_libp
+Line 10361 
 if test -z "$aix_libpath"; then aix_libp
        ld_shlibs_CXX=no
      fi
    ;;
-       darwin* | rhapsody*)
-         case "$host_os" in
-         rhapsody* | darwin1.[012])
-          allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-          ;;
-        *) # Darwin 1.3 on
-          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-            allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-          else
-            case ${MACOSX_DEPLOYMENT_TARGET} in
-.[012])
-                allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-                ;;
-.*)
-                allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-                ;;
-            esac
-          fi
-          ;;
-         esac
-       archive_cmds_need_lc_CXX=no
-       hardcode_direct_CXX=no
-       hardcode_automatic_CXX=yes
-       hardcode_shlibpath_var_CXX=unsupported
-       whole_archive_flag_spec_CXX=''
-       link_all_deplibs_CXX=yes
-     if test "$GXX" = yes ; then
+   darwin* | rhapsody*)
-       lt_int_apple_cc_single_mod=no
+   if test "$GXX" = yes; then
-       output_verbose_link_cmd='echo'
+     archive_cmds_need_lc_CXX=no
-       if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+     case "$host_os" in
-        lt_int_apple_cc_single_mod=yes
+     rhapsody* | darwin1.[012])
-       fi
+       allow_undefined_flag_CXX='-undefined suppress'
-       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       ;;
-        archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     *) # Darwin 1.3 on
-       else
+       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+         allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-         fi
+       else
-         module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+         case ${MACOSX_DEPLOYMENT_TARGET} in
-         # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+.[012])
-           if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+             allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-             archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+             ;;
-           else
+.*)
-             archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+             allow_undefined_flag_CXX='-undefined dynamic_lookup'
-           fi
+             ;;
-             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}'
+         esac
-       else
-       case $cc_basename in
-         xlc*)
-          output_verbose_link_cmd='echo'
-           archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-           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}'
-           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}'
-           ;;
-        *)
-          ld_shlibs_CXX=no
-           ;;
-       esac
        fi
-         ;;
+       ;;
+     esac
+     lt_int_apple_cc_single_mod=no
+     output_verbose_link_cmd='echo'
+     if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+     fi
+     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     else
+       archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+     fi
+     module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+     # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+       archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     fi
+     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}'
+     hardcode_direct_CXX=no
+     hardcode_automatic_CXX=yes
+     hardcode_shlibpath_var_CXX=unsupported
+     whole_archive_flag_spec_CXX='-all_load $convenience'
+     link_all_deplibs_CXX=yes
+   else
+     ld_shlibs_CXX=no
+   fi
+     ;;
    dgux*)
      case $cc_basename in
-       ec++*)
+       ec++)
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-       ghcx*)
+       ghcx)
          # Green Hills C++ Compiler
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-Line 10555 
 if test -z "$aix_libpath"; then aix_libp
+Line 10430 
 if test -z "$aix_libpath"; then aix_libp
          ;;
      esac
      ;;
-   freebsd[12]*)
+   freebsd12*)
      # C++ shared libraries reported to be fairly broken before switch to ELF
      ld_shlibs_CXX=no
      ;;
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
-   freebsd* | kfreebsd*-gnu | dragonfly*)
+   freebsd* | kfreebsd*-gnu)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-Line 10579 
 if test -z "$aix_libpath"; then aix_libp
+Line 10454 
 if test -z "$aix_libpath"; then aix_libp
                                  # location of the library.
      case $cc_basename in
-     CC*)
+     CC)
        # FIXME: insert proper C++ library support
        ld_shlibs_CXX=no
        ;;
-     aCC*)
+     aCC)
        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
-Line 10593 
 if test -z "$aix_libpath"; then aix_libp
+Line 10468 
 if test -z "$aix_libpath"; then aix_libp
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
-       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
      *)
        if test "$GXX" = yes; then
-Line 10644 
 if test -z "$aix_libpath"; then aix_libp
+Line 10519 
 if test -z "$aix_libpath"; then aix_libp
      esac
      case $cc_basename in
-       CC*)
+       CC)
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-       aCC*)
+       aCC)
          case "$host_cpu" in
          hppa*64*|ia64*)
            archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-Line 10688 
 if test -z "$aix_libpath"; then aix_libp
+Line 10563 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    irix5* | irix6*)
      case $cc_basename in
-       CC*)
+       CC)
          # SGI C++
-         archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+         archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
          # Archives containing C++ object files must be created using
          # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-Line 10701 
 if test -z "$aix_libpath"; then aix_libp
+Line 10576 
 if test -z "$aix_libpath"; then aix_libp
        *)
          if test "$GXX" = yes; then
            if test "$with_gnu_ld" = no; then
-             archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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'
+             archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
            else
              archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
            fi
-Line 10714 
 if test -z "$aix_libpath"; then aix_libp
+Line 10589 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    linux*)
      case $cc_basename in
-       KCC*)
+       KCC)
          # Kuck and Associates, Inc. (KAI) C++ Compiler
          # KCC will only create a shared library if the output file
-Line 10739 
 if test -z "$aix_libpath"; then aix_libp
+Line 10614 
 if test -z "$aix_libpath"; then aix_libp
          # "CC -Bstatic", where "CC" is the KAI C++ compiler.
          old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
          ;;
-       icpc*)
+       icpc)
          # Intel C++
          with_gnu_ld=yes
-         # version 8.0 and above of icpc choke on multiply defined symbols
-         # if we add $predep_objects and $postdep_objects, however 7.1 and
-         # earlier do not add the objects themselves.
-         case `$CC -V 2>&1` in
-         *"Version 7."*)
-           archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-           ;;
-         *)  # Version 8.0 or newer
-           tmp_idyn=
-           case $host_cpu in
-             ia64*) tmp_idyn=' -i_dynamic';;
-           esac
-           archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-           ;;
-         esac
          archive_cmds_need_lc_CXX=no
+         archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
          hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
          export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
          whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
          ;;
-       pgCC*)
+       cxx)
-         # Portland Group C++ compiler
-         archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-         archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-         hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-         whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-         ;;
-       cxx*)
          # Compaq C++
          archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
          archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-Line 10804 
 if test -z "$aix_libpath"; then aix_libp
+Line 10655 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    mvs*)
      case $cc_basename in
-       cxx*)
+       cxx)
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-Line 10825 
 if test -z "$aix_libpath"; then aix_libp
+Line 10676 
 if test -z "$aix_libpath"; then aix_libp
      # 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
-     ld_shlibs_CXX=no
-     ;;
-   openbsd*)
-     hardcode_direct_CXX=yes
-     hardcode_shlibpath_var_CXX=no
-     archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-       export_dynamic_flag_spec_CXX='${wl}-E'
-       whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-     fi
-     output_verbose_link_cmd='echo'
-     ;;
    osf3*)
      case $cc_basename in
-       KCC*)
+       KCC)
          # Kuck and Associates, Inc. (KAI) C++ Compiler
          # KCC will only create a shared library if the output file
-Line 10859 
 if test -z "$aix_libpath"; then aix_libp
+Line 10694 
 if test -z "$aix_libpath"; then aix_libp
          old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
          ;;
-       RCC*)
+       RCC)
          # Rational C++ 2.4.1
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-       cxx*)
+       cxx)
          allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-         archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+         archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
          hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
          hardcode_libdir_separator_CXX=:
-Line 10884 
 if test -z "$aix_libpath"; then aix_libp
+Line 10719 
 if test -z "$aix_libpath"; then aix_libp
        *)
          if test "$GXX" = yes && test "$with_gnu_ld" = no; then
            allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-           archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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'
+           archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
            hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
            hardcode_libdir_separator_CXX=:
-Line 10903 
 if test -z "$aix_libpath"; then aix_libp
+Line 10738 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    osf4* | osf5*)
      case $cc_basename in
-       KCC*)
+       KCC)
          # Kuck and Associates, Inc. (KAI) C++ Compiler
          # KCC will only create a shared library if the output file
-Line 10918 
 if test -z "$aix_libpath"; then aix_libp
+Line 10753 
 if test -z "$aix_libpath"; then aix_libp
          # the KAI C++ compiler.
          old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
          ;;
-       RCC*)
+       RCC)
          # Rational C++ 2.4.1
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-       cxx*)
+       cxx)
          allow_undefined_flag_CXX=' -expect_unresolved \*'
-         archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+         archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
          archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
            echo "-hidden">> $lib.exp~
-           $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+           $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
            $rm $lib.exp'
          hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-Line 10947 
 if test -z "$aix_libpath"; then aix_libp
+Line 10782 
 if test -z "$aix_libpath"; then aix_libp
        *)
          if test "$GXX" = yes && test "$with_gnu_ld" = no; then
            allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
            hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
            hardcode_libdir_separator_CXX=:
-Line 10971 
 if test -z "$aix_libpath"; then aix_libp
+Line 10806 
 if test -z "$aix_libpath"; then aix_libp
    sco*)
      archive_cmds_need_lc_CXX=no
      case $cc_basename in
-       CC*)
+       CC)
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-Line 10983 
 if test -z "$aix_libpath"; then aix_libp
+Line 10818 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    sunos4*)
      case $cc_basename in
-       CC*)
+       CC)
          # Sun C++ 4.x
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
          ;;
-       lcc*)
+       lcc)
          # Lucid
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-Line 11001 
 if test -z "$aix_libpath"; then aix_libp
+Line 10836 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    solaris*)
      case $cc_basename in
-       CC*)
+       CC)
          # Sun C++ 4.2, 5.x and Centerline C++
          no_undefined_flag_CXX=' -zdefs'
          archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-Line 11011 
 if test -z "$aix_libpath"; then aix_libp
+Line 10846 
 if test -z "$aix_libpath"; then aix_libp
          hardcode_libdir_flag_spec_CXX='-R$libdir'
          hardcode_shlibpath_var_CXX=no
          case $host_os in
-           solaris2.[0-5] | solaris2.[0-5].*) ;;
+           solaris2.0-5 | solaris2.0-5.*) ;;
            *)
              # The C++ compiler is used as linker so we must use $wl
              # flag to pass the commands to the underlying system
-             # linker. We must also pass each convience library through
+             # linker.
-             # to the system linker between allextract/defaultextract.
-             # The C++ compiler will combine linker options so we
-             # cannot just pass the convience library names through
-             # without $wl.
              # Supported since Solaris 2.6 (maybe 2.5.1?)
-             whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+             whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
              ;;
          esac
          link_all_deplibs_CXX=yes
-Line 11042 
 if test -z "$aix_libpath"; then aix_libp
+Line 10873 
 if test -z "$aix_libpath"; then aix_libp
          # in the archive.
          old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
          ;;
-       gcx*)
+       gcx)
          # Green Hills C++ Compiler
          archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-Line 11085 
 if test -z "$aix_libpath"; then aix_libp
+Line 10916 
 if test -z "$aix_libpath"; then aix_libp
      ;;
    tandem*)
      case $cc_basename in
-       NCC*)
+       NCC)
          # NonStop-UX NCC 3.20
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-Line 11294 
 echo $ECHO_N "checking for $compiler opt
+Line 11125 
 echo $ECHO_N "checking for $compiler opt
          ;;
        chorus*)
          case $cc_basename in
-         cxch68*)
+         cxch68)
            # Green Hills C++ Compiler
            # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
            ;;
          esac
          ;;
-        darwin*)
-          # PIC is the default on this platform
-          # Common symbols not allowed in MH_DYLIB files
-          case $cc_basename in
-            xlc*)
-            lt_prog_compiler_pic_CXX='-qnocommon'
-            lt_prog_compiler_wl_CXX='-Wl,'
-            ;;
-          esac
-        ;;
        dgux*)
          case $cc_basename in
-           ec++*)
+           ec++)
              lt_prog_compiler_pic_CXX='-KPIC'
              ;;
-           ghcx*)
+           ghcx)
              # Green Hills C++ Compiler
              lt_prog_compiler_pic_CXX='-pic'
              ;;
-Line 11323 
 echo $ECHO_N "checking for $compiler opt
+Line 11144 
 echo $ECHO_N "checking for $compiler opt
              ;;
          esac
          ;;
-       freebsd* | kfreebsd*-gnu | dragonfly*)
+       freebsd* | kfreebsd*-gnu)
          # FreeBSD uses GNU C++
          ;;
        hpux9* | hpux10* | hpux11*)
          case $cc_basename in
-           CC*)
+           CC)
              lt_prog_compiler_wl_CXX='-Wl,'
              lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
              if test "$host_cpu" != ia64; then
                lt_prog_compiler_pic_CXX='+Z'
              fi
              ;;
-           aCC*)
+           aCC)
              lt_prog_compiler_wl_CXX='-Wl,'
              lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
              case "$host_cpu" in
-Line 11353 
 echo $ECHO_N "checking for $compiler opt
+Line 11174 
 echo $ECHO_N "checking for $compiler opt
          ;;
        irix5* | irix6* | nonstopux*)
          case $cc_basename in
-           CC*)
+           CC)
              lt_prog_compiler_wl_CXX='-Wl,'
              lt_prog_compiler_static_CXX='-non_shared'
              # CC pic flag -KPIC is the default.
-Line 11364 
 echo $ECHO_N "checking for $compiler opt
+Line 11185 
 echo $ECHO_N "checking for $compiler opt
          ;;
        linux*)
          case $cc_basename in
-           KCC*)
+           KCC)
              # KAI C++ Compiler
              lt_prog_compiler_wl_CXX='--backend -Wl,'
              lt_prog_compiler_pic_CXX='-fPIC'
              ;;
-           icpc* | ecpc*)
+           icpc)
              # Intel C++
              lt_prog_compiler_wl_CXX='-Wl,'
              lt_prog_compiler_pic_CXX='-KPIC'
              lt_prog_compiler_static_CXX='-static'
              ;;
-           pgCC*)
+           cxx)
-             # Portland Group C++ compiler.
-             lt_prog_compiler_wl_CXX='-Wl,'
-             lt_prog_compiler_pic_CXX='-fpic'
-             lt_prog_compiler_static_CXX='-static'
-             ;;
-           cxx*)
              # Compaq C++
              # Make sure the PIC flag is empty.  It appears that all Alpha
              # Linux and Compaq Tru64 Unix objects are PIC.
-Line 11398 
 echo $ECHO_N "checking for $compiler opt
+Line 11213 
 echo $ECHO_N "checking for $compiler opt
          ;;
        mvs*)
          case $cc_basename in
-           cxx*)
+           cxx)
              lt_prog_compiler_pic_CXX='-W c,exportall'
              ;;
            *)
-Line 11409 
 echo $ECHO_N "checking for $compiler opt
+Line 11224 
 echo $ECHO_N "checking for $compiler opt
          ;;
        osf3* | osf4* | osf5*)
          case $cc_basename in
-           KCC*)
+           KCC)
              lt_prog_compiler_wl_CXX='--backend -Wl,'
              ;;
-           RCC*)
+           RCC)
              # Rational C++ 2.4.1
              lt_prog_compiler_pic_CXX='-pic'
              ;;
-           cxx*)
+           cxx)
              # Digital/Compaq C++
              lt_prog_compiler_wl_CXX='-Wl,'
              # Make sure the PIC flag is empty.  It appears that all Alpha
-Line 11432 
 echo $ECHO_N "checking for $compiler opt
+Line 11247 
 echo $ECHO_N "checking for $compiler opt
          ;;
        sco*)
          case $cc_basename in
-           CC*)
+           CC)
              lt_prog_compiler_pic_CXX='-fPIC'
              ;;
            *)
-Line 11441 
 echo $ECHO_N "checking for $compiler opt
+Line 11256 
 echo $ECHO_N "checking for $compiler opt
          ;;
        solaris*)
          case $cc_basename in
-           CC*)
+           CC)
              # Sun C++ 4.2, 5.x and Centerline C++
              lt_prog_compiler_pic_CXX='-KPIC'
              lt_prog_compiler_static_CXX='-Bstatic'
              lt_prog_compiler_wl_CXX='-Qoption ld '
              ;;
-           gcx*)
+           gcx)
              # Green Hills C++ Compiler
              lt_prog_compiler_pic_CXX='-PIC'
              ;;
-Line 11457 
 echo $ECHO_N "checking for $compiler opt
+Line 11272 
 echo $ECHO_N "checking for $compiler opt
          ;;
        sunos4*)
          case $cc_basename in
-           CC*)
+           CC)
              # Sun C++ 4.x
              lt_prog_compiler_pic_CXX='-pic'
              lt_prog_compiler_static_CXX='-Bstatic'
              ;;
-           lcc*)
+           lcc)
              # Lucid
              lt_prog_compiler_pic_CXX='-pic'
              ;;
-Line 11472 
 echo $ECHO_N "checking for $compiler opt
+Line 11287 
 echo $ECHO_N "checking for $compiler opt
          ;;
        tandem*)
          case $cc_basename in
-           NCC*)
+           NCC)
              # NonStop-UX NCC 3.20
              lt_prog_compiler_pic_CXX='-KPIC'
              ;;
-Line 11516 
 else
+Line 11331 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:11519: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:11334: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:11523: \$? = $ac_status" >&5
+    echo "$as_me:11338: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-Line 11578 
 else
+Line 11391 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:11581: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:11394: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:11585: \$? = $ac_status" >&5
+    echo "$as_me:11398: \$? = $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
       # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+      if test ! -s out/conftest.err; then
-      $SED '/^$/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o_CXX=yes
       fi
     fi
-Line 11648 
 echo $ECHO_N "checking whether the $comp
+Line 11459 
 echo $ECHO_N "checking whether the $comp
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-Line 11828 
 beos*)
+Line 11639 
 beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
- bsdi[45]*)
+ bsdi4*)
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-Line 11886 
 cygwin* | mingw* | pw32*)
+Line 11697 
 cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
        ;;
      esac
      ;;
-Line 11944 
 kfreebsd*-gnu)
+Line 11755 
 kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
- freebsd* | dragonfly*)
+ freebsd*)
-   # 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`
    version_type=freebsd-$objformat
    case $version_type in
-Line 11965 
 freebsd* | dragonfly*)
+Line 11774 
 freebsd* | dragonfly*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
+   freebsd3.01* | freebsdelf3.01*)
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-Line 12089 
 linux*)
+Line 11898 
 linux*)
    # before this can be enabled.
    hardcode_into_libs=yes
-   # find out which ABI we are using
    libsuff=
-   case "$host_cpu" in
+   if test "$lt_cv_cc_lib64_suffix" = "yes"; then
-   x86_64*|s390x*|powerpc64*)
+     libsuff=64
-     echo '#line 12096 "configure"' > conftest.$ac_ext
+   fi
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   esac
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} $lt_ld_extra"
+     sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff} $lt_ld_extra"
    fi
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-Line 12175 
 nto-qnx*)
+Line 11969 
 nto-qnx*)
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   need_version=yes
-   case $host_os in
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-     *)                         need_version=no  ;;
-   esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-Line 12301 
 echo "$as_me:$LINENO: checking how to ha
+Line 12091 
 echo "$as_me:$LINENO: checking how to ha
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
-    test -n "$runpath_var_CXX" || \
+    test -n "$runpath_var CXX" || \
-    test "X$hardcode_automatic_CXX" = "Xyes" ; then
+    test "X$hardcode_automatic_CXX"="Xyes" ; then
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-Line 12968 
 else
+Line 12758 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 12971 "configure"
+ #line 12761 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 13066 
 else
+Line 12856 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 13069 "configure"
+ #line 12859 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 13284 
 fast_install=$enable_fast_install
+Line 13074 
 fast_install=$enable_fast_install
  # The host system.
  host_alias=$host_alias
  host=$host
- host_os=$host_os
- # The build system.
- build_alias=$build_alias
- build=$build
- build_os=$build_os
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-Line 13366 
 max_cmd_len=$lt_cv_sys_max_cmd_len
+Line 13150 
 max_cmd_len=$lt_cv_sys_max_cmd_len
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
- # Must we lock files when doing compilation?
+ # Must we lock files when doing compilation ?
  need_locks=$lt_need_locks
  # Do we need the lib prefix for modules?
-Line 13647 
 LTCC=${LTCC-"$CC"}
+Line 13431 
 LTCC=${LTCC-"$CC"}
  compiler=$CC
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
  # Allow CC to be a program name with arguments.
  lt_save_CC="$CC"
  CC=${F77-"f77"}
  compiler=$CC
  compiler_F77=$CC
- for cc_temp in $compiler""; do
+ cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-Line 13697 
 aix3*)
+Line 13458 
 aix3*)
    fi
    ;;
  aix4* | aix5*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+   test "$enable_shared" = yes && enable_static=no
-     test "$enable_shared" = yes && enable_static=no
-   fi
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-Line 13802 
 echo $ECHO_N "checking for $compiler opt
+Line 13561 
 echo $ECHO_N "checking for $compiler opt
          lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-        case $cc_basename in
-          xlc*)
-          lt_prog_compiler_pic_F77='-qnocommon'
-          lt_prog_compiler_wl_F77='-Wl,'
-          ;;
-        esac
-        ;;
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-Line 13847 
 echo $ECHO_N "checking for $compiler opt
+Line 13596 
 echo $ECHO_N "checking for $compiler opt
        ;;
      linux*)
-       case $cc_basename in
+       case $CC in
        icc* | ecc*)
          lt_prog_compiler_wl_F77='-Wl,'
          lt_prog_compiler_pic_F77='-KPIC'
          lt_prog_compiler_static_F77='-static'
          ;;
-       pgcc* | pgf77* | pgf90*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
-         # which looks to be a dead project)
-         lt_prog_compiler_wl_F77='-Wl,'
-         lt_prog_compiler_pic_F77='-fpic'
-         lt_prog_compiler_static_F77='-static'
-         ;;
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-Line 13880 
 echo $ECHO_N "checking for $compiler opt
+Line 13622 
 echo $ECHO_N "checking for $compiler opt
        ;;
      solaris*)
+       lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-       case $cc_basename in
-       f77* | f90* | f95*)
-         lt_prog_compiler_wl_F77='-Qoption ld ';;
-       *)
-         lt_prog_compiler_wl_F77='-Wl,';;
-       esac
        ;;
      sunos4*)
-Line 13909 
 echo $ECHO_N "checking for $compiler opt
+Line 13646 
 echo $ECHO_N "checking for $compiler opt
        fi
        ;;
-     unicos*)
-       lt_prog_compiler_wl_F77='-Wl,'
-       lt_prog_compiler_can_build_shared_F77=no
-       ;;
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-Line 13951 
 else
+Line 13683 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:13954: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:13686: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:13958: \$? = $ac_status" >&5
+    echo "$as_me:13690: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-Line 14013 
 else
+Line 13743 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:14016: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:13746: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:14020: \$? = $ac_status" >&5
+    echo "$as_me:13750: \$? = $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
       # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+      if test ! -s out/conftest.err; then
-      $SED '/^$/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o_F77=yes
       fi
     fi
-Line 14104 
 echo $ECHO_N "checking whether the $comp
+Line 13832 
 echo $ECHO_N "checking whether the $comp
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-Line 14134 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
+Line 13852 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
-     # Set some defaults for GNU ld with shared library support. These
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-     export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-         whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-       else
-         whole_archive_flag_spec_F77=
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-       *\ 2.11.*) ;; # other 2.11 versions
-       *) supports_anon_versioning=yes ;;
-     esac
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-Line 14205 
 EOF
+Line 13902 
 EOF
        allow_undefined_flag_F77=unsupported
        always_export_symbols_F77=no
        enable_shared_with_static_runtimes_F77=yes
-       export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+       export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-Line 14219 
 EOF
+Line 13916 
 EOF
          fi~
          $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
        else
-         ld_shlibs_F77=no
+         ld_shlibs=no
-       fi
-       ;;
-     linux*)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-         tmp_addflag=
-         case $cc_basename,$host_cpu in
-         pgcc*)                          # Portland Group C compiler
-           whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag'
-           ;;
-         pgf77* | pgf90* )                       # Portland Group f77 and f90 compilers
-           whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag -Mnomain' ;;
-         ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-           tmp_addflag=' -i_dynamic' ;;
-         efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-           tmp_addflag=' -i_dynamic -nofor_main' ;;
-         ifc* | ifort*)                  # Intel Fortran compiler
-           tmp_addflag=' -nofor_main' ;;
-         esac
-         archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         if test $supports_anon_versioning = yes; then
-           archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-         fi
-       else
-         ld_shlibs_F77=no
        fi
        ;;
-Line 14292 
 EOF
+Line 13958 
 EOF
        hardcode_shlibpath_var_F77=no
        ;;
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         archive_cmds_F77="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+         *\ 2.11.*) ;; # other 2.11 versions
+         *) supports_anon_versioning=yes ;;
+       esac
+       if test $supports_anon_versioning = yes; then
+         archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+         $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+       else
+         archive_expsym_cmds_F77="$tmp_archive_cmds"
+       fi
+     else
+       ld_shlibs_F77=no
+     fi
+     ;;
      *)
        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'
-Line 14302 
 EOF
+Line 13993 
 EOF
        ;;
      esac
-     if test "$ld_shlibs_F77" = no; then
+     if test "$ld_shlibs_F77" = yes; then
-       runpath_var=
+       runpath_var=LD_RUN_PATH
-       hardcode_libdir_flag_spec_F77=
+       hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-       export_dynamic_flag_spec_F77=
+       export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-       whole_archive_flag_spec_F77=
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+         whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec_F77=
+       fi
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-Line 14370 
 EOF
+Line 14066 
 EOF
        link_all_deplibs_F77=yes
        if test "$GCC" = yes; then
-         case $host_os in aix4.[012]|aix4.[012].*)
+         case $host_os in aix4.012|aix4.012.*)
          # We only want to do this on AIX 4.2 and lower, the check
          # below for broken collect2 doesn't work under 4.3+
            collect2name=`${CC} -print-prog-name=collect2`
-Line 14391 
 EOF
+Line 14087 
 EOF
            fi
          esac
          shared_flag='-shared'
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag="$shared_flag "'${wl}-G'
-         fi
        else
          # not using gcc
          if test "$host_cpu" = ia64; then
-Line 14534 
 if test -z "$aix_libpath"; then aix_libp
+Line 14227 
 if test -z "$aix_libpath"; then aix_libp
        ld_shlibs_F77=no
        ;;
-     bsdi[45]*)
+     bsdi4*)
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
-Line 14555 
 if test -z "$aix_libpath"; then aix_libp
+Line 14248 
 if test -z "$aix_libpath"; then aix_libp
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
        old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_F77=yes
        ;;
      darwin* | rhapsody*)
+     if test "$GXX" = yes ; then
+       archive_cmds_need_lc_F77=no
        case "$host_os" in
-         rhapsody* | darwin1.[012])
+       rhapsody* | darwin1.[012])
-          allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         allow_undefined_flag_F77='-undefined suppress'
-          ;;
+         ;;
-        *) # Darwin 1.3 on
+       *) # Darwin 1.3 on
-          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-            allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-          else
+       else
-            case ${MACOSX_DEPLOYMENT_TARGET} in
+         case ${MACOSX_DEPLOYMENT_TARGET} in
 .[012])
-                allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+             allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-                ;;
+             ;;
 .*)
-                allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+             allow_undefined_flag_F77='-undefined dynamic_lookup'
-                ;;
+             ;;
-            esac
+         esac
-          fi
+       fi
-          ;;
+         ;;
        esac
-       archive_cmds_need_lc_F77=no
+         lt_int_apple_cc_single_mod=no
+         output_verbose_link_cmd='echo'
+         if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+           lt_int_apple_cc_single_mod=yes
+         fi
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+         else
+         archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         else
+           archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         fi
+           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}'
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
-       whole_archive_flag_spec_F77=''
+       whole_archive_flag_spec_F77='-all_load $convenience'
        link_all_deplibs_F77=yes
-     if test "$GCC" = yes ; then
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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}'
      else
-       case $cc_basename in
+       ld_shlibs_F77=no
-         xlc*)
-          output_verbose_link_cmd='echo'
-          archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-          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}'
-           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}'
-           ;;
-        *)
-          ld_shlibs_F77=no
-           ;;
-       esac
      fi
        ;;
-Line 14639 
 if test -z "$aix_libpath"; then aix_libp
+Line 14332 
 if test -z "$aix_libpath"; then aix_libp
        ;;
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | kfreebsd*-gnu | dragonfly*)
+     freebsd* | kfreebsd*-gnu)
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-Line 14750 
 if test -z "$aix_libpath"; then aix_libp
+Line 14443 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
          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
-Line 14796 
 if test -z "$aix_libpath"; then aix_libp
+Line 14488 
 if test -z "$aix_libpath"; then aix_libp
          allow_undefined_flag_F77=' -expect_unresolved \*'
          archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
          archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
          # Both c and cxx compiler support -rpath directly
          hardcode_libdir_flag_spec_F77='-rpath $libdir'
-Line 14815 
 if test -z "$aix_libpath"; then aix_libp
+Line 14507 
 if test -z "$aix_libpath"; then aix_libp
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
-         wlarc='${wl}'
          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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
-         wlarc=''
          archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
          archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
          $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-Line 14829 
 if test -z "$aix_libpath"; then aix_libp
+Line 14519 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
-       *)
+       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-         # The compiler driver will combine linker options so we
+         whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-         # cannot just pass the convience library names through
-         # without $wl, iff we do not link with $LD.
-         # Luckily, gcc supports the same syntax we need for Sun Studio.
-         # Supported since Solaris 2.6 (maybe 2.5.1?)
-         case $wlarc in
-         '')
-           whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-         *)
-           whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-         esac ;;
        esac
        link_all_deplibs_F77=yes
        ;;
-Line 15114 
 beos*)
+Line 14794 
 beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
- bsdi[45]*)
+ bsdi4*)
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-Line 15172 
 cygwin* | mingw* | pw32*)
+Line 14852 
 cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
        ;;
      esac
      ;;
-Line 15230 
 kfreebsd*-gnu)
+Line 14910 
 kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
- freebsd* | dragonfly*)
+ freebsd*)
-   # 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`
    version_type=freebsd-$objformat
    case $version_type in
-Line 15251 
 freebsd* | dragonfly*)
+Line 14929 
 freebsd* | dragonfly*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
+   freebsd3.01* | freebsdelf3.01*)
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-Line 15375 
 linux*)
+Line 15053 
 linux*)
    # before this can be enabled.
    hardcode_into_libs=yes
-   # find out which ABI we are using
    libsuff=
-   case "$host_cpu" in
+   if test "$lt_cv_cc_lib64_suffix" = "yes"; then
-   x86_64*|s390x*|powerpc64*)
+     libsuff=64
-     echo '#line 15382 "configure"' > conftest.$ac_ext
+   fi
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   esac
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} $lt_ld_extra"
+     sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff} $lt_ld_extra"
    fi
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-Line 15461 
 nto-qnx*)
+Line 15124 
 nto-qnx*)
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   need_version=yes
-   case $host_os in
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-     *)                         need_version=no  ;;
-   esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-Line 15587 
 echo "$as_me:$LINENO: checking how to ha
+Line 15246 
 echo "$as_me:$LINENO: checking how to ha
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
-    test -n "$runpath_var_F77" || \
+    test -n "$runpath_var F77" || \
-    test "X$hardcode_automatic_F77" = "Xyes" ; then
+    test "X$hardcode_automatic_F77"="Xyes" ; then
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-Line 15765 
 fast_install=$enable_fast_install
+Line 15424 
 fast_install=$enable_fast_install
  # The host system.
  host_alias=$host_alias
  host=$host
- host_os=$host_os
- # The build system.
- build_alias=$build_alias
- build=$build
- build_os=$build_os
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-Line 15847 
 max_cmd_len=$lt_cv_sys_max_cmd_len
+Line 15500 
 max_cmd_len=$lt_cv_sys_max_cmd_len
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
- # Must we lock files when doing compilation?
+ # Must we lock files when doing compilation ?
  need_locks=$lt_need_locks
  # Do we need the lib prefix for modules?
-Line 16085 
 objext_GCJ=$objext
+Line 15738 
 objext_GCJ=$objext
  lt_simple_compile_test_code="class foo {}\n"
  # Code to be used in simple link tests
- lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-Line 16096 
 LTCC=${LTCC-"$CC"}
+Line 15749 
 LTCC=${LTCC-"$CC"}
  compiler=$CC
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
  # Allow CC to be a program name with arguments.
  lt_save_CC="$CC"
  CC=${GCJ-"gcj"}
  compiler=$CC
  compiler_GCJ=$CC
- for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  # GCJ did not exist at the time GCC didn't implicitly link libc in.
  archive_cmds_need_lc_GCJ=no
- old_archive_cmds_GCJ=$old_archive_cmds
  lt_prog_compiler_no_builtin_flag_GCJ=
-Line 16156 
 else
+Line 15783 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:16159: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:15786: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:16163: \$? = $ac_status" >&5
+    echo "$as_me:15790: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-Line 16269 
 echo $ECHO_N "checking for $compiler opt
+Line 15894 
 echo $ECHO_N "checking for $compiler opt
          lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-        case $cc_basename in
-          xlc*)
-          lt_prog_compiler_pic_GCJ='-qnocommon'
-          lt_prog_compiler_wl_GCJ='-Wl,'
-          ;;
-        esac
-        ;;
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-Line 16314 
 echo $ECHO_N "checking for $compiler opt
+Line 15929 
 echo $ECHO_N "checking for $compiler opt
        ;;
      linux*)
-       case $cc_basename in
+       case $CC in
        icc* | ecc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          lt_prog_compiler_pic_GCJ='-KPIC'
          lt_prog_compiler_static_GCJ='-static'
          ;;
-       pgcc* | pgf77* | pgf90*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
-         # which looks to be a dead project)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         lt_prog_compiler_pic_GCJ='-fpic'
-         lt_prog_compiler_static_GCJ='-static'
-         ;;
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-Line 16347 
 echo $ECHO_N "checking for $compiler opt
+Line 15955 
 echo $ECHO_N "checking for $compiler opt
        ;;
      solaris*)
+       lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-       case $cc_basename in
-       f77* | f90* | f95*)
-         lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-       *)
-         lt_prog_compiler_wl_GCJ='-Wl,';;
-       esac
        ;;
      sunos4*)
-Line 16376 
 echo $ECHO_N "checking for $compiler opt
+Line 15979 
 echo $ECHO_N "checking for $compiler opt
        fi
        ;;
-     unicos*)
-       lt_prog_compiler_wl_GCJ='-Wl,'
-       lt_prog_compiler_can_build_shared_GCJ=no
-       ;;
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-Line 16418 
 else
+Line 16016 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:16421: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:16019: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
-    echo "$as_me:16425: \$? = $ac_status" >&5
+    echo "$as_me:16023: \$? = $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.
+      # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+      if test ! -s conftest.err; then
-      $SED '/^$/d' conftest.err >conftest.er2
-      if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-Line 16480 
 else
+Line 16076 
 else
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
-    (eval echo "\"\$as_me:16483: $lt_compile\"" >&5)
+    (eval echo "\"\$as_me:16079: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
-    echo "$as_me:16487: \$? = $ac_status" >&5
+    echo "$as_me:16083: \$? = $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
       # So say no if there are warnings
-      $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+      if test ! -s out/conftest.err; then
-      $SED '/^$/d' out/conftest.err >out/conftest.er2
-      if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
         lt_cv_prog_compiler_c_o_GCJ=yes
       fi
     fi
-Line 16571 
 echo $ECHO_N "checking whether the $comp
+Line 16165 
 echo $ECHO_N "checking whether the $comp
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
    case $host_os in
    cygwin* | mingw* | pw32*)
-Line 16601 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
+Line 16185 
 cc_basename=`$echo "X$cc_temp" | $Xsed -
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
-     # Set some defaults for GNU ld with shared library support. These
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-     export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
-     if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-         whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-       else
-         whole_archive_flag_spec_GCJ=
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>/dev/null` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-       *\ 2.11.*) ;; # other 2.11 versions
-       *) supports_anon_versioning=yes ;;
-     esac
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-Line 16672 
 EOF
+Line 16235 
 EOF
        allow_undefined_flag_GCJ=unsupported
        always_export_symbols_GCJ=no
        enable_shared_with_static_runtimes_GCJ=yes
-       export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+       export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-Line 16686 
 EOF
+Line 16249 
 EOF
          fi~
          $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
        else
-         ld_shlibs_GCJ=no
+         ld_shlibs=no
-       fi
-       ;;
-     linux*)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-         tmp_addflag=
-         case $cc_basename,$host_cpu in
-         pgcc*)                          # Portland Group C compiler
-           whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag'
-           ;;
-         pgf77* | pgf90* )                       # Portland Group f77 and f90 compilers
-           whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-           tmp_addflag=' $pic_flag -Mnomain' ;;
-         ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
-           tmp_addflag=' -i_dynamic' ;;
-         efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-           tmp_addflag=' -i_dynamic -nofor_main' ;;
-         ifc* | ifort*)                  # Intel Fortran compiler
-           tmp_addflag=' -nofor_main' ;;
-         esac
-         archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         if test $supports_anon_versioning = yes; then
-           archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-         fi
-       else
-         ld_shlibs_GCJ=no
        fi
        ;;
-Line 16759 
 EOF
+Line 16291 
 EOF
        hardcode_shlibpath_var_GCJ=no
        ;;
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+         archive_cmds_GCJ="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+         *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+         *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+         *\ 2.11.*) ;; # other 2.11 versions
+         *) supports_anon_versioning=yes ;;
+       esac
+       if test $supports_anon_versioning = yes; then
+         archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+         $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+       else
+         archive_expsym_cmds_GCJ="$tmp_archive_cmds"
+       fi
+     else
+       ld_shlibs_GCJ=no
+     fi
+     ;;
      *)
        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'
-Line 16769 
 EOF
+Line 16326 
 EOF
        ;;
      esac
-     if test "$ld_shlibs_GCJ" = no; then
+     if test "$ld_shlibs_GCJ" = yes; then
-       runpath_var=
+       runpath_var=LD_RUN_PATH
-       hardcode_libdir_flag_spec_GCJ=
+       hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-       export_dynamic_flag_spec_GCJ=
+       export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-       whole_archive_flag_spec_GCJ=
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+         whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec_GCJ=
+       fi
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-Line 16837 
 EOF
+Line 16399 
 EOF
        link_all_deplibs_GCJ=yes
        if test "$GCC" = yes; then
-         case $host_os in aix4.[012]|aix4.[012].*)
+         case $host_os in aix4.012|aix4.012.*)
          # We only want to do this on AIX 4.2 and lower, the check
          # below for broken collect2 doesn't work under 4.3+
            collect2name=`${CC} -print-prog-name=collect2`
-Line 16858 
 EOF
+Line 16420 
 EOF
            fi
          esac
          shared_flag='-shared'
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag="$shared_flag "'${wl}-G'
-         fi
        else
          # not using gcc
          if test "$host_cpu" = ia64; then
-Line 17021 
 if test -z "$aix_libpath"; then aix_libp
+Line 16580 
 if test -z "$aix_libpath"; then aix_libp
        ld_shlibs_GCJ=no
        ;;
-     bsdi[45]*)
+     bsdi4*)
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
-Line 17042 
 if test -z "$aix_libpath"; then aix_libp
+Line 16601 
 if test -z "$aix_libpath"; then aix_libp
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
        old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+       fix_srcfile_path='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_GCJ=yes
        ;;
      darwin* | rhapsody*)
+     if test "$GXX" = yes ; then
+       archive_cmds_need_lc_GCJ=no
        case "$host_os" in
-         rhapsody* | darwin1.[012])
+       rhapsody* | darwin1.[012])
-          allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         allow_undefined_flag_GCJ='-undefined suppress'
-          ;;
+         ;;
-        *) # Darwin 1.3 on
+       *) # Darwin 1.3 on
-          if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-            allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-          else
+       else
-            case ${MACOSX_DEPLOYMENT_TARGET} in
+         case ${MACOSX_DEPLOYMENT_TARGET} in
 .[012])
-                allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+             allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-                ;;
+             ;;
 .*)
-                allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+             allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-                ;;
+             ;;
-            esac
+         esac
-          fi
+       fi
-          ;;
+         ;;
        esac
-       archive_cmds_need_lc_GCJ=no
+         lt_int_apple_cc_single_mod=no
+         output_verbose_link_cmd='echo'
+         if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+           lt_int_apple_cc_single_mod=yes
+         fi
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+         else
+         archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       fi
+       module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+           archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         else
+           archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         fi
+           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}'
        hardcode_direct_GCJ=no
        hardcode_automatic_GCJ=yes
        hardcode_shlibpath_var_GCJ=unsupported
-       whole_archive_flag_spec_GCJ=''
+       whole_archive_flag_spec_GCJ='-all_load $convenience'
        link_all_deplibs_GCJ=yes
-     if test "$GCC" = yes ; then
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $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}'
      else
-       case $cc_basename in
+       ld_shlibs_GCJ=no
-         xlc*)
-          output_verbose_link_cmd='echo'
-          archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-          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}'
-           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}'
-           ;;
-        *)
-          ld_shlibs_GCJ=no
-           ;;
-       esac
      fi
        ;;
-Line 17126 
 if test -z "$aix_libpath"; then aix_libp
+Line 16685 
 if test -z "$aix_libpath"; then aix_libp
        ;;
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | kfreebsd*-gnu | dragonfly*)
+     freebsd* | kfreebsd*-gnu)
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-Line 17237 
 if test -z "$aix_libpath"; then aix_libp
+Line 16796 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
          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
-Line 17283 
 if test -z "$aix_libpath"; then aix_libp
+Line 16841 
 if test -z "$aix_libpath"; then aix_libp
          allow_undefined_flag_GCJ=' -expect_unresolved \*'
          archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
          archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+         $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
          # Both c and cxx compiler support -rpath directly
          hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-Line 17302 
 if test -z "$aix_libpath"; then aix_libp
+Line 16860 
 if test -z "$aix_libpath"; then aix_libp
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
-         wlarc='${wl}'
          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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
        else
-         wlarc=''
          archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
          archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
          $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-Line 17316 
 if test -z "$aix_libpath"; then aix_libp
+Line 16872 
 if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
-       *)
+       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-         # The compiler driver will combine linker options so we
+         whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-         # cannot just pass the convience library names through
-         # without $wl, iff we do not link with $LD.
-         # Luckily, gcc supports the same syntax we need for Sun Studio.
-         # Supported since Solaris 2.6 (maybe 2.5.1?)
-         case $wlarc in
-         '')
-           whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-         *)
-           whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-         esac ;;
        esac
        link_all_deplibs_GCJ=yes
        ;;
-Line 17601 
 beos*)
+Line 17147 
 beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
- bsdi[45]*)
+ bsdi4*)
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-Line 17659 
 cygwin* | mingw* | pw32*)
+Line 17205 
 cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
        ;;
      esac
      ;;
-Line 17717 
 kfreebsd*-gnu)
+Line 17263 
 kfreebsd*-gnu)
    dynamic_linker='GNU ld.so'
    ;;
- freebsd* | dragonfly*)
+ freebsd*)
-   # 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`
    version_type=freebsd-$objformat
    case $version_type in
-Line 17738 
 freebsd* | dragonfly*)
+Line 17282 
 freebsd* | dragonfly*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
-   freebsd3.[01]* | freebsdelf3.[01]*)
+   freebsd3.01* | freebsdelf3.01*)
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-Line 17862 
 linux*)
+Line 17406 
 linux*)
    # before this can be enabled.
    hardcode_into_libs=yes
-   # find out which ABI we are using
    libsuff=
-   case "$host_cpu" in
+   if test "$lt_cv_cc_lib64_suffix" = "yes"; then
-   x86_64*|s390x*|powerpc64*)
+     libsuff=64
-     echo '#line 17869 "configure"' > conftest.$ac_ext
+   fi
-     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-       case `/usr/bin/file conftest.$ac_objext` in
-       *64-bit*)
-         libsuff=64
-         sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-         ;;
-       esac
-     fi
-     rm -rf conftest*
-     ;;
-   esac
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+     lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+     sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} $lt_ld_extra"
+     sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/X11R6/lib${libsuff} /usr/local/lib${libsuff} $lt_ld_extra"
    fi
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-Line 17948 
 nto-qnx*)
+Line 17477 
 nto-qnx*)
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+   need_version=yes
-   case $host_os in
-     openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-     *)                         need_version=no  ;;
-   esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-Line 18074 
 echo "$as_me:$LINENO: checking how to ha
+Line 17599 
 echo "$as_me:$LINENO: checking how to ha
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-    test -n "$runpath_var_GCJ" || \
+    test -n "$runpath_var GCJ" || \
-    test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+    test "X$hardcode_automatic_GCJ"="Xyes" ; then
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_GCJ" != no &&
-Line 18741 
 else
+Line 18266 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 18744 "configure"
+ #line 18269 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 18839 
 else
+Line 18364 
 else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
- #line 18842 "configure"
+ #line 18367 "configure"
  #include "confdefs.h"
  #if HAVE_DLFCN_H
-Line 19057 
 fast_install=$enable_fast_install
+Line 18582 
 fast_install=$enable_fast_install
  # The host system.
  host_alias=$host_alias
  host=$host
- host_os=$host_os
- # The build system.
- build_alias=$build_alias
- build=$build
- build_os=$build_os
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-Line 19139 
 max_cmd_len=$lt_cv_sys_max_cmd_len
+Line 18658 
 max_cmd_len=$lt_cv_sys_max_cmd_len
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- # Must we lock files when doing compilation?
+ # Must we lock files when doing compilation ?
  need_locks=$lt_need_locks
  # Do we need the lib prefix for modules?
-Line 19387 
 LTCC=${LTCC-"$CC"}
+Line 18906 
 LTCC=${LTCC-"$CC"}
  compiler=$CC
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
- ac_outfile=conftest.$ac_objext
- printf "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
- $rm conftest*
  # Allow CC to be a program name with arguments.
  lt_save_CC="$CC"
  CC=${RC-"windres"}
  compiler=$CC
  compiler_RC=$CC
- for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  lt_cv_prog_compiler_c_o_RC=yes
  # The else clause should only fire when bootstrapping the
-Line 19532 
 fast_install=$enable_fast_install
+Line 19027 
 fast_install=$enable_fast_install
  # The host system.
  host_alias=$host_alias
  host=$host
- host_os=$host_os
- # The build system.
- build_alias=$build_alias
- build=$build
- build_os=$build_os
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-Line 19614 
 max_cmd_len=$lt_cv_sys_max_cmd_len
+Line 19103 
 max_cmd_len=$lt_cv_sys_max_cmd_len
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- # Must we lock files when doing compilation?
+ # Must we lock files when doing compilation ?
  need_locks=$lt_need_locks
  # Do we need the lib prefix for modules?
-Line 20990 
 s,@AUTOCONF@,$AUTOCONF,;t t
+Line 20479 
 s,@AUTOCONF@,$AUTOCONF,;t t
  s,@AUTOMAKE@,$AUTOMAKE,;t t
  s,@AUTOHEADER@,$AUTOHEADER,;t t
  s,@MAKEINFO@,$MAKEINFO,;t t
- s,@AMTAR@,$AMTAR,;t t
  s,@install_sh@,$install_sh,;t t
  s,@STRIP@,$STRIP,;t t
  s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
  s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+ s,@mkdir_p@,$mkdir_p,;t t
  s,@AWK@,$AWK,;t t
  s,@SET_MAKE@,$SET_MAKE,;t t
  s,@am__leading_dot@,$am__leading_dot,;t t
+ s,@AMTAR@,$AMTAR,;t t
+ s,@am__tar@,$am__tar,;t t
+ s,@am__untar@,$am__untar,;t t
  s,@build@,$build,;t t
  s,@build_cpu@,$build_cpu,;t t
  s,@build_vendor@,$build_vendor,;t t
-Line 21673 
 echo X"$mf" |
+Line 21165 
 echo X"$mf" |
    else
      continue
    fi
-   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+   # Extract the definition of DEPDIR, am__include, and am__quote
-   # Extract the definition of DEP_FILES from the Makefile without
+   # from the Makefile without running `make'.
-   # running `make'.
+   DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
    test -z "$DEPDIR" && continue
+   am__include=`sed -n 's/^am__include = //p' < "$mf"`
+   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 -e '/^U = / s///p' < "$mf"`
+   U=`sed -n 's/^U = //p' < "$mf"`
-   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+   # Find all dependency output files, they are included files with
-   # We invoke sed twice because it is the simplest approach to
+   # $(DEPDIR) in their names.  We invoke sed twice because it is the
-   # changing $(DEPDIR) to its actual value in the expansion.
+   # simplest approach to changing $(DEPDIR) to its actual value in the
-   for file in `sed -n -e '
+   # expansion.
-     /^DEP_FILES = .*\\\\$/ {
+   for file in `sed -n "
-       s/^DEP_FILES = //
+     s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       :loop
-         s/\\\\$//
-         p
-         n
-         /\\\\$/ b loop
-       p
-     }
-     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue

 Legend:



Removed from v.4.2.2.1.2.1
 


changed lines


 
Added in v.5.0
 Legend:



Removed from v.4.2.2.1.2.1
 


changed lines


 
Added in v.5.0
-Removed from v.4.2.2.1.2.1
+Added in v.5.0

	ViewVC Help
Powered by ViewVC 1.1.23