Translations added/updated for spanish, persian, japanese, korean, brasilian and chinese

(Old svn revision: 4510)

12 files changed, 1640 insertions, 778 deletions

diff --git a/configure b/configure
index bfe96a57..02c5ff55 100755
--- a/configure
+++ b/configure
@@ -390,9 +390,9 @@ fi
 
 
 
-tagnames=${tagnames+${tagnames},}CXX
+tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
 
-tagnames=${tagnames+${tagnames},}F77
+tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -2860,32 +2860,18 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    : > 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
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -2903,12 +2889,11 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep conftest.h 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
@@ -3225,13 +3210,14 @@ fi
 rm -f conftest*
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
+
+        echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -3267,69 +3253,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
+  ac_cv_lib_cposix_strerror=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_lib_cposix_strerror=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  done
+LIBS=$ac_check_lib_save_LIBS
 fi
-LIBS=$ac_func_search_save_LIBS
+echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
+if test $ac_cv_lib_cposix_strerror = yes; then
+  LIBS="$LIBS -lcposix"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-fi
+
 
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -4392,32 +4332,18 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    : > 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
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -4435,12 +4361,11 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep conftest.h 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
@@ -4760,7 +4685,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     # Accept absolute paths.
     [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
+      # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -4829,7 +4754,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
@@ -4950,19 +4875,12 @@ bsdi4*)
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
-cygwin*)
+cygwin* | mingw* | pw32*)
   # win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
   lt_cv_file_magic_cmd='win32_libid'
   ;;
 
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
 darwin* | rhapsody*)
   # this will be overwritten by pass_all, but leave it in just in case
   lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
@@ -4978,7 +4896,7 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -5040,15 +4958,13 @@ irix5* | irix6* | nonstopux*)
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
+  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
     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
   ;;
 
 netbsd*)
@@ -5065,7 +4981,7 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-nto-qnx*)
+nto-qnx)
   lt_cv_deplibs_check_method=unknown
   ;;
 
@@ -5171,7 +5087,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5174 "configure"' > conftest.$ac_ext
+  echo '#line 5090 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5220,7 +5136,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*|powerpc64-*linux*)
+        ppc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -5803,32 +5719,18 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
 
   am_cv_CXX_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    : > 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
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -5846,12 +5748,11 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
          >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep conftest.h 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
@@ -6210,7 +6111,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:6213:" \
+echo "$as_me:6114:" \
      "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
@@ -6372,12 +6273,6 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
  *)
     # 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
@@ -7203,8 +7098,7 @@ lt_prog_compiler_no_builtin_flag=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7222,11 +7116,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7225: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7119: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7229: \$? = $ac_status" >&5
+   echo "$as_me:7123: \$? = $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
@@ -7369,12 +7263,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 
     linux*)
       case $CC in
-      icc* | ecc*)
+      icc|ecc)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
-      ccc*)
+      ccc)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
@@ -7436,8 +7330,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7455,11 +7348,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7458: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7351: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7462: \$? = $ac_status" >&5
+   echo "$as_me:7355: \$? = $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
@@ -7522,11 +7415,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7525: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7418: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7529: \$? = $ac_status" >&5
+   echo "$as_me:7422: \$? = $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
@@ -7536,11 +7429,8 @@ else
      fi
    fi
    chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   $rm conftest* out/*
+   rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -8007,27 +7897,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
 	;;
       esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=no
     	output_verbose_link_cmd='echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -8038,21 +7921,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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'
+      module_cmds='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $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}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $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
       ;;
 
@@ -8086,7 +7967,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -8446,6 +8327,72 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6
   ;;
 esac
 
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+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 "X$hardcode_automatic"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
@@ -8539,7 +8486,7 @@ aix4* | aix5*)
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
   ;;
 
 beos*)
@@ -8586,7 +8533,7 @@ cygwin* | mingw* | pw32*)
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -8625,16 +8572,17 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
   fi
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
@@ -8652,18 +8600,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -8816,18 +8752,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -8853,7 +8777,7 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
+nto-qnx)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -8866,7 +8790,7 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  need_version=no
   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
@@ -8984,72 +8908,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-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 "X$hardcode_automatic"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -9569,7 +9427,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9572 "configure"
+#line 9430 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9667,7 +9525,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9670 "configure"
+#line 9528 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9798,41 +9656,32 @@ aix4*)
   fi
   ;;
   darwin* | rhapsody*)
-  if test "$GCC" = yes; then
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
+      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
       ;;
     esac
-    output_verbose_link_cmd='echo'
+    # FIXME: Relying on posixy $() will cause problems for
+    #        cross-compilation, but unfortunately the echo tests do not
+    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+    #	       `"' quotes if we put them in here... so don't!
+		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'
+    module_cmds='$CC -bundle $allow_undefined_flag -o $lib $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}'
+		  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 -bundle $allow_undefined_flag  -o $lib $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
+    fi
     ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -10490,7 +10339,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
     # Accept absolute paths.
     [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
+      # Canonicalize the path of ld
       ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -10559,7 +10408,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
@@ -10604,7 +10453,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -10854,54 +10703,41 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   ;;
 
   darwin* | rhapsody*)
-  if test "$GXX" = yes; then
+   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
     archive_cmds_need_lc_CXX=no
     case "$host_os" in
     rhapsody* | darwin1.[012])
       allow_undefined_flag_CXX='-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
+      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
       ;;
     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'
+    	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 -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $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}'
+      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 -bundle $allow_undefined_flag  -o $lib $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
+   fi
     ;;
 
   dgux*)
@@ -10928,7 +10764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -11635,7 +11471,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -11803,8 +11639,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11822,11 +11657,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11825: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11660: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11829: \$? = $ac_status" >&5
+   echo "$as_me:11664: \$? = $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
@@ -11889,11 +11724,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11892: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11727: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11896: \$? = $ac_status" >&5
+   echo "$as_me:11731: \$? = $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
@@ -11903,11 +11738,8 @@ else
      fi
    fi
    chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   $rm conftest* out/*
+   rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -12035,6 +11867,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
   ;;
 esac
 
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+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 "X$hardcode_automatic_CXX"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
@@ -12128,7 +12026,7 @@ aix4* | aix5*)
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
   ;;
 
 beos*)
@@ -12175,7 +12073,7 @@ cygwin* | mingw* | pw32*)
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -12214,16 +12112,17 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
   fi
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
@@ -12241,18 +12140,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -12405,18 +12292,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -12442,7 +12317,7 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
+nto-qnx)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12455,7 +12330,7 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  need_version=no
   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
@@ -12573,72 +12448,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-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 "X$hardcode_automatic_CXX"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -13158,7 +12967,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13161 "configure"
+#line 12970 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13256,7 +13065,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13259 "configure"
+#line 13068 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13993,12 +13802,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 
     linux*)
       case $CC in
-      icc* | ecc*)
+      icc|ecc)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
-      ccc*)
+      ccc)
         lt_prog_compiler_wl_F77='-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
@@ -14060,8 +13869,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14079,11 +13887,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14082: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13890: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14086: \$? = $ac_status" >&5
+   echo "$as_me:13894: \$? = $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
@@ -14146,11 +13954,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14149: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13957: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14153: \$? = $ac_status" >&5
+   echo "$as_me:13961: \$? = $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
@@ -14160,11 +13968,8 @@ else
      fi
    fi
    chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   $rm conftest* out/*
+   rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -14609,27 +14414,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
       archive_cmds_need_lc_F77=no
       case "$host_os" in
       rhapsody* | darwin1.[012])
 	allow_undefined_flag_F77='-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
 	;;
       esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=no
     	output_verbose_link_cmd='echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -14640,21 +14438,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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'
+      module_cmds_F77='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $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}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $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='-all_load $convenience'
       link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
     fi
       ;;
 
@@ -14688,7 +14484,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -15048,6 +14844,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
   ;;
 esac
 
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+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 "X$hardcode_automatic_F77"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_F77" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+     test "$hardcode_minus_L_F77" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_F77=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_F77=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_F77=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
@@ -15141,7 +15003,7 @@ aix4* | aix5*)
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
   ;;
 
 beos*)
@@ -15188,7 +15050,7 @@ cygwin* | mingw* | pw32*)
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -15227,16 +15089,17 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
   fi
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
@@ -15254,18 +15117,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -15418,18 +15269,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -15455,7 +15294,7 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
+nto-qnx)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15468,7 +15307,7 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  need_version=no
   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
@@ -15586,73 +15425,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-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 "X$hardcode_automatic_F77"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -16104,8 +15876,7 @@ lt_prog_compiler_no_builtin_flag_GCJ=
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
 
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16123,11 +15894,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16126: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15897: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16130: \$? = $ac_status" >&5
+   echo "$as_me:15901: \$? = $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
@@ -16270,12 +16041,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 
     linux*)
       case $CC in
-      icc* | ecc*)
+      icc|ecc)
 	lt_prog_compiler_wl_GCJ='-Wl,'
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
-      ccc*)
+      ccc)
         lt_prog_compiler_wl_GCJ='-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
@@ -16337,8 +16108,7 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16356,11 +16126,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16359: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16129: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16363: \$? = $ac_status" >&5
+   echo "$as_me:16133: \$? = $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
@@ -16423,11 +16193,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16426: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16430: \$? = $ac_status" >&5
+   echo "$as_me:16200: \$? = $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
@@ -16437,11 +16207,8 @@ else
      fi
    fi
    chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   $rm conftest* out/*
+   rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -16908,27 +16675,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
+    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
       archive_cmds_need_lc_GCJ=no
       case "$host_os" in
       rhapsody* | darwin1.[012])
 	allow_undefined_flag_GCJ='-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
+	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
 	;;
       esac
+      # FIXME: Relying on posixy $() will cause problems for
+      #        cross-compilation, but unfortunately the echo tests do not
+      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=no
     	output_verbose_link_cmd='echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -16939,21 +16699,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     	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'
+      module_cmds_GCJ='$CC -bundle ${wl}-bind_at_load $allow_undefined_flag -o $lib $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}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $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='-all_load $convenience'
       link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
     fi
       ;;
 
@@ -16987,7 +16745,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -17347,6 +17105,72 @@ echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
   ;;
 esac
 
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+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 "X$hardcode_automatic_GCJ"="Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_GCJ" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+     test "$hardcode_minus_L_GCJ" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" = relink; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib="$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
@@ -17440,7 +17264,7 @@ aix4* | aix5*)
 amigaos*)
   library_names_spec='$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
   ;;
 
 beos*)
@@ -17487,7 +17311,7 @@ cygwin* | mingw* | pw32*)
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -17526,16 +17350,17 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
+  # FIXME: Relying on posixy $() will cause problems for
+  #        cross-compilation, but unfortunately the echo tests do not
+  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext='$(test .$module = .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
   fi
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
@@ -17553,18 +17378,6 @@ freebsd1*)
   dynamic_linker=no
   ;;
 
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -17717,18 +17530,6 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -17754,7 +17555,7 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
+nto-qnx)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17767,7 +17568,7 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  need_version=no
   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
@@ -17885,72 +17686,6 @@ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-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 "X$hardcode_automatic_GCJ"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -18470,7 +18205,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18473 "configure"
+#line 18208 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18568,7 +18303,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18571 "configure"
+#line 18306 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21441,7 +21176,8 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-  ALL_LINGUAS="az ca de es es_MX fr hi it ko nl no pl sv ta tr zh_CN
+  ALL_LINGUAS="az ca de es es_MX fa_IR fr hi it ja ko nl no pl
+	 pt_BR sv ta tr zh_CN
 	 zh_TW"
 
 
@@ -22266,6 +22002,8 @@ else
 echo "${ECHO_T}no" >&6
 fi
 	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
 
 for ac_func in dcgettext
 do
@@ -22551,6 +22289,7 @@ fi
 	    esac
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+          LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
 	  gt_cv_have_gettext=no
diff --git a/configure.ac b/configure.ac
index e52c92a5..27d6df70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,8 @@ AC_CHECK_FUNCS([_IceTransNoListen])
 LIBS="$ac_LIBS"
 
 dnl Check for i18n support
-BM_I18N([xfce4-session], [az ca de es es_MX fr hi it ko nl no pl sv ta tr zh_CN
+BM_I18N([xfce4-session], [az ca de es es_MX fa_IR fr hi it ja ko nl no pl
+	 pt_BR sv ta tr zh_CN
 	 zh_TW])
 
 dnl Check for required packages
diff --git a/po/es.gmo b/po/es.gmo
index 44bdc9b0..ecea15aa 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index e41764ed..94360c08 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2003-07-19 13:15+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2004-01-13 00:00+0100\n"
+"Last-Translator: Jaime Buffery <nestu@lunar-linux.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr "Tema por omisión"
 
 #: settings/session.c:232
 msgid "Default splash screen"
-msgstr "Desplegado inicial"
+msgstr "Imagen de arranque por defecto"
 
 #: settings/session.c:271
 #, c-format
@@ -39,7 +39,7 @@ msgstr "Autor:"
 #: settings/session.c:377
 #, c-format
 msgid "Unable to install splash theme from file %s: %s"
-msgstr "Imposible instalar tema para desplegado del archivo %s: %s"
+msgstr "Imposible instalar tema de arraque desde archivo %s: %s"
 
 #: settings/session.c:398 settings/session.c:740
 msgid "Install new theme"
@@ -47,7 +47,7 @@ msgstr "Instalar tema nuevo"
 
 #: settings/session.c:477 settings/session.c:600 settings/session.c:614
 msgid "Session management"
-msgstr "Administración de session"
+msgstr "Administración de sesión"
 
 #. General settings
 #: settings/session.c:625
@@ -64,53 +64,59 @@ msgid ""
 "Should the session manager ask the user to confirm the logout. If disabled, "
 "the session will be closed without any further user interaction."
 msgstr ""
+"¿Debería el gestor de sesión preguntar al usuario si confirma la salida? Si se deshabilita, "
+"la sesión será cerrada sin más interacción del usuario"
 
 #: settings/session.c:647
 msgid "Automatically save session on logout"
-msgstr "Guardar sessión al salir"
+msgstr "Guardar sesión automáticamente al salir"
 
 #.
 #: settings/session.c:654
 #, fuzzy
 msgid "Show tray icon"
-msgstr "Mostrar información del tema"
+msgstr "Mostrar bandeja de iconos"
 
 #: settings/session.c:656
 msgid ""
 "Show the session managers tray icon in the desktops notification area (also "
 "known as the system tray)."
 msgstr ""
+"Mostrar la bandeja de iconos del gestor de sesión en la zona de notificación de escritorios "
+"(también conocido como bandeja de sistema)."
 
 #. Logout action settings
 #: settings/session.c:665
 msgid "Default action on logout"
-msgstr "Acción por omisión al salir"
+msgstr "Acción por defecto al salir"
 
 #.
 #: settings/session.c:677 xfce4-session/shutdown.c:252
 msgid "_Quit current session"
-msgstr "_Salir de la sessión"
+msgstr "_Salir de la sesión actual"
 
 #.
 #: settings/session.c:681 xfce4-session/shutdown.c:257
 msgid "_Reboot the computer"
-msgstr "_Reiniciar la computadora"
+msgstr "_Reiniciar el ordenador"
 
 #.
 #: settings/session.c:685 xfce4-session/shutdown.c:262
 msgid "_Turn off computer"
-msgstr "_Apagar la computadora"
+msgstr "_Apagar el ordenador"
 
 #. Logout action settings
 #: settings/session.c:697
 msgid "Splash screen theme"
-msgstr "Tema del desplegado"
+msgstr "Tema de arranque inicial"
 
 #: settings/session.c:721
 msgid ""
 "Select the splash screen theme that should be displayed when the session is "
 "started."
 msgstr ""
+"Seleccione el tema de la imagen inicial que debe ser mostrado cuando se "
+"inicie la sesión."
 
 #: settings/session.c:731
 msgid "Show theme info"
@@ -121,7 +127,7 @@ msgstr "Mostrar información del tema"
 #: xfce4-session/manager.c:835
 #, c-format
 msgid "%u clients connected"
-msgstr ""
+msgstr "%u clientes conectados"
 
 #: xfce4-session/main.c:93
 msgid "desktop"
@@ -129,39 +135,43 @@ msgstr "escritorio"
 
 #: xfce4-session/main.c:120
 msgid "Starting session manager.."
-msgstr "Comenzando administrador de sessión"
+msgstr "Arrancando gestor de sesión.."
 
 #: xfce4-session/main.c:140
 #, c-format
 msgid ""
 "Unable to create users XFce settings\n"
 "directory %s: %s"
-msgstr "Imposible crear configuracion de usuariodirectorio %s: %s"
+msgstr ""
+"Imposible crear el directorio de \n"
+"configuración de usuario %s: %s"
 
 #: xfce4-session/main.c:149
 #, c-format
 msgid ""
 "Unable to create users XFce session\n"
 "directory %s: %s"
-msgstr "Imposible crear session de usuariodirectorio %s: %s"
+msgstr ""
+"Imposible crear un directorio de sesión\n"
+"para usuarios de XFce %s: %s"
 
 #.
 #: xfce4-session/main.c:295 xfce4-session/session-control.c:268
 #, fuzzy
 msgid "Session control"
-msgstr "Administración de session"
+msgstr "Control de sesión"
 
 #.
 #: xfce4-session/main.c:310
 #, fuzzy
 msgid "Save session"
-msgstr "Salir de sessión"
+msgstr "Salir de sesión"
 
 #.
 #: xfce4-session/main.c:319
 #, fuzzy
 msgid "Quit session"
-msgstr "Salir de sessión"
+msgstr "Salir de sesión"
 
 #: xfce4-session/main.c:415
 msgid ""
@@ -171,12 +181,14 @@ msgid ""
 "Please contact your local system administrator\n"
 "and report the problem."
 msgstr ""
-"Imposible comenzar el administrador de configuración\n"
-"Verifique su instalación de XFCE."
+"El gestor de sesión fue incapaz de arrancar el administrador\n"
+"de configuración MCS. Esto suele ocurrir por una instalación\n"
+"defectuosa de XFce. Por favor, contacto con su administrador\n"
+"de sistemas local y hágale saber el problma."
 
 #: xfce4-session/main.c:432
 msgid "Unable to create MCS client"
-msgstr "Imposible comenzar el cliente MCS"
+msgstr "Imposible arrancar el cliente MCS"
 
 #: xfce4-session/manager.c:342
 msgid ""
@@ -184,6 +196,9 @@ msgid ""
 "previous session. It'll therefore start a default\n"
 "session."
 msgstr ""
+"El gestor de sesiones fue incapaz de restaurar su\n"
+"sesión previa. Así pues, arrancará una sesión\n"
+"por defecto."
 
 #: xfce4-session/manager.c:824
 #, c-format
@@ -201,7 +216,7 @@ msgstr ""
 
 #: xfce4-session/shutdown.c:191
 msgid "Logout session"
-msgstr "Salir de sessión"
+msgstr "Salir de sesión"
 
 #: xfce4-session/shutdown.c:221
 #, c-format
@@ -211,11 +226,11 @@ msgstr "Terminar session para <b>%s</b>"
 #.
 #: xfce4-session/shutdown.c:244
 msgid "What do you want to do next?"
-msgstr "¿Y ahora que quieres hacer?"
+msgstr "¿Y ahora qué es lo siguiente que quiere hacer?"
 
 #: xfce4-session/shutdown.c:275
 msgid "_Save session for future logins"
-msgstr "_Guardar session"
+msgstr "_Guardar sesión para sesiones futuras"
 
 #: xfce4-session/shutdown.c:349 xfce4-session/shutdown.c:358
 #, c-format
@@ -224,7 +239,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Ocurrió el siguiente error:\n"
+"Ocurrió el siguiente error cuando se intentaba apagar el ordenador:\n"
 "\n"
 "%s"
 
@@ -240,76 +255,76 @@ msgstr "Haciendo el autoarranque..."
 
 #: xfce4-session/startup.c:207
 msgid "Starting session manager..."
-msgstr "Comenzando el administrador de sessión"
+msgstr "Comenzando el administrador de sessón"
 
 #: xfce4-session/session-control.c:72
 msgid "Idle"
-msgstr ""
+msgstr "inactivo"
 
 #: xfce4-session/session-control.c:73
 msgid "Interacting"
-msgstr ""
+msgstr "interactuando"
 
 #: xfce4-session/session-control.c:74
 msgid "Save completed"
-msgstr ""
+msgstr "Salvar completado"
 
 #: xfce4-session/session-control.c:75
 msgid "Saving"
-msgstr ""
+msgstr "Salvando"
 
 #. global save
 #: xfce4-session/session-control.c:76
 msgid "Saving (local)"
-msgstr ""
+msgstr "Salvando (local)"
 
 #. local save
 #: xfce4-session/session-control.c:77
 msgid "Waiting to interact"
-msgstr ""
+msgstr "Esperando a interactuar"
 
 #: xfce4-session/session-control.c:78
 msgid "Waiting to enter Phase2"
-msgstr ""
+msgstr "Esperando a entrar a Fase2"
 
 #: xfce4-session/session-control.c:79
 msgid "Disconnecting"
-msgstr ""
+msgstr "Desconectando"
 
 #: xfce4-session/session-control.c:200
 #, fuzzy, c-format
 msgid "Unable to clone client: %s"
-msgstr "Imposible comenzar el cliente MCS"
+msgstr "Imposible clonar el cliente: %s "
 
 #: xfce4-session/session-control.c:299
 msgid "Priority"
-msgstr ""
+msgstr "Prioridad"
 
 #: xfce4-session/session-control.c:304
 msgid "Program"
-msgstr ""
+msgstr "Programa"
 
 #: xfce4-session/session-control.c:309
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #: xfce4-session/session-control.c:314
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. kill button
 #: xfce4-session/session-control.c:333
 msgid "Kill client"
-msgstr ""
+msgstr "Matar cliente"
 
 #. clone button
 #: xfce4-session/session-control.c:339
 msgid "Clone client"
-msgstr ""
+msgstr "Clonar cliente"
 
 #: xfce4-session/session-control.c:445 xfce4-session/session-control.c:448
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: xfce4-shutdown/main.c:137
 #, c-format
@@ -329,9 +344,10 @@ msgid ""
 "of people allowed to execute shutdown actions, by\n"
 "adding your username to the file %s.\n"
 msgstr ""
-"Usted no está autorizado para ejecutar \"%s\".\n"
-"Pregunte a su administrador o configure bien su sistema\n"
-"agregando su nombre al archivo %s.\n"
+"Usted no está autorizado para ejecutar la acción \"%s\".\n"
+"Pida a su administrador de sistemas que le añada a la lista\n"
+"de personas con permisos para realizar acciones de apagado\n"
+"agregando su usuario al archivo %s.\n"
 
 #: xfce4-shutdown/main.c:192
 msgid ""
@@ -339,9 +355,9 @@ msgid ""
 "installation, or contact your system administrator\n"
 "and report the problem.\n"
 msgstr ""
-"Imposible cerrar el sistema. Verifique su instalación\n"
-"o reporte el problema con el servicio técnico\n"
-"especializado.\n"
+"Es imposible apagar el sistema. Verifique su instalación\n"
+"o póngase en contacto con su administrador de sistemas\n"
+"y ponga en su conocimiento el problema.\n"
 
 #: xfce4-shutdown/main.c:209
 #, c-format
@@ -351,7 +367,7 @@ msgid ""
 "name to %s or to install sudo(8) and grant\n"
 "you the right execute reboot and halt commands.\n"
 msgstr ""
-"No hay forma de cerrar el sistema. Consulte con\n"
-"su administrador o agregue su cuenta al archivo\n"
-"%s, o bien lea el manual de instalación de sudo(8)\n"
-"para permitirse la ejecución de \"reboot\" y \"halt\".\n"
+"No hay forma de apagar el sistema. Debería pedirle\n"
+"a su administrador de sistemas para que o bien le agregue\n"
+"su cuenta a %s o bien instale sudo(8) y le dé privilegios\n"
+"para ejecutar comandos de reinicio y apagado.\n"
diff --git a/po/fa_IR.gmo b/po/fa_IR.gmo
new file mode 100644
index 00000000..ffd6090e
--- /dev/null
+++ b/po/fa_IR.gmo
diff --git a/po/fa_IR.po b/po/fa_IR.po
new file mode 100644
index 00000000..eb8e1117
--- /dev/null
+++ b/po/fa_IR.po
@@ -0,0 +1,372 @@
+# translation of xfce4-session.po to Persian
+# Persian translation of xfce4-session.
+# Copyright (C) 2003 THE xfce4-session'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the xfce4-session package.
+# Abbas Izad <abbasizad@hotmail.com>, 2003.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-session\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-19 13:15+0200\n"
+"PO-Revision-Date: 2003-12-24 15:44+0330\n"
+"Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
+"Language-Team: Persian <fa@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+
+#: settings/session.c:227
+msgid "Default Theme"
+msgstr "تم پیش‌فرض"
+
+#: settings/session.c:232
+msgid "Default splash screen"
+msgstr "تصویر آغازی پیش‌فرض"
+
+#: settings/session.c:271
+#, c-format
+msgid "About %s..."
+msgstr "درباره‌ی %s..."
+
+#: settings/session.c:293
+msgid "Info:"
+msgstr "اطلاعات:"
+
+#: settings/session.c:301
+msgid "Author:"
+msgstr "نویسنده:"
+
+#: settings/session.c:377
+#, c-format
+msgid "Unable to install splash theme from file %s: %s"
+msgstr "نمی‌توان تم آغازی را از پرونده‌ی %s نصب کرد: %s"
+
+#: settings/session.c:398 settings/session.c:740
+msgid "Install new theme"
+msgstr "نصب کردن تم جدید"
+
+#: settings/session.c:477 settings/session.c:600 settings/session.c:614
+msgid "Session management"
+msgstr "مدیریت نشست"
+
+#. General settings
+#: settings/session.c:625
+msgid "General"
+msgstr "عمومی"
+
+#.
+#: settings/session.c:634
+msgid "Confirm logout"
+msgstr "تصدیق ثبت خروج"
+
+#: settings/session.c:636
+msgid ""
+"Should the session manager ask the user to confirm the logout. If disabled, "
+"the session will be closed without any further user interaction."
+msgstr ""
+"آیا مدیر نشست از کاربر برای تصدیق ثبت خروج سؤال کند؟ اگر از کار افتاده باشد، "
+"نشست بدون هیچگونه تماسی با کاربر بسته خواهد شد."
+
+#: settings/session.c:647
+msgid "Automatically save session on logout"
+msgstr "ذخیره کردن خودکار نشست هنگام ثبت خروج"
+
+#.
+#: settings/session.c:654
+msgid "Show tray icon"
+msgstr "نشان دادن شمایل سینی"
+
+#: settings/session.c:656
+msgid ""
+"Show the session managers tray icon in the desktops notification area (also "
+"known as the system tray)."
+msgstr ""
+"نشان دادن شمایل سینی مدیران نشست در ناحیه‌ی تذکر رومیزی‌ها (که به "
+"سینی سیستم شناخته می‌شود)."
+
+#. Logout action settings
+#: settings/session.c:665
+msgid "Default action on logout"
+msgstr "عمل پیش‌فرض هنگام ثبت‌خروج"
+
+#.
+#: settings/session.c:677 xfce4-session/shutdown.c:252
+msgid "_Quit current session"
+msgstr "ـترک کردن نشست کنونی"
+
+#.
+#: settings/session.c:681 xfce4-session/shutdown.c:257
+msgid "_Reboot the computer"
+msgstr "ـراه‌اندازی مجدد رایانه"
+
+#.
+#: settings/session.c:685 xfce4-session/shutdown.c:262
+msgid "_Turn off computer"
+msgstr "ـخاموش کردن رایانه"
+
+#. Logout action settings
+#: settings/session.c:697
+msgid "Splash screen theme"
+msgstr "تم تصویر آغازی"
+
+#: settings/session.c:721
+msgid ""
+"Select the splash screen theme that should be displayed when the session is "
+"started."
+msgstr "انتخاب کردن تم تصویر آغازی که باید هنگام شروع نشست نمایش داده شود."
+
+#: settings/session.c:731
+msgid "Show theme info"
+msgstr "نشان دادن اطلاعات تم"
+
+#. update the tray icon tip
+#: xfce4-session/ice-layer.c:133 xfce4-session/manager.c:525
+#: xfce4-session/manager.c:835
+#, c-format
+msgid "%u clients connected"
+msgstr "%u کارگیر وصل شده‌اند"
+
+#: xfce4-session/main.c:93
+msgid "desktop"
+msgstr "رومیزی"
+
+#: xfce4-session/main.c:120
+msgid "Starting session manager.."
+msgstr "در حال راه‌اندازی مدیر نشست..."
+
+#: xfce4-session/main.c:140
+#, c-format
+msgid ""
+"Unable to create users XFce settings\n"
+"directory %s: %s"
+msgstr ""
+"نمی‌توان شاخه‌ی %s تنظیمات XFce کاربران را\n"
+"ایجاد کرد: %s"
+
+#: xfce4-session/main.c:149
+#, c-format
+msgid ""
+"Unable to create users XFce session\n"
+"directory %s: %s"
+msgstr ""
+"نمی‌توان شاخه‌ی %s نشست XFce کاربران را\n"
+"ایجاد کرد: %s"
+
+#.
+#: xfce4-session/main.c:295 xfce4-session/session-control.c:268
+msgid "Session control"
+msgstr "کنترل نشست"
+
+#.
+#: xfce4-session/main.c:310
+msgid "Save session"
+msgstr "ذخیره کردن نشست"
+
+#.
+#: xfce4-session/main.c:319
+msgid "Quit session"
+msgstr "ترک کردن نشست"
+
+#: xfce4-session/main.c:415
+msgid ""
+"The session manager was unable to start the\n"
+"Multi-Channel settings manager. This is most\n"
+"often caused by a broken XFce installation.\n"
+"Please contact your local system administrator\n"
+"and report the problem."
+msgstr ""
+"مدیر نشست قادر به راه‌اندازی مدیر تنظیمات\n"
+"چند-کانالی نشد. این اغلب بدلیل یک نصب\n"
+"خراب XFce می‌باشد.\n"
+"لطفا با مدیر سیستم محلی خود تماس گرفته\n"
+"و این اشکال را گزارش دهید."
+
+#: xfce4-session/main.c:432
+msgid "Unable to create MCS client"
+msgstr "نمی‌توان کارگیر MCS را ایجاد کرد"
+
+#: xfce4-session/manager.c:342
+msgid ""
+"The session manager was unable to restore your\n"
+"previous session. It'll therefore start a default\n"
+"session."
+msgstr ""
+"مدیر نشست قادر به بازسازی نشست قبلی\n"
+"شما نبود. بنابرین یک نشست پیش‌فرض را\n"
+"راه‌اندازی می‌کند."
+
+#: xfce4-session/manager.c:824
+#, c-format
+msgid ""
+"The client \"%s\" closed the connection\n"
+"to the session manager. The following reason\n"
+"was given:\n"
+"\n"
+"%s"
+msgstr ""
+"کارگیر \"%s\" ارتباط با مدیر نشست\n"
+"را قطع کرد. دلیل بدنبال آمده\n"
+"ارائه شد:\n"
+"\n"
+"%s"
+
+#: xfce4-session/shutdown.c:191
+msgid "Logout session"
+msgstr "نشست ثبت‌خروج"
+
+#: xfce4-session/shutdown.c:221
+#, c-format
+msgid "End session for <b>%s</b>"
+msgstr "پایان نشست برای <b>%s</b>"
+
+#.
+#: xfce4-session/shutdown.c:244
+msgid "What do you want to do next?"
+msgstr "بعد چکار می‌خواهید بکنید؟"
+
+#: xfce4-session/shutdown.c:275
+msgid "_Save session for future logins"
+msgstr "ـذخیره کردن نشست برای ثبت‌های‌ورود آینده"
+
+#: xfce4-session/shutdown.c:349 xfce4-session/shutdown.c:358
+#, c-format
+msgid ""
+"The following error occured while trying to shutdown the computer:\n"
+"\n"
+"%s"
+msgstr ""
+"خطای بدنبال آمده هنگام تلاش برای خاموش کردن رایانه رخ داد:\n"
+"\n"
+"%s"
+
+#.
+#: xfce4-session/splash-screen.c:271
+#, c-format
+msgid "Starting %s..."
+msgstr "در حال راه‌اندازی %s..."
+
+#: xfce4-session/startup.c:149
+msgid "Doing Autostart..."
+msgstr "در حال راه‌اندازی خودکار..."
+
+#: xfce4-session/startup.c:207
+msgid "Starting session manager..."
+msgstr "در حال راه‌اندازی مدیر نشست..."
+
+#: xfce4-session/session-control.c:72
+msgid "Idle"
+msgstr "عاطل"
+
+#: xfce4-session/session-control.c:73
+msgid "Interacting"
+msgstr "در حال محاوره"
+
+#: xfce4-session/session-control.c:74
+msgid "Save completed"
+msgstr "ذخیره کردن تکمیل شد"
+
+#: xfce4-session/session-control.c:75
+msgid "Saving"
+msgstr "در حال ذخیره‌ کردن"
+
+#. global save
+#: xfce4-session/session-control.c:76
+msgid "Saving (local)"
+msgstr "در حال ذخیره‌ کردن (محلی)"
+
+#. local save
+#: xfce4-session/session-control.c:77
+msgid "Waiting to interact"
+msgstr "در حال انتظار برای محاوره"
+
+#: xfce4-session/session-control.c:78
+msgid "Waiting to enter Phase2"
+msgstr "در حال انتظار برای ورود مرحله‌ی۲"
+
+#: xfce4-session/session-control.c:79
+msgid "Disconnecting"
+msgstr "در حال قطع کردن"
+
+#: xfce4-session/session-control.c:200
+#, c-format
+msgid "Unable to clone client: %s"
+msgstr "ناتوان در کلون کردن کارگیر: %s"
+
+#: xfce4-session/session-control.c:299
+msgid "Priority"
+msgstr "اولویت"
+
+#: xfce4-session/session-control.c:304
+msgid "Program"
+msgstr "برنامه"
+
+#: xfce4-session/session-control.c:309
+msgid "User"
+msgstr "کاربر"
+
+#: xfce4-session/session-control.c:314
+msgid "State"
+msgstr "وضعیت"
+
+#. kill button
+#: xfce4-session/session-control.c:333
+msgid "Kill client"
+msgstr "کشتن کارگیر"
+
+#. clone button
+#: xfce4-session/session-control.c:339
+msgid "Clone client"
+msgstr "کلون کردن کارگیر"
+
+#: xfce4-session/session-control.c:445 xfce4-session/session-control.c:448
+msgid "Unknown"
+msgstr "ناشناس"
+
+#: xfce4-shutdown/main.c:137
+#, c-format
+msgid "Usage: %s <action>\n"
+msgstr "استفاده: %s <action>\n"
+
+#: xfce4-shutdown/main.c:146
+#, c-format
+msgid "%s: Unknown action %s\n"
+msgstr "%s: عمل ناشناس %s\n"
+
+#: xfce4-shutdown/main.c:169
+#, c-format
+msgid ""
+"You are not allowed to execute the action \"%s\".\n"
+"Ask your system adminitrator to add you to the list\n"
+"of people allowed to execute shutdown actions, by\n"
+"adding your username to the file %s.\n"
+msgstr ""
+"شما اجازه‌ی اجرای عمل \"%s\" را ندارید.\n"
+"از مدیر سیستم خود بخواهید که با افزودن نام‌کاربری\n"
+"شما به پرونده‌ی %s شما را در لیست کسانی که\n"
+"اجازه‌ی اجرای اعمال خاموش‌سازی را دارند بگذارد.\n"
+
+#: xfce4-shutdown/main.c:192
+msgid ""
+"Unable to shutdown this box. Please check your\n"
+"installation, or contact your system administrator\n"
+"and report the problem.\n"
+msgstr ""
+"قادر به خاموش کردن این رایانه نیستم. لطفا نصب\n"
+"خود را بررسی کنید، یا با مدیر سیستم خود تماس\n"
+"گرفته و این اشکال را گزارش دهید.\n"
+
+#: xfce4-shutdown/main.c:209
+#, c-format
+msgid ""
+"Got no way to shutdown the system. You should ask\n"
+"your system administrator to either add your account\n"
+"name to %s or to install sudo(8) and grant\n"
+"you the right execute reboot and halt commands.\n"
+msgstr ""
+"هیچ جوری نمی‌شود سیستم را خاموش کرد. شما باید از مدیر\n"
+"سیستم خود بخواهید که یا نام حساب شما را به %s\n"
+"اضافه کند یا sudo(8( را نصب کرده و به شما اجازه‌ی\n"
+"اجرای فرمان‌های راه‌اندازی مجدد و ایست را بدهد.\n"
+
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 00000000..87f189d6
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 00000000..8b2f7783
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,370 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2003-07-19 13:15+0200\n"
+"PO-Revision-Date: 2003-12-09 20:00+0900\n"
+"Last-Translator: Zhao Ji <zhao-ji@awz.ne.jp>\n"
+"Language-Team: xfce-users-jp <xfce-users-jp@ml.fdiary.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings/session.c:227
+msgid "Default Theme"
+msgstr "標準のテーマ"
+
+#: settings/session.c:232
+msgid "Default splash screen"
+msgstr "標準の装飾スクリーン"
+
+#: settings/session.c:271
+#, c-format
+msgid "About %s..."
+msgstr "%s について..."
+
+#: settings/session.c:293
+msgid "Info:"
+msgstr "情報:"
+
+#: settings/session.c:301
+msgid "Author:"
+msgstr "製作者"
+
+#: settings/session.c:377
+#, c-format
+msgid "Unable to install splash theme from file %s: %s"
+msgstr "装飾テーマを、ファイルからインストールできません %s: %s"
+
+#: settings/session.c:398 settings/session.c:740
+msgid "Install new theme"
+msgstr "新しいテーマのインストール"
+
+#: settings/session.c:477 settings/session.c:600 settings/session.c:614
+msgid "Session management"
+msgstr "セッション・マネージメント"
+
+#. General settings
+#: settings/session.c:625
+msgid "General"
+msgstr "全般"
+
+#.
+#: settings/session.c:634
+msgid "Confirm logout"
+msgstr "logout確認"
+
+#: settings/session.c:636
+msgid ""
+"Should the session manager ask the user to confirm the logout. If disabled, "
+"the session will be closed without any further user interaction."
+msgstr ""
+"セッション・マネージャには、ユーザーへlogout確認する設定をするべきです。"
+"もし、無効にすればユーザー設定へセッション間相互作用を処理せずに終了します。"
+
+#: settings/session.c:647
+msgid "Automatically save session on logout"
+msgstr "自動的にセッションを保存して、logout"
+
+#.
+#: settings/session.c:654
+msgid "Show tray icon"
+msgstr "アイコン・トレイの表示"
+
+#: settings/session.c:656
+msgid ""
+"Show the session managers tray icon in the desktops notification area (also "
+"known as the system tray)."
+msgstr ""
+"デスクトップ通知エリア（システム・トレー）で、セッション・マネージャの"
+"アイコン・トレーを表示"
+
+#. Logout action settings
+#: settings/session.c:665
+msgid "Default action on logout"
+msgstr "logout時の標準動作"
+
+#.
+#: settings/session.c:677 xfce4-session/shutdown.c:252
+msgid "_Quit current session"
+msgstr "現在のセッションの終了(_Q)"
+
+#.
+#: settings/session.c:681 xfce4-session/shutdown.c:257
+msgid "_Reboot the computer"
+msgstr "コンピュータの再起動(_R)"
+
+#.
+#: settings/session.c:685 xfce4-session/shutdown.c:262
+msgid "_Turn off computer"
+msgstr "コンピュータの終了(_T)"
+
+#. Logout action settings
+#: settings/session.c:697
+msgid "Splash screen theme"
+msgstr "装飾スクリーン・テーマ"
+
+#: settings/session.c:721
+msgid ""
+"Select the splash screen theme that should be displayed when the session is "
+"started."
+msgstr ""
+"セッション開始時に使用される、装飾スクリーン・テーマの選択"
+
+#: settings/session.c:731
+msgid "Show theme info"
+msgstr "テーマの情報表示"
+
+#. update the tray icon tip
+#: xfce4-session/ice-layer.c:133 xfce4-session/manager.c:525
+#: xfce4-session/manager.c:835
+#, c-format
+msgid "%u clients connected"
+msgstr "%u クライアントが接続しました"
+
+#: xfce4-session/main.c:93
+msgid "desktop"
+msgstr "デスクトップ"
+
+#: xfce4-session/main.c:120
+msgid "Starting session manager.."
+msgstr "セッション・マネージャ起動中.."
+
+#: xfce4-session/main.c:140
+#, c-format
+msgid ""
+"Unable to create users XFce settings\n"
+"directory %s: %s"
+msgstr ""
+"ユーザーのXFce設定ディレクトリが\n"
+"作成できません %s: %s"
+
+#: xfce4-session/main.c:149
+#, c-format
+msgid ""
+"Unable to create users XFce session\n"
+"directory %s: %s"
+msgstr ""
+"ユーザーのXFceセッション・ディレクトリが\n"
+"作成できません %s: %s"
+
+#.
+#: xfce4-session/main.c:295 xfce4-session/session-control.c:268
+msgid "Session control"
+msgstr "セッション・コントロール"
+
+#.
+#: xfce4-session/main.c:310
+msgid "Save session"
+msgstr "セッション保存"
+
+#.
+#: xfce4-session/main.c:319
+msgid "Quit session"
+msgstr "セッション終了"
+
+#: xfce4-session/main.c:415
+msgid ""
+"The session manager was unable to start the\n"
+"Multi-Channel settings manager. This is most\n"
+"often caused by a broken XFce installation.\n"
+"Please contact your local system administrator\n"
+"and report the problem."
+msgstr ""
+"セッション・マネージャは、マルチ・チャネル\n"
+"設定マネージャを起動出来ませんでした。\n"
+"これは、破損したXFceによく発生します。\n"
+"あなたのシステムを管理している管理者に連絡して、\n"
+"問題を報告して下さい。"
+
+#: xfce4-session/main.c:432
+msgid "Unable to create MCS client"
+msgstr "MCSクライアントを作成出来ません"
+
+#: xfce4-session/manager.c:342
+msgid ""
+"The session manager was unable to restore your\n"
+"previous session. It'll therefore start a default\n"
+"session."
+msgstr ""
+"セッション・マネージャは、前回のあなたのセッションを\n"
+"復元できません。\n"
+"したがって、標準のセッション状態で開始します。"
+
+#: xfce4-session/manager.c:824
+#, c-format
+msgid ""
+"The client \"%s\" closed the connection\n"
+"to the session manager. The following reason\n"
+"was given:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\"クライアントは、セッション・マネージャとの\n"
+"接続を閉じました。\n"
+"次の理由が報告されました:\n"
+"\n"
+"%s"
+
+#: xfce4-session/shutdown.c:191
+msgid "Logout session"
+msgstr "セッションのログアウト"
+
+#: xfce4-session/shutdown.c:221
+#, c-format
+msgid "End session for <b>%s</b>"
+msgstr "<b>%s</b>のセッションを終了"
+
+#.
+#: xfce4-session/shutdown.c:244
+msgid "What do you want to do next?"
+msgstr "あなたは、次に何を行いますか？"
+
+#: xfce4-session/shutdown.c:275
+msgid "_Save session for future logins"
+msgstr "次回のログインへ、セッションを保存"
+
+#: xfce4-session/shutdown.c:349 xfce4-session/shutdown.c:358
+#, c-format
+msgid ""
+"The following error occured while trying to shutdown the computer:\n"
+"\n"
+"%s"
+msgstr ""
+"次のエラーが、コンピュータをシャットダウン中に発生しました:\n"
+"\n"
+"%s"
+
+#.
+#: xfce4-session/splash-screen.c:271
+#, c-format
+msgid "Starting %s..."
+msgstr "%s 起動中..."
+
+#: xfce4-session/startup.c:149
+msgid "Doing Autostart..."
+msgstr "自動起動中..."
+
+#: xfce4-session/startup.c:207
+msgid "Starting session manager..."
+msgstr "セッション・マネージャ起動中..."
+
+#: xfce4-session/session-control.c:72
+msgid "Idle"
+msgstr "待機"
+
+#: xfce4-session/session-control.c:73
+msgid "Interacting"
+msgstr "相互影響"
+
+#: xfce4-session/session-control.c:74
+msgid "Save completed"
+msgstr "保存完了"
+
+#: xfce4-session/session-control.c:75
+msgid "Saving"
+msgstr "保存中"
+
+#. global save
+#: xfce4-session/session-control.c:76
+msgid "Saving (local)"
+msgstr "保存中 (local)"
+
+#. local save
+#: xfce4-session/session-control.c:77
+msgid "Waiting to interact"
+msgstr "セッション間相互作用 処理待ち"
+
+#: xfce4-session/session-control.c:78
+msgid "Waiting to enter Phase2"
+msgstr "Phase2の実行待ち"
+
+#: xfce4-session/session-control.c:79
+msgid "Disconnecting"
+msgstr "接続解除中"
+
+#: xfce4-session/session-control.c:200
+#, c-format
+msgid "Unable to clone client: %s"
+msgstr "クライアント: %s を複製出来ません"
+
+#: xfce4-session/session-control.c:299
+msgid "Priority"
+msgstr "優先度"
+
+#: xfce4-session/session-control.c:304
+msgid "Program"
+msgstr "プログラム"
+
+#: xfce4-session/session-control.c:309
+msgid "User"
+msgstr "ユーザ"
+
+#: xfce4-session/session-control.c:314
+msgid "State"
+msgstr "状態"
+
+#. kill button
+#: xfce4-session/session-control.c:333
+msgid "Kill client"
+msgstr "クライアント削除"
+
+#. clone button
+#: xfce4-session/session-control.c:339
+msgid "Clone client"
+msgstr "クライアント複製"
+
+#: xfce4-session/session-control.c:445 xfce4-session/session-control.c:448
+msgid "Unknown"
+msgstr "不明"
+
+#: xfce4-shutdown/main.c:137
+#, c-format
+msgid "Usage: %s <action>\n"
+msgstr "使い方: %s <動作>\n"
+
+#: xfce4-shutdown/main.c:146
+#, c-format
+msgid "%s: Unknown action %s\n"
+msgstr "%s: 不明な動作 %s\n"
+
+#: xfce4-shutdown/main.c:169
+#, c-format
+msgid ""
+"You are not allowed to execute the action \"%s\".\n"
+"Ask your system adminitrator to add you to the list\n"
+"of people allowed to execute shutdown actions, by\n"
+"adding your username to the file %s.\n"
+msgstr ""
+"あなたには、許可されていない動作です \"%s\".\n"
+"あなたのシステムの管理者に、シャットダウン動作を\n"
+"許可するように、あなたのユーザ名を %s ファイルへ\n"
+"追加する事を頼んで下さい。\n"
+
+#: xfce4-shutdown/main.c:192
+msgid ""
+"Unable to shutdown this box. Please check your\n"
+"installation, or contact your system administrator\n"
+"and report the problem.\n"
+msgstr ""
+"シャットダウンできません。インストール状態を調べるか\n"
+"あなたのシステムの管理者へ連絡をとり、問題を報告して\n"
+"下さい。\n"
+
+#: xfce4-shutdown/main.c:209
+#, c-format
+msgid ""
+"Got no way to shutdown the system. You should ask\n"
+"your system administrator to either add your account\n"
+"name to %s or to install sudo(8) and grant\n"
+"you the right execute reboot and halt commands.\n"
+msgstr ""
+"システムをシャットダウンする方法がありません。あなたは\n"
+"システム管理者へあなたのアカウントを %s へ追加するか、\n"
+"sudo(8)をインストールする事を依頼し、正しい再起動・停止\n"
+"のコマンドを許可してもらって下さい。\n"
diff --git a/po/ko.gmo b/po/ko.gmo
index af016428..056b41b6 100644
--- a/po/ko.gmo
+++ b/po/ko.gmo
diff --git a/po/ko.po b/po/ko.po
index eab9ac4e..86c2bc9b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -254,7 +254,7 @@ msgstr "놀고 있습니다."
 
 #: xfce4-session/session-control.c:73
 msgid "Interacting"
-msgstr ""
+msgstr "상호작용 중입니다."
 
 #: xfce4-session/session-control.c:74
 msgid "Save completed"
@@ -272,11 +272,11 @@ msgstr "로컬에 저장하고 있습니다."
 #. local save
 #: xfce4-session/session-control.c:77
 msgid "Waiting to interact"
-msgstr ""
+msgstr "상호작용을 기다리고 있습니다."
 
 #: xfce4-session/session-control.c:78
 msgid "Waiting to enter Phase2"
-msgstr ""
+msgstr "2단계로 진입하려고 합니다."
 
 #: xfce4-session/session-control.c:79
 msgid "Disconnecting"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
new file mode 100644
index 00000000..7851f0f6
--- /dev/null
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 00000000..177059d5
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,364 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-session\n"
+"POT-Creation-Date: 2003-12-23 18:14+0100\n"
+"PO-Revision-Date: 2004-01-18 00:05-0200\n"
+"Last-Translator: Felix da Silva Costa <felix@online.eti.br>\n"
+"Language-Team: pt_BR <felix@online.eti.br>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings/session.c:227
+msgid "Default Theme"
+msgstr "Tema padrão"
+
+#: settings/session.c:232
+msgid "Default splash screen"
+msgstr "Tela inicial padrão"
+
+#: settings/session.c:271
+#, c-format
+msgid "About %s..."
+msgstr "Sobre %s..."
+
+#: settings/session.c:293
+msgid "Info:"
+msgstr "InformaçÂões:"
+
+#: settings/session.c:301
+msgid "Author:"
+msgstr "Autor:"
+
+#: settings/session.c:377
+#, c-format
+msgid "Unable to install splash theme from file %s: %s"
+msgstr "Não foi possível instalar tema inicial do arquivo %s: %s"
+
+#: settings/session.c:398 settings/session.c:740
+msgid "Install new theme"
+msgstr "Instalar novo tema"
+
+#: settings/session.c:477 settings/session.c:600 settings/session.c:614
+msgid "Session management"
+msgstr "Gerenciamento de sessão"
+
+#. General settings
+#: settings/session.c:625
+msgid "General"
+msgstr "Geral"
+
+#.
+#: settings/session.c:634
+msgid "Confirm logout"
+msgstr "Confirmar sair"
+
+#: settings/session.c:636
+msgid ""
+"Should the session manager ask the user to confirm the logout. If disabled, "
+"the session will be closed without any further user interaction."
+msgstr "O gerenciador de sessão deveria perguntar ao usuário para confirmar a saida. Se desabilitado, o gerenciador de sessão será fechado sem perguntar futuras interaçÂões do usuário."
+
+#: settings/session.c:647
+msgid "Automatically save session on logout"
+msgstr "Salvar sessão automaticamente ao sair"
+
+#.
+#: settings/session.c:654
+msgid "Show tray icon"
+msgstr "Mostrar tray icon"
+
+#: settings/session.c:656
+msgid ""
+"Show the session managers tray icon in the desktops notification area (also "
+"known as the system tray)."
+msgstr "Exibir o ícone do gerenciador de sessão na área de notificação (também conhecido como system tray)."
+
+#. Logout action settings
+#: settings/session.c:665
+msgid "Default action on logout"
+msgstr "Ação padrão ao sair"
+
+#.
+#: settings/session.c:677 xfce4-session/shutdown.c:252
+msgid "_Quit current session"
+msgstr "_Sair da sessão atual"
+
+#.
+#: settings/session.c:681 xfce4-session/shutdown.c:257
+msgid "_Reboot the computer"
+msgstr "_Reiniciar computador"
+
+#.
+#: settings/session.c:685 xfce4-session/shutdown.c:262
+msgid "_Turn off computer"
+msgstr "_Desligar computador"
+
+#. Logout action settings
+#: settings/session.c:697
+msgid "Splash screen theme"
+msgstr "Tema da tela inicial"
+
+#: settings/session.c:721
+msgid ""
+"Select the splash screen theme that should be displayed when the session is "
+"started."
+msgstr "Selecione a tela inicial que deve ser exibida quando a sessão for iniciada."
+
+#: settings/session.c:731
+msgid "Show theme info"
+msgstr "Exibir informações do tema"
+
+#. update the tray icon tip
+#: xfce4-session/ice-layer.c:133 xfce4-session/manager.c:545
+#: xfce4-session/manager.c:855
+#, c-format
+msgid "%u clients connected"
+msgstr "%u clientes conectados"
+
+#: xfce4-session/main.c:93
+msgid "desktop"
+msgstr "Área de trabalho"
+
+#: xfce4-session/main.c:120
+msgid "Starting session manager.."
+msgstr "Iniciando gerenciador de sessão"
+
+#: xfce4-session/main.c:140
+#, c-format
+msgid ""
+"Unable to create users XFce settings\n"
+"directory %s: %s"
+msgstr ""
+"Não foi possível criar a configuraçÂões de usuários do \n"
+"diretório XFce %s: %s"
+
+#: xfce4-session/main.c:149
+#, c-format
+msgid ""
+"Unable to create users XFce session\n"
+"directory %s: %s"
+msgstr ""
+"Não foi possível criar sessão de usuários do \n"
+"diretório XFce %s: %s"
+
+#.
+#: xfce4-session/main.c:295 xfce4-session/session-control.c:268
+msgid "Session control"
+msgstr "Controle de sessão"
+
+#.
+#: xfce4-session/main.c:310
+msgid "Save session"
+msgstr "Salvar sessão"
+
+#.
+#: xfce4-session/main.c:319
+msgid "Quit session"
+msgstr "Deixar sessão"
+
+#: xfce4-session/main.c:415
+msgid ""
+"The session manager was unable to start the\n"
+"Multi-Channel settings manager. This is most\n"
+"often caused by a broken XFce installation.\n"
+"Please contact your local system administrator\n"
+"and report the problem."
+msgstr ""
+"O gerenciador de sessão não pôde iniciar o\n"
+"configurador Multi-Channel. Isto ocorre frequentemente\n"
+"causada por uma instalação quebrada do XFce.\n"
+"Por favor entre em contato com o administrador local do sistema\n"
+"e reporte o problema."
+
+#: xfce4-session/main.c:432
+msgid "Unable to create MCS client"
+msgstr "Não foi possível criar MCS client"
+
+#: xfce4-session/manager.c:362
+msgid ""
+"The session manager was unable to restore your\n"
+"previous session. It'll therefore start a default\n"
+"session."
+msgstr ""
+"O gerenciador de sessão não foi capaz de recuperar sua\n"
+"sessão anterior. No entanto ele iniciará uma sessão padrão."
+
+#: xfce4-session/manager.c:844
+#, c-format
+msgid ""
+"The client \"%s\" closed the connection\n"
+"to the session manager. The following reason\n"
+"was given:\n"
+"\n"
+"%s"
+msgstr ""
+"O cliente \"%s\" fechou a conexão \n"
+"com o gerenciador de sessão. Foi \n"
+"dada a seguinte razão: \n"
+"\n"
+"%s"
+
+#: xfce4-session/shutdown.c:191
+msgid "Logout session"
+msgstr "Sair da sessão"
+
+#: xfce4-session/shutdown.c:221
+#, c-format
+msgid "End session for <b>%s</b>"
+msgstr "Finalizar sessão para <b>%s</b>"
+
+#.
+#: xfce4-session/shutdown.c:244
+msgid "What do you want to do next?"
+msgstr "O que quer que fazer depois?"
+
+#: xfce4-session/shutdown.c:275
+msgid "_Save session for future logins"
+msgstr "_Salvar sessão para logins futuros"
+
+#: xfce4-session/shutdown.c:349 xfce4-session/shutdown.c:358
+#, c-format
+msgid ""
+"The following error occured while trying to shutdown the computer:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreram os seguintes erros enquanto desligava o computador: \n"
+"\n"
+"%s"
+
+#.
+#: xfce4-session/splash-screen.c:271
+#, c-format
+msgid "Starting %s..."
+msgstr "Iniciando %s..."
+
+#: xfce4-session/startup.c:149
+msgid "Doing Autostart..."
+msgstr "Executando Autostart..."
+
+#: xfce4-session/startup.c:207
+msgid "Starting session manager..."
+msgstr "Iniciando o gerenciador de sessão..."
+
+#: xfce4-session/session-control.c:72
+msgid "Idle"
+msgstr "Parado"
+
+#: xfce4-session/session-control.c:73
+msgid "Interacting"
+msgstr "Interagindo"
+
+#: xfce4-session/session-control.c:74
+msgid "Save completed"
+msgstr "Salvo"
+
+#: xfce4-session/session-control.c:75
+msgid "Saving"
+msgstr "Salvando"
+
+#. global save
+#: xfce4-session/session-control.c:76
+msgid "Saving (local)"
+msgstr "Salvando (local)"
+
+#. local save
+#: xfce4-session/session-control.c:77
+msgid "Waiting to interact"
+msgstr "Aguardando para interagir"
+
+#: xfce4-session/session-control.c:78
+msgid "Waiting to enter Phase2"
+msgstr "Aguardando entrar na fase 2"
+
+#: xfce4-session/session-control.c:79
+msgid "Disconnecting"
+msgstr "Desconectando"
+
+#: xfce4-session/session-control.c:200
+#, c-format
+msgid "Unable to clone client: %s"
+msgstr "Não foi possível copiar cliente: %s"
+
+#: xfce4-session/session-control.c:299
+msgid "Priority"
+msgstr "Prioridade"
+
+#: xfce4-session/session-control.c:304
+msgid "Program"
+msgstr "Programa"
+
+#: xfce4-session/session-control.c:309
+msgid "User"
+msgstr "Usuário"
+
+#: xfce4-session/session-control.c:314
+msgid "State"
+msgstr "Estado"
+
+#. kill button
+#: xfce4-session/session-control.c:333
+msgid "Kill client"
+msgstr "Finalizar cliente"
+
+#. clone button
+#: xfce4-session/session-control.c:339
+msgid "Clone client"
+msgstr "Copiar cliente"
+
+#: xfce4-session/session-control.c:445 xfce4-session/session-control.c:448
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: xfce4-shutdown/main.c:137
+#, c-format
+msgid "Usage: %s <action>\n"
+msgstr "Uso: %s <ação>\n"
+
+#: xfce4-shutdown/main.c:146
+#, c-format
+msgid "%s: Unknown action %s\n"
+msgstr "%s: Ação desconhecida %s\n"
+
+#: xfce4-shutdown/main.c:169
+#, c-format
+msgid ""
+"You are not allowed to execute the action \"%s\".\n"
+"Ask your system adminitrator to add you to the list\n"
+"of people allowed to execute shutdown actions, by\n"
+"adding your username to the file %s.\n"
+msgstr ""
+"Você não esta autorizado a executar a ação \"%s\".\n"
+"Contate o administrador do sistema para adicionar seu usuário na lista\n"
+"de pessoas autorizadas a desligar o computador, adicionando\n"
+"seu nome de usuário ao arquivo %s.\n"
+
+#: xfce4-shutdown/main.c:192
+msgid ""
+"Unable to shutdown this box. Please check your\n"
+"installation, or contact your system administrator\n"
+"and report the problem.\n"
+msgstr ""
+"Não foi possível desligar o computador. Por favor\n"
+"verifique sua instalaçÂão, ou entre em contato com o \n"
+"administrador do sistema.\n"
+
+#: xfce4-shutdown/main.c:209
+#, c-format
+msgid ""
+"Got no way to shutdown the system. You should ask\n"
+"your system administrator to either add your account\n"
+"name to %s or to install sudo(8) and grant\n"
+"you the right execute reboot and halt commands.\n"
+msgstr ""
+"Não foi possível desligar o sistema. Você deve pedir ao \n"
+"administrador do sistema para adicionar sua conta de usuário\n"
+"em %s ou instalar sudo(8) e permitir que você possa executar\n"
+"os comandos reboot e halt. \n"