OSDN Git Service

* merge from master
authorAtsushi Konno <konn@users.sourceforge.jp>
Sun, 27 Feb 2011 16:15:29 +0000 (01:15 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Sun, 27 Feb 2011 16:15:29 +0000 (01:15 +0900)
12 files changed:
Makefile.in
aclocal.m4
configure
configure.ac
etc/device_data.xml
include/config.h
src/Makefile.in
src/chxj_img_conv_format.c
src/chxj_ixhtml10.c
src/chxj_jxhtml.c
src/mod_chxj.c
support/centos/mod-chxj.spec

index b9e46ce..ba83526 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -99,6 +99,7 @@ CYGPATH_W = @CYGPATH_W@
 DDEFS = @DDEFS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -122,6 +123,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OPENSSL_PATH = @OPENSSL_PATH@
 PACKAGE = @PACKAGE@
@@ -135,6 +137,7 @@ PCRE_1_CONFIG = @PCRE_1_CONFIG@
 PCRE_CONFIG = @PCRE_CONFIG@
 QDEFS = @QDEFS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -337,8 +340,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        mkid -fID $$unique
 tags: TAGS
 
@@ -363,8 +366,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -374,13 +377,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
-       here=`pwd`; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        test -z "$(CTAGS_ARGS)$$tags$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$tags $$unique
@@ -451,6 +453,10 @@ dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
        $(am__remove_distdir)
 
+dist-lzma: distdir
+       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+       $(am__remove_distdir)
+
 dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__remove_distdir)
@@ -477,6 +483,8 @@ distcheck: dist
          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+       *.tar.lzma*) \
+         unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
@@ -628,8 +636,8 @@ uninstall-am:
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am am--refresh check check-am clean clean-generic \
        clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-       dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-       distclean-generic distclean-hdr distclean-libtool \
+       dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+       distclean distclean-generic distclean-hdr distclean-libtool \
        distclean-tags distcleancheck distdir distuninstallcheck dvi \
        dvi-am html html-am info info-am install install-am \
        install-data install-data-am install-dvi install-dvi-am \
index 90e91ec..8a015be 100644 (file)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4+lenny1 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_REQUIRE([AC_EXEEXT])dnl
 dnl
-
 AC_LIBTOOL_SYS_MAX_CMD_LEN
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 AC_LIBTOOL_OBJDIR
@@ -181,7 +183,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -208,6 +210,8 @@ file_magic*)
   ;;
 esac
 
+_LT_REQUIRED_DARWIN_CHECKS
+
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 enable_win32_dll=yes, enable_win32_dll=no)
@@ -268,8 +272,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
 AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
@@ -281,13 +286,85 @@ $rm conftest*
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
 AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# --------------------------
+# Check for some things on darwin
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+   [lt_cv_ld_exported_symbols_list=yes],
+   [lt_cv_ld_exported_symbols_list=no])
+   LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[0123]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
 
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
@@ -298,12 +375,20 @@ $rm conftest*
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 ])# _LT_AC_SYS_LIBPATH_AIX
 
@@ -534,13 +619,17 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -557,6 +646,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -597,7 +689,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
       esac
       ;;
     esac
@@ -628,7 +724,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
   ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -669,11 +765,12 @@ fi
 # ------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -689,7 +786,7 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
@@ -787,24 +884,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
               = "XX$teststring") >/dev/null 2>&1 &&
-           new_result=`expr "X$teststring" : ".*" 2>&1` &&
-           lt_cv_sys_max_cmd_len=$new_result &&
-           test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+             new_result=`expr "X$teststring" : ".*" 2>&1` &&
+             lt_cv_sys_max_cmd_len=$new_result &&
+             test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 ])
@@ -957,7 +1057,7 @@ else
     AC_CHECK_FUNC([shl_load],
          [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
        [AC_CHECK_FUNC([dlopen],
              [lt_cv_dlopen="dlopen"],
          [AC_CHECK_LIB([dl], [dlopen],
@@ -965,7 +1065,7 @@ else
            [AC_CHECK_LIB([svld], [dlopen],
                  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
              [AC_CHECK_LIB([dld], [dld_link],
-                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
              ])
            ])
          ])
@@ -1031,7 +1131,8 @@ fi
 # ---------------------------------
 # Check to see if options -c and -o are simultaneously supported by compiler
 AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
   [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -1039,7 +1140,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -1179,6 +1280,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          AC_MSG_RESULT([yes])
        else
   AC_MSG_RESULT([no])
@@ -1196,7 +1298,8 @@ fi
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
 AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1210,20 +1313,58 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+m4_if($1,[],[
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+fi])
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1241,7 +1382,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1380,12 +1521,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`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'
-  fi
+  m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -1439,7 +1576,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1502,7 +1639,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -1573,7 +1710,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,   ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[         ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1679,6 +1816,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -1774,6 +1915,13 @@ esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -1784,7 +1932,8 @@ fi
 # _LT_AC_TAGCONFIG
 # ----------------
 AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_ARG_WITH([tags],
     [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
         [include additional configurations @<:@automatic@:>@])],
     [tagnames="$withval"])
@@ -2045,7 +2194,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 
 # AC_PATH_TOOL_PREFIX
 # -------------------
-# find a file program which can recognise shared library
+# find a file program which can recognize shared library
 AC_DEFUN([AC_PATH_TOOL_PREFIX],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_MSG_CHECKING([for $1])
@@ -2108,7 +2257,7 @@ fi
 
 # AC_PATH_MAGIC
 # -------------
-# find a file program which can recognise a shared library
+# find a file program which can recognize a shared library
 AC_DEFUN([AC_PATH_MAGIC],
 [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -2255,7 +2404,7 @@ esac
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+[AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2272,7 +2421,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2294,9 +2443,15 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_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'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
@@ -2341,7 +2496,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -2391,6 +2546,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -2443,7 +2602,7 @@ AC_DEFUN([AC_PROG_NM],
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
@@ -2659,10 +2818,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 _LT_AC_SYS_COMPILER
 
@@ -2698,7 +2857,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -2755,6 +2914,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
 _LT_AC_TAGVAR(predeps, $1)=
 _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -2764,10 +2924,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -2864,7 +3024,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
-  aix4* | aix5*)
+  aix[[4-9]]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -2877,7 +3037,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
        for ld_flag in $LDFLAGS; do
          case $ld_flag in
          *-brtl*)
@@ -2913,7 +3073,7 @@ case $host_os in
           strings "$collect2name" | grep resolve_lib_name >/dev/null
        then
          # We have reworked collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+         :
        else
          # We have old collect2
          _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -3023,59 +3183,31 @@ case $host_os in
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
           ;;
        *)
@@ -3158,9 +3290,7 @@ case $host_os in
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
@@ -3228,7 +3358,7 @@ case $host_os in
        ;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3320,7 +3450,7 @@ case $host_os in
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
        ;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -3348,6 +3478,29 @@ case $host_os in
        # dependencies.
        output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C++ 5.9
+         _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+         # Not sure whether something based on
+         # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+         # would be better.
+         output_verbose_link_cmd='echo'
+
+         # Archives containing C++ object files must be created using
+         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+         # necessary to make sure instantiated templates are included
+         # in the archive.
+         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+         ;;
+       esac
+       ;;
     esac
     ;;
   lynxos*)
@@ -3386,16 +3539,20 @@ case $host_os in
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -3557,15 +3714,10 @@ case $host_os in
        case $host_os in
          solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
          *)
-           # The C++ compiler is used as linker so we must use $wl
-           # flag to pass the commands to the underlying system
-           # linker. We must also pass each convience library through
-           # to the system linker between allextract/defaultextract.
-           # The C++ compiler will combine linker options so we
-           # cannot just pass the convience library names through
-           # without $wl.
+           # The compiler driver will combine and reorder linker options,
+           # but understands `-z linker_flag'.
            # Supported since Solaris 2.6 (maybe 2.5.1?)
-           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
            ;;
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
@@ -3612,6 +3764,12 @@ case $host_os in
          fi
 
          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+         case $host_os in
+         solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+         *)
+           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+           ;;
+         esac
        fi
        ;;
     esac
@@ -3727,7 +3885,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 # compiler output when linking a shared library.
 # Parse the compiler output and extract the necessary
 # objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
 dnl not a library.  It's possible we should let each
@@ -3852,10 +4011,15 @@ fi
 
 $rm -f confest.$objext
 
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -3863,19 +4027,51 @@ interix3*)
   _LT_AC_TAGVAR(postdeps,$1)=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 ])
-
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -3918,10 +4114,17 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -3953,7 +4156,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[[4-9]]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -4000,10 +4203,10 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
@@ -4056,7 +4259,7 @@ objext=o
 _LT_AC_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -4130,6 +4333,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(predeps, $1) \
     _LT_AC_TAGVAR(postdeps, $1) \
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
     _LT_AC_TAGVAR(archive_cmds, $1) \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
@@ -4145,6 +4349,7 @@ if test -f "$ltmain"; then
     _LT_AC_TAGVAR(module_cmds, $1) \
     _LT_AC_TAGVAR(module_expsym_cmds, $1) \
     _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
     _LT_AC_TAGVAR(exclude_expsyms, $1) \
     _LT_AC_TAGVAR(include_expsyms, $1); do
 
@@ -4191,7 +4396,7 @@ ifelse([$1], [],
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -4428,6 +4633,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 # shared library.
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
@@ -4516,7 +4725,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
@@ -4599,6 +4808,7 @@ fi
 # ---------------------------------
 AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
 [AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([LT_AC_PROG_SED])
 AC_REQUIRE([AC_PROG_NM])
 AC_REQUIRE([AC_OBJEXT])
 # Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -4776,7 +4986,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4825,13 +5035,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # like `-m68040'.
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
@@ -4842,7 +5055,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4868,7 +5081,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
        # All AIX code is PIC.
        if test "$host_cpu" = ia64; then
          # AIX 5 now supports IA64 processor
@@ -4964,7 +5177,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
            ;;
-         pgCC*)
+         pgCC* | pgcpp*)
            # Portland Group C++ compiler.
            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
@@ -4978,6 +5191,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
            ;;
          *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+             ;;
+           esac
            ;;
        esac
        ;;
@@ -5098,14 +5319,17 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
@@ -5114,7 +5338,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5172,10 +5396,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+       [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -5224,6 +5449,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
+         ;;
+       esac
+       ;;
       esac
       ;;
 
@@ -5233,6 +5474,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
+    rdos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
     solaris*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5292,7 +5537,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
 #
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
@@ -5316,7 +5561,7 @@ esac
 #
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
@@ -5327,11 +5572,12 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 # ------------------------------------
 # See if the linker supports building shared libraries.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 ifelse([$1],[CXX],[
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -5344,7 +5590,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
   ;;
   linux* | k*bsd*-gnu)
     _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -5353,6 +5599,7 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ],[
   runpath_var=
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -5383,12 +5630,14 @@ ifelse([$1],[CXX],[
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   _LT_CC_BASENAME([$compiler])
@@ -5438,7 +5687,7 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -5486,7 +5735,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -5504,7 +5753,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5519,7 +5768,7 @@ EOF
       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        tmp_addflag=
        case $cc_basename,$host_cpu in
@@ -5537,13 +5786,22 @@ EOF
        ifc* | ifort*)                  # Intel Fortran compiler
          tmp_addflag=' -nofor_main' ;;
        esac
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       *)
+         tmp_sharedflag='-shared' ;;
+       esac
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
        if test $supports_anon_versioning = yes; then
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
        fi
        _LT_AC_TAGVAR(link_all_deplibs, $1)=no
       else
@@ -5584,7 +5842,7 @@ EOF
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        cat <<_LT_EOF 1>&2
 
@@ -5649,7 +5907,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[[4-9]]*)
       if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
@@ -5669,7 +5927,7 @@ _LT_EOF
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
-       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
          for ld_flag in $LDFLAGS; do
          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
            aix_use_runtimelinking=yes
@@ -5703,7 +5961,7 @@ _LT_EOF
           strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
          # We have reworked collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+         :
          else
          # We have old collect2
          _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -5796,7 +6054,7 @@ _LT_EOF
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
       _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
@@ -5829,19 +6087,18 @@ _LT_EOF
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
     if test "$GCC" = yes ; then
        output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='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}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           _LT_AC_TAGVAR(module_expsym_cmds, $1)='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}'
           ;;
        *)
@@ -6003,24 +6260,28 @@ _LT_EOF
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       else
+         case $host_os in
+          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+            _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+            ;;
+          *)
+            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+            ;;
+         esac
+        fi
       else
-       case $host_os in
-        openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-          ;;
-        *)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-          ;;
-       esac
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
@@ -6079,17 +6340,16 @@ _LT_EOF
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
-       # The compiler driver will combine linker options so we
-       # cannot just pass the convience library names through
-       # without $wl, iff we do not link with $LD.
-       # Luckily, gcc supports the same syntax we need for Sun Studio.
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
        # Supported since Solaris 2.6 (maybe 2.5.1?)
-       case $wlarc in
-       '')
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-       *)
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-       esac ;;
+       if test "$GCC" = yes; then
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6146,7 +6406,7 @@ _LT_EOF
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6221,7 +6481,7 @@ x|xyes)
       # to ld, don't add -lc before -lgcc.
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=conftest
@@ -6324,6 +6584,30 @@ AC_DEFUN([LT_AC_PROG_RC],
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+
+# Cheap backport of AS_EXECUTABLE_P and required macros
+# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+# _AS_TEST_PREPARE
+# ----------------
+m4_ifndef([_AS_TEST_PREPARE],
+[m4_defun([_AS_TEST_PREPARE],
+[if test -x / >/dev/null 2>&1; then
+  as_executable_p='test -x'
+else
+  as_executable_p='test -f'
+fi
+])])# _AS_TEST_PREPARE
+
+# AS_EXECUTABLE_P
+# ---------------
+# Check whether a file is executable.
+m4_ifndef([AS_EXECUTABLE_P],
+[m4_defun([AS_EXECUTABLE_P],
+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
+$as_executable_p $1[]dnl
+])])# AS_EXECUTABLE_P
+
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
@@ -6344,12 +6628,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6382,10 +6667,11 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -6400,7 +6686,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -6416,8 +6702,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6689,7 +6977,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -6749,13 +7037,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 13
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -6860,16 +7148,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -7141,7 +7430,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
index 6355329..e0e7510 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for mod_chxj 0.13.0-rc.
+# Generated by GNU Autoconf 2.61 for mod_chxj 0.13.0.
 #
 # Report bugs to <konn@users.sourceforge.jp>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='mod_chxj'
 PACKAGE_TARNAME='mod_chxj'
-PACKAGE_VERSION='0.13.0-rc'
-PACKAGE_STRING='mod_chxj 0.13.0-rc'
+PACKAGE_VERSION='0.13.0'
+PACKAGE_STRING='mod_chxj 0.13.0'
 PACKAGE_BUGREPORT='konn@users.sourceforge.jp'
 
 ac_unique_file="src/mod_chxj.c"
@@ -856,12 +856,15 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
+SED
 GREP
 EGREP
 LN_S
 ECHO
 AR
 RANLIB
+DSYMUTIL
+NMEDIT
 CPP
 CXX
 CXXFLAGS
@@ -1408,7 +1411,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures mod_chxj 0.13.0-rc to adapt to many kinds of systems.
+\`configure' configures mod_chxj 0.13.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1479,7 +1482,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mod_chxj 0.13.0-rc:";;
+     short | recursive ) echo "Configuration of mod_chxj 0.13.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1597,7 +1600,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mod_chxj configure 0.13.0-rc
+mod_chxj configure 0.13.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1611,7 +1614,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by mod_chxj $as_me 0.13.0-rc, which was
+It was created by mod_chxj $as_me 0.13.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2429,7 +2432,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=mod_chxj
- VERSION=0.13.0-rc
+ VERSION=0.13.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3837,12 +3840,13 @@ do
   test -z "$as_dir" && as_dir=.
   for lt_ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
       fi
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3877,6 +3881,7 @@ done
 fi
 
 SED=$lt_cv_path_SED
+
 { echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6; }
 
@@ -4238,8 +4243,8 @@ else
 echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -4258,7 +4263,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -4280,9 +4285,15 @@ cygwin*)
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_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'
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
   ;;
 
 darwin* | rhapsody*)
@@ -4327,7 +4338,7 @@ hpux10.20* | hpux11*)
   esac
   ;;
 
-interix3*)
+interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
@@ -4377,6 +4388,10 @@ osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -4464,7 +4479,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4467 "configure"' > conftest.$ac_ext
+  echo '#line 4482 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4499,7 +4514,8 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4510,6 +4526,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_i386_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
@@ -4526,6 +4545,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
       ;;
     *64-bit*)
       case $host in
+        x86_64-*kfreebsd*-gnu)
+          LD="${LD-ld} -m elf_x86_64_fbsd"
+          ;;
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
@@ -4629,7 +4651,11 @@ sparc*-*solaris*)
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      *)
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+         LD="${LD-ld} -64"
+       fi
+       ;;
       esac
       ;;
     esac
@@ -6231,7 +6257,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
 # find the maximum length of command line arguments
 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
@@ -6318,24 +6343,27 @@ else
     fi
     ;;
   *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
               = "XX$teststring") >/dev/null 2>&1 &&
-           new_result=`expr "X$teststring" : ".*" 2>&1` &&
-           lt_cv_sys_max_cmd_len=$new_result &&
-           test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+             new_result=`expr "X$teststring" : ".*" 2>&1` &&
+             lt_cv_sys_max_cmd_len=$new_result &&
+             test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on massive
+      # amounts of additional arguments before passing them to the linker.
+      # It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
     ;;
   esac
 
@@ -6352,6 +6380,7 @@ fi
 
 
 
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
@@ -6542,7 +6571,7 @@ EOF
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -6940,7 +6969,7 @@ test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
@@ -7102,6 +7131,318 @@ fi
   ;;
 esac
 
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+echo "${ECHO_T}$DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
+echo "${ECHO_T}$NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+
+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+   # By default we will add the -single_module flag. You can override
+   # by either setting the environment variable LT_MULTI_MODULE
+   # non-empty at configure time, or by adding -multi_module to the
+   # link flags.
+   echo "int foo(void){return 1;}" > conftest.c
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+     -dynamiclib ${wl}-single_module conftest.c
+   if test -f libconftest.dylib; then
+     lt_cv_apple_cc_single_mod=yes
+     rm -rf libconftest.dylib*
+   fi
+   rm conftest.c
+      fi
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       lt_cv_ld_exported_symbols_list=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[0123])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*)
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+   10.[012]*)
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+   10.*)
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+
 enable_dlopen=no
 enable_win32_dll=no
 
@@ -7140,10 +7481,10 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
 
 
 # If no C compiler was specified, use CC.
@@ -7158,16 +7499,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 
@@ -7184,7 +7525,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7195,11 +7536,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7198: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7202: \$? = $ac_status" >&5
+   echo "$as_me:7543: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7250,13 +7591,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       ;;
 
@@ -7266,7 +7609,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -7324,7 +7667,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7376,6 +7719,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         lt_prog_compiler_pic='-KPIC'
+         lt_prog_compiler_static='-Bstatic'
+         lt_prog_compiler_wl=''
+         ;;
+       esac
+       ;;
       esac
       ;;
 
@@ -7385,6 +7744,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
@@ -7447,12 +7810,12 @@ if test -n "$lt_prog_compiler_pic"; then
 
 { 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
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works=no
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -7463,27 +7826,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7829: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7470: \$? = $ac_status" >&5
+   echo "$as_me:7833: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
+       lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
 
-if test x"$lt_prog_compiler_pic_works" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
@@ -7510,13 +7873,13 @@ esac
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7526,20 +7889,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
 
-if test x"$lt_prog_compiler_static_works" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
 else
     lt_prog_compiler_static=
@@ -7556,7 +7919,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -7567,11 +7930,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7570: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7933: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7574: \$? = $ac_status" >&5
+   echo "$as_me:7937: \$? = $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
@@ -7651,12 +8014,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -7715,7 +8079,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
        ld_shlibs=no
@@ -7763,7 +8127,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -7781,7 +8145,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -7796,7 +8160,7 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        tmp_addflag=
        case $cc_basename,$host_cpu in
@@ -7814,13 +8178,22 @@ EOF
        ifc* | ifort*)                  # Intel Fortran compiler
          tmp_addflag=' -nofor_main' ;;
        esac
-       archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       *)
+         tmp_sharedflag='-shared' ;;
+       esac
+       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
        if test $supports_anon_versioning = yes; then
          archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
        fi
        link_all_deplibs=no
       else
@@ -7926,7 +8299,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
@@ -7946,7 +8319,7 @@ _LT_EOF
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
          for ld_flag in $LDFLAGS; do
          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
            aix_use_runtimelinking=yes
@@ -7980,7 +8353,7 @@ _LT_EOF
           strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
          # We have reworked collect2
-         hardcode_direct=yes
+         :
          else
          # We have old collect2
          hardcode_direct=unsupported
@@ -8054,11 +8427,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8113,11 +8493,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -8171,7 +8558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes=yes
       ;;
@@ -8204,19 +8591,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
     if test "$GCC" = yes ; then
        output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      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_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~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}'
           ;;
        *)
@@ -8378,24 +8764,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-       export_dynamic_flag_spec='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+       hardcode_direct=yes
+       hardcode_shlibpath_var=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+         export_dynamic_flag_spec='${wl}-E'
+       else
+         case $host_os in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+         esac
+        fi
       else
-       case $host_os in
-        openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-          archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-          hardcode_libdir_flag_spec='-R$libdir'
-          ;;
-        *)
-          archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-          ;;
-       esac
+       ld_shlibs=no
       fi
       ;;
 
@@ -8454,17 +8844,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
-       # The compiler driver will combine linker options so we
-       # cannot just pass the convience library names through
-       # without $wl, iff we do not link with $LD.
-       # Luckily, gcc supports the same syntax we need for Sun Studio.
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
        # Supported since Solaris 2.6 (maybe 2.5.1?)
-       case $wlarc in
-       '')
-         whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-       *)
-         whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-       esac ;;
+       if test "$GCC" = yes; then
+         whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
       esac
       link_all_deplibs=yes
       ;;
@@ -8521,7 +8910,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='${wl}-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
@@ -8598,7 +8987,7 @@ x|xyes)
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -8656,17 +9045,55 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
 if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -8687,7 +9114,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -8826,12 +9253,8 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`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'
-  fi
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -8885,7 +9308,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -8948,7 +9371,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -9019,7 +9442,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9125,6 +9548,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -9221,6 +9648,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -9278,6 +9720,7 @@ else
    darwin*)
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
+         old_striplib="$STRIP -S"
          { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
        else
@@ -9539,7 +9982,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   { echo "$as_me:$LINENO: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
@@ -9815,7 +10258,7 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -9864,7 +10307,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9867 "configure"
+#line 10310 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9964,7 +10407,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9967 "configure"
+#line 10410 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10091,7 +10534,7 @@ aix3*)
   fi
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -10147,6 +10590,7 @@ if test -f "$ltmain"; then
     predeps \
     postdeps \
     compiler_lib_search_path \
+    compiler_lib_search_dirs \
     archive_cmds \
     archive_expsym_cmds \
     postinstall_cmds \
@@ -10162,6 +10606,7 @@ if test -f "$ltmain"; then
     module_cmds \
     module_expsym_cmds \
     lt_cv_prog_compiler_c_o \
+    fix_srcfile_path \
     exclude_expsyms \
     include_expsyms; do
 
@@ -10206,7 +10651,7 @@ echo "$as_me: creating $ofile" >&6;}
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Libtool:
@@ -10442,6 +10887,10 @@ predeps=$lt_predeps
 # shared library.
 postdeps=$lt_postdeps
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path
@@ -10530,7 +10979,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols
@@ -10690,6 +11139,7 @@ postdep_objects_CXX=
 predeps_CXX=
 postdeps_CXX=
 compiler_lib_search_path_CXX=
+compiler_lib_search_dirs_CXX=
 
 # Source file extension for C++ test sources.
 ac_ext=cpp
@@ -10699,10 +11149,10 @@ objext=o
 objext_CXX=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -10718,16 +11168,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -10934,7 +11384,7 @@ case $host_os in
     # FIXME: insert proper C++ library support
     ld_shlibs_CXX=no
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # On IA64, the linker does run time linking by default, so we don't
       # have to do anything special.
@@ -10947,7 +11397,7 @@ case $host_os in
       # Test if we are trying to use run time linking or normal
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
       # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
        for ld_flag in $LDFLAGS; do
          case $ld_flag in
          *-brtl*)
@@ -10983,7 +11433,7 @@ case $host_os in
           strings "$collect2name" | grep resolve_lib_name >/dev/null
        then
          # We have reworked collect2
-         hardcode_direct_CXX=yes
+         :
        else
          # We have old collect2
          hardcode_direct_CXX=unsupported
@@ -11057,11 +11507,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11117,11 +11574,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -11191,59 +11655,31 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     fi
   ;;
       darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
       archive_cmds_need_lc_CXX=no
       hardcode_direct_CXX=no
       hardcode_automatic_CXX=yes
       hardcode_shlibpath_var_CXX=unsupported
       whole_archive_flag_spec_CXX=''
       link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+      if test "$GXX" = yes ; then
       output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
       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 -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 $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          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 -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}'
       else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
           module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -11326,9 +11762,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_separator_CXX=:
 
       case $host_cpu in
-      hppa*64*|ia64*)
-       hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
+      hppa*64*|ia64*) ;;
       *)
        export_dynamic_flag_spec_CXX='${wl}-E'
         ;;
@@ -11396,7 +11830,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        ;;
     esac
     ;;
-  interix3*)
+  interix[3-9]*)
     hardcode_direct_CXX=no
     hardcode_shlibpath_var_CXX=no
     hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -11488,7 +11922,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
        whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
        ;;
-      pgCC*)
+      pgCC* | pgcpp*)
         # Portland Group C++ compiler
        archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
        archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
@@ -11516,6 +11950,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # dependencies.
        output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
        ;;
+      *)
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C++ 5.9
+         no_undefined_flag_CXX=' -zdefs'
+         archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+         hardcode_libdir_flag_spec_CXX='-R$libdir'
+         whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+
+         # Not sure whether something based on
+         # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+         # would be better.
+         output_verbose_link_cmd='echo'
+
+         # Archives containing C++ object files must be created using
+         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+         # necessary to make sure instantiated templates are included
+         # in the archive.
+         old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+         ;;
+       esac
+       ;;
     esac
     ;;
   lynxos*)
@@ -11554,16 +12011,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
   openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      export_dynamic_flag_spec_CXX='${wl}-E'
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    if test -f /usr/libexec/ld.so; then
+      hardcode_direct_CXX=yes
+      hardcode_shlibpath_var_CXX=no
+      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+       archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+       export_dynamic_flag_spec_CXX='${wl}-E'
+       whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      fi
+      output_verbose_link_cmd='echo'
+    else
+      ld_shlibs_CXX=no
     fi
-    output_verbose_link_cmd='echo'
     ;;
   osf3*)
     case $cc_basename in
@@ -11725,15 +12186,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        case $host_os in
          solaris2.[0-5] | solaris2.[0-5].*) ;;
          *)
-           # The C++ compiler is used as linker so we must use $wl
-           # flag to pass the commands to the underlying system
-           # linker. We must also pass each convience library through
-           # to the system linker between allextract/defaultextract.
-           # The C++ compiler will combine linker options so we
-           # cannot just pass the convience library names through
-           # without $wl.
+           # The compiler driver will combine and reorder linker options,
+           # but understands `-z linker_flag'.
            # Supported since Solaris 2.6 (maybe 2.5.1?)
-           whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+           whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
            ;;
        esac
        link_all_deplibs_CXX=yes
@@ -11780,6 +12236,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          fi
 
          hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+         case $host_os in
+         solaris2.[0-5] | solaris2.[0-5].*) ;;
+         *)
+           whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+           ;;
+         esac
        fi
        ;;
     esac
@@ -11867,7 +12329,6 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
 GCC_CXX="$GXX"
 LD_CXX="$LD"
 
-
 cat > conftest.$ac_ext <<EOF
 class Foo
 {
 
 $rm -f confest.$objext
 
+compiler_lib_search_dirs_CXX=
+if test -n "$compiler_lib_search_path_CXX"; then
+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
 # PORTME: override above test on systems where it is broken
 case $host_os in
-interix3*)
+interix[3-9]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   predep_objects_CXX=
@@ -11979,19 +12445,51 @@ interix3*)
   postdeps_CXX=
   ;;
 
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+    #
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
 solaris*)
   case $cc_basename in
   CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
     # Adding this requires a known-good setup of shared libraries for
     # Sun compiler versions before 5.6, else PIC objects from an old
     # archive will be linked into the output, leading to subtle bugs.
-    postdeps_CXX='-lCstd -lCrun'
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
     ;;
   esac
   ;;
 esac
 
-
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -12022,12 +12520,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # like `-m68040'.
       lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    mingw* | cygwin* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
@@ -12039,7 +12539,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -12065,7 +12565,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[4-9]*)
        # All AIX code is PIC.
        if test "$host_cpu" = ia64; then
          # AIX 5 now supports IA64 processor
@@ -12161,7 +12661,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
            lt_prog_compiler_pic_CXX='-KPIC'
            lt_prog_compiler_static_CXX='-static'
            ;;
-         pgCC*)
+         pgCC* | pgcpp*)
            # Portland Group C++ compiler.
            lt_prog_compiler_wl_CXX='-Wl,'
            lt_prog_compiler_pic_CXX='-fpic'
@@ -12175,6 +12675,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
            lt_prog_compiler_static_CXX='-non_shared'
            ;;
          *)
+           case `$CC -V 2>&1 | sed 5q` in
+           *Sun\ C*)
+             # Sun C++ 5.9
+             lt_prog_compiler_pic_CXX='-KPIC'
+             lt_prog_compiler_static_CXX='-Bstatic'
+             lt_prog_compiler_wl_CXX='-Qoption ld '
+             ;;
+           esac
            ;;
        esac
        ;;
@@ -12284,12 +12792,12 @@ 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 $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
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_CXX=no
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -12300,27 +12808,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12811: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12307: \$? = $ac_status" >&5
+   echo "$as_me:12815: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
+       lt_cv_prog_compiler_pic_works_CXX=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
@@ -12347,13 +12855,13 @@ esac
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_CXX=no
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12363,20 +12871,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
+         lt_cv_prog_compiler_static_works_CXX=yes
        fi
      else
-       lt_prog_compiler_static_works_CXX=yes
+       lt_cv_prog_compiler_static_works_CXX=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
 else
     lt_prog_compiler_static_CXX=
@@ -12393,7 +12901,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -12404,11 +12912,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12407: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12915: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12411: \$? = $ac_status" >&5
+   echo "$as_me:12919: \$? = $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
@@ -12461,7 +12969,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
-  aix4* | aix5*)
+  aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
@@ -12474,7 +12982,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
   ;;
   linux* | k*bsd*-gnu)
     link_all_deplibs_CXX=no
@@ -12483,6 +12991,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
@@ -12508,7 +13017,7 @@ x|xyes)
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -12566,20 +13075,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -12597,7 +13093,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12736,12 +13232,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`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'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -12795,7 +13286,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -12858,7 +13349,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -12929,7 +13420,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -13035,6 +13526,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -13131,6 +13626,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -13214,6 +13724,7 @@ if test -f "$ltmain"; then
     predeps_CXX \
     postdeps_CXX \
     compiler_lib_search_path_CXX \
+    compiler_lib_search_dirs_CXX \
     archive_cmds_CXX \
     archive_expsym_cmds_CXX \
     postinstall_cmds_CXX \
@@ -13229,6 +13740,7 @@ if test -f "$ltmain"; then
     module_cmds_CXX \
     module_expsym_cmds_CXX \
     lt_cv_prog_compiler_c_o_CXX \
+    fix_srcfile_path_CXX \
     exclude_expsyms_CXX \
     include_expsyms_CXX; do
 
@@ -13461,6 +13973,10 @@ predeps=$lt_predeps_CXX
 # shared library.
 postdeps=$lt_postdeps_CXX
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
@@ -13549,7 +14065,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
@@ -13640,10 +14156,17 @@ objext=o
 objext_F77=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
+lt_simple_link_test_code="\
+      program t
+      end
+"
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -13659,16 +14182,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -13706,7 +14229,7 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4* | aix5*)
+aix[4-9]*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
@@ -13752,13 +14275,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
       ;;
 
@@ -13768,7 +14293,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_F77='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -13826,7 +14351,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -13878,6 +14403,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         lt_prog_compiler_pic_F77='-KPIC'
+         lt_prog_compiler_static_F77='-Bstatic'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         lt_prog_compiler_pic_F77='-KPIC'
+         lt_prog_compiler_static_F77='-Bstatic'
+         lt_prog_compiler_wl_F77=''
+         ;;
+       esac
+       ;;
       esac
       ;;
 
@@ -13887,6 +14428,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_F77='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_F77='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -13949,12 +14494,12 @@ 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 $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
+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_F77=no
+  lt_cv_prog_compiler_pic_works_F77=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_F77"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13965,27 +14510,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13968: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14513: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13972: \$? = $ac_status" >&5
+   echo "$as_me:14517: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
+       lt_cv_prog_compiler_pic_works_F77=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
     case $lt_prog_compiler_pic_F77 in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
@@ -14012,13 +14557,13 @@ esac
 wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_F77=no
+  lt_cv_prog_compiler_static_works_F77=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14028,20 +14573,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
+         lt_cv_prog_compiler_static_works_F77=yes
        fi
      else
-       lt_prog_compiler_static_works_F77=yes
+       lt_cv_prog_compiler_static_works_F77=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
 
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
     :
 else
     lt_prog_compiler_static_F77=
@@ -14058,7 +14603,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -14069,11 +14614,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14072: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14617: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14076: \$? = $ac_status" >&5
+   echo "$as_me:14621: \$? = $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
@@ -14153,12 +14698,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -14217,7 +14763,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
        ld_shlibs_F77=no
@@ -14265,7 +14811,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -14283,7 +14829,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_F77=no
       hardcode_shlibpath_var_F77=no
       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -14298,7 +14844,7 @@ EOF
       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        tmp_addflag=
        case $cc_basename,$host_cpu in
@@ -14316,13 +14862,22 @@ EOF
        ifc* | ifort*)                  # Intel Fortran compiler
          tmp_addflag=' -nofor_main' ;;
        esac
-       archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       *)
+         tmp_sharedflag='-shared' ;;
+       esac
+       archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
        if test $supports_anon_versioning = yes; then
          archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
        fi
        link_all_deplibs_F77=no
       else
@@ -14428,7 +14983,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
@@ -14448,7 +15003,7 @@ _LT_EOF
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
          for ld_flag in $LDFLAGS; do
          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
            aix_use_runtimelinking=yes
@@ -14482,7 +15037,7 @@ _LT_EOF
           strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
          # We have reworked collect2
-         hardcode_direct_F77=yes
+         :
          else
          # We have old collect2
          hardcode_direct_F77=unsupported
@@ -14546,11 +15101,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -14595,11 +15157,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -14653,7 +15222,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
@@ -14686,19 +15255,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
     if test "$GCC" = yes ; then
        output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -14860,24 +15428,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-       hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-       export_dynamic_flag_spec_F77='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+       hardcode_direct_F77=yes
+       hardcode_shlibpath_var_F77=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+         export_dynamic_flag_spec_F77='${wl}-E'
+       else
+         case $host_os in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            hardcode_libdir_flag_spec_F77='-R$libdir'
+            ;;
+          *)
+            archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+            ;;
+         esac
+        fi
       else
-       case $host_os in
-        openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-          archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-          hardcode_libdir_flag_spec_F77='-R$libdir'
-          ;;
-        *)
-          archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-          hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-          ;;
-       esac
+       ld_shlibs_F77=no
       fi
       ;;
 
@@ -14936,17 +15508,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
-       # The compiler driver will combine linker options so we
-       # cannot just pass the convience library names through
-       # without $wl, iff we do not link with $LD.
-       # Luckily, gcc supports the same syntax we need for Sun Studio.
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
        # Supported since Solaris 2.6 (maybe 2.5.1?)
-       case $wlarc in
-       '')
-         whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-       *)
-         whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-       esac ;;
+       if test "$GCC" = yes; then
+         whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -15003,7 +15574,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_F77='${wl}-z,text'
       archive_cmds_need_lc_F77=no
       hardcode_shlibpath_var_F77=no
@@ -15080,7 +15651,7 @@ x|xyes)
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -15138,20 +15709,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -15169,7 +15727,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15308,12 +15866,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`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'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -15367,7 +15920,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -15430,7 +15983,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -15501,7 +16054,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15607,6 +16160,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -15703,6 +16260,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -15786,6 +16358,7 @@ if test -f "$ltmain"; then
     predeps_F77 \
     postdeps_F77 \
     compiler_lib_search_path_F77 \
+    compiler_lib_search_dirs_F77 \
     archive_cmds_F77 \
     archive_expsym_cmds_F77 \
     postinstall_cmds_F77 \
@@ -15801,6 +16374,7 @@ if test -f "$ltmain"; then
     module_cmds_F77 \
     module_expsym_cmds_F77 \
     lt_cv_prog_compiler_c_o_F77 \
+    fix_srcfile_path_F77 \
     exclude_expsyms_F77 \
     include_expsyms_F77; do
 
@@ -16033,6 +16607,10 @@ predeps=$lt_predeps_F77
 # shared library.
 postdeps=$lt_postdeps_F77
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_F77
@@ -16121,7 +16699,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_F77
@@ -16179,10 +16757,10 @@ objext=o
 objext_GCJ=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
+lt_simple_compile_test_code="class foo {}"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -16198,16 +16776,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -16245,7 +16823,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16256,11 +16834,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16259: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16837: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16263: \$? = $ac_status" >&5
+   echo "$as_me:16841: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16311,14 +16889,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+
       ;;
 
     darwin* | rhapsody*)
@@ -16327,7 +16907,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic_GCJ='-fno-common'
       ;;
 
-    interix3*)
+    interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -16385,10 +16965,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
        esac
        ;;
 
-    mingw* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+
       ;;
 
     hpux9* | hpux10* | hpux11*)
@@ -16437,6 +17017,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ='-non_shared'
         ;;
+      *)
+        case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)
+         # Sun C 5.9
+         lt_prog_compiler_pic_GCJ='-KPIC'
+         lt_prog_compiler_static_GCJ='-Bstatic'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       *Sun\ F*)
+         # Sun Fortran 8.3 passes all unrecognized flags to the linker
+         lt_prog_compiler_pic_GCJ='-KPIC'
+         lt_prog_compiler_static_GCJ='-Bstatic'
+         lt_prog_compiler_wl_GCJ=''
+         ;;
+       esac
+       ;;
       esac
       ;;
 
@@ -16446,6 +17042,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static_GCJ='-non_shared'
       ;;
 
+    rdos*)
+      lt_prog_compiler_static_GCJ='-non_shared'
+      ;;
+
     solaris*)
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -16508,12 +17108,12 @@ 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 $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
+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_pic_works_GCJ=no
+  lt_cv_prog_compiler_pic_works_GCJ=no
   ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -16524,27 +17124,27 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16531: \$? = $ac_status" >&5
+   echo "$as_me:17131: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
+       lt_cv_prog_compiler_pic_works_GCJ=yes
      fi
    fi
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
     case $lt_prog_compiler_pic_GCJ in
      "" | " "*) ;;
      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
@@ -16571,13 +17171,13 @@ esac
 wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  lt_prog_compiler_static_works_GCJ=no
+  lt_cv_prog_compiler_static_works_GCJ=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16587,20 +17187,20 @@ else
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
+         lt_cv_prog_compiler_static_works_GCJ=yes
        fi
      else
-       lt_prog_compiler_static_works_GCJ=yes
+       lt_cv_prog_compiler_static_works_GCJ=yes
      fi
    fi
-   $rm conftest*
+   $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
 
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
     :
 else
     lt_prog_compiler_static_GCJ=
@@ -16617,7 +17217,7 @@ else
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -16628,11 +17228,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16631: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16635: \$? = $ac_status" >&5
+   echo "$as_me:17235: \$? = $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
@@ -16712,12 +17312,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
   # Just being paranoid about ensuring that cc_basename is set.
   for cc_temp in $compiler""; do
@@ -16776,7 +17377,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
        ld_shlibs_GCJ=no
@@ -16824,7 +17425,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -16842,7 +17443,7 @@ EOF
       fi
       ;;
 
-    interix3*)
+    interix[3-9]*)
       hardcode_direct_GCJ=no
       hardcode_shlibpath_var_GCJ=no
       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -16857,7 +17458,7 @@ EOF
       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux* | k*bsd*-gnu)
+    gnu* | linux* | k*bsd*-gnu)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        tmp_addflag=
        case $cc_basename,$host_cpu in
@@ -16875,13 +17476,22 @@ EOF
        ifc* | ifort*)                  # Intel Fortran compiler
          tmp_addflag=' -nofor_main' ;;
        esac
-       archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       case `$CC -V 2>&1 | sed 5q` in
+       *Sun\ C*)                       # Sun C 5.9
+         whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+         tmp_sharedflag='-G' ;;
+       *Sun\ F*)                       # Sun Fortran 8.3
+         tmp_sharedflag='-G' ;;
+       *)
+         tmp_sharedflag='-shared' ;;
+       esac
+       archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
        if test $supports_anon_versioning = yes; then
          archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
   $echo "local: *; };" >> $output_objdir/$libname.ver~
-         $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+         $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
        fi
        link_all_deplibs_GCJ=no
       else
@@ -16987,7 +17597,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
@@ -17007,7 +17617,7 @@ _LT_EOF
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
          for ld_flag in $LDFLAGS; do
          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
            aix_use_runtimelinking=yes
@@ -17041,7 +17651,7 @@ _LT_EOF
           strings "$collect2name" | grep resolve_lib_name >/dev/null
          then
          # We have reworked collect2
-         hardcode_direct_GCJ=yes
+         :
          else
          # We have old collect2
          hardcode_direct_GCJ=unsupported
@@ -17115,11 +17725,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17174,11 +17791,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+       /^0/ {
+           s/^0  *\(.*\)$/\1/
+           p
+       }
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 # Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -17232,7 +17856,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
+      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
@@ -17265,19 +17889,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
     if test "$GCC" = yes ; then
        output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
     else
       case $cc_basename in
         xlc*)
          output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
          module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
           # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
           ;;
        *)
@@ -17439,24 +18062,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-       hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-       export_dynamic_flag_spec_GCJ='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+       hardcode_direct_GCJ=yes
+       hardcode_shlibpath_var_GCJ=no
+       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+         archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+         hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+         export_dynamic_flag_spec_GCJ='${wl}-E'
+       else
+         case $host_os in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+            hardcode_libdir_flag_spec_GCJ='-R$libdir'
+            ;;
+          *)
+            archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+            hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+            ;;
+         esac
+        fi
       else
-       case $host_os in
-        openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-          archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-          hardcode_libdir_flag_spec_GCJ='-R$libdir'
-          ;;
-        *)
-          archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-          hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-          ;;
-       esac
+       ld_shlibs_GCJ=no
       fi
       ;;
 
@@ -17515,17 +18142,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
-       # The compiler driver will combine linker options so we
-       # cannot just pass the convience library names through
-       # without $wl, iff we do not link with $LD.
-       # Luckily, gcc supports the same syntax we need for Sun Studio.
+       # The compiler driver will combine and reorder linker options,
+       # but understands `-z linker_flag'.  GCC discards it without `$wl',
+       # but is careful enough not to reorder.
        # Supported since Solaris 2.6 (maybe 2.5.1?)
-       case $wlarc in
-       '')
-         whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-       *)
-         whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-       esac ;;
+       if test "$GCC" = yes; then
+         whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+       else
+         whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
+       fi
+       ;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -17582,7 +18208,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag_GCJ='${wl}-z,text'
       archive_cmds_need_lc_GCJ=no
       hardcode_shlibpath_var_GCJ=no
@@ -17659,7 +18285,7 @@ x|xyes)
       { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
       $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -17717,20 +18343,7 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
+
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -17748,7 +18361,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -17887,12 +18500,7 @@ darwin* | rhapsody*)
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`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'
-  fi
+
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
@@ -17946,7 +18554,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -18009,7 +18617,7 @@ hpux9* | hpux10* | hpux11*)
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[3-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -18080,7 +18688,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[     ]*hwcap[        ]/d;s/[:,       ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18186,6 +18794,10 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
   version_type=linux
   need_lib_prefix=no
@@ -18282,6 +18894,21 @@ esac
 echo "${ECHO_T}$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+fi
+
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+fi
+
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
@@ -18365,6 +18992,7 @@ if test -f "$ltmain"; then
     predeps_GCJ \
     postdeps_GCJ \
     compiler_lib_search_path_GCJ \
+    compiler_lib_search_dirs_GCJ \
     archive_cmds_GCJ \
     archive_expsym_cmds_GCJ \
     postinstall_cmds_GCJ \
@@ -18380,6 +19008,7 @@ if test -f "$ltmain"; then
     module_cmds_GCJ \
     module_expsym_cmds_GCJ \
     lt_cv_prog_compiler_c_o_GCJ \
+    fix_srcfile_path_GCJ \
     exclude_expsyms_GCJ \
     include_expsyms_GCJ; do
 
@@ -18612,6 +19241,10 @@ predeps=$lt_predeps_GCJ
 # shared library.
 postdeps=$lt_postdeps_GCJ
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
@@ -18700,7 +19333,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_GCJ
@@ -18757,7 +19390,7 @@ objext=o
 objext_RC=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 
 # Code to be used in simple link tests
 lt_simple_link_test_code="$lt_simple_compile_test_code"
@@ -18776,16 +19409,16 @@ compiler=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $rm conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$rm -r conftest*
 
 
 # Allow CC to be a program name with arguments.
@@ -18845,6 +19478,7 @@ if test -f "$ltmain"; then
     predeps_RC \
     postdeps_RC \
     compiler_lib_search_path_RC \
+    compiler_lib_search_dirs_RC \
     archive_cmds_RC \
     archive_expsym_cmds_RC \
     postinstall_cmds_RC \
@@ -18860,6 +19494,7 @@ if test -f "$ltmain"; then
     module_cmds_RC \
     module_expsym_cmds_RC \
     lt_cv_prog_compiler_c_o_RC \
+    fix_srcfile_path_RC \
     exclude_expsyms_RC \
     include_expsyms_RC; do
 
@@ -19092,6 +19727,10 @@ predeps=$lt_predeps_RC
 # shared library.
 postdeps=$lt_postdeps_RC
 
+# The directories searched by this compiler when creating a shared
+# library
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
+
 # The library search path used internally by the compiler when linking
 # a shared library.
 compiler_lib_search_path=$lt_compiler_lib_search_path_RC
@@ -19180,7 +19819,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 
 # Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
+fix_srcfile_path=$lt_fix_srcfile_path
 
 # Set to yes if exported symbols are required.
 always_export_symbols=$always_export_symbols_RC
@@ -19564,7 +20203,7 @@ echo "$as_me: error: '--with-openssl requires a path to a directory'" >&2;}
     CPPFLAGS="${CPPFLAGS} -I${openssl_prefix}/include"
     LDFLAGS="${LDFLAGS} -L${openssl_prefix}/lib"
     LDFLAGS="${LDFLAGS} -R${openssl_prefix}/lib"
-    OPENSSL_PATH="--with-openssl ${openssl_prefix}"
+    OPENSSL_PATH="--with-openssl=${openssl_prefix}"
   fi
 
 fi
 done
 
 
-for ac_header in ap_regex.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef HAVE_APR_H
-# include "apr.h"
-#endif
-#ifdef HAVE_AP_CONFIG_H
-# include "ap_config.h"
-#endif
-
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- use_pcre_flag="no"
-else
-  use_pcre_flag="yes"
-fi
-
-done
-
-
 for ac_header in libgen.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 
 done
 
+#AC_CHECK_HEADERS([ap_regex.h],
+#  AC_DEFINE([HAVE_AP_REGEX_H], [], [Define to 1 if you have the <ap_regex.h> header file.]),[],
+#[[
+##ifdef HAVE_APR_H
+##include "apr.h"
+##endif
+##ifdef HAVE_AP_CONFIG_H
+##include "ap_config.h"
+##endif
+#]])
+
+for ac_header in ap_regex.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef HAVE_APR_H
+# include "apr.h"
+#endif
+#ifdef HAVE_AP_CONFIG_H
+# include "ap_config.h"
+#endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ use_pcre_flag="no"
+else
+  use_pcre_flag="yes"
+fi
+
+done
+
 if test "x$use_pcre_flag" = "xyes" ; then
   if test "x$with_pcre_config" = "x" ; then
     # Extract the first word of "pcre-config", so it can be a program name with args.
@@ -21681,6 +22330,8 @@ done
 
 
 
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile support/centos/mod-chxj.spec"
 
 cat >confcache <<\_ACEOF
@@ -22100,7 +22751,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by mod_chxj $as_me 0.13.0-rc, which was
+This file was extended by mod_chxj $as_me 0.13.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22153,7 +22804,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-mod_chxj config.status 0.13.0-rc
+mod_chxj config.status 0.13.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -22421,16 +23072,16 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
 CCDEPMODE!$CCDEPMODE$ac_delim
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+SED!$SED$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LN_S!$LN_S$ac_delim
 ECHO!$ECHO$ac_delim
 AR!$AR$ac_delim
 RANLIB!$RANLIB$ac_delim
+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22472,6 +23123,9 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
+ac_ct_CXX!$ac_ct_CXX$ac_delim
 CXXDEPMODE!$CXXDEPMODE$ac_delim
 am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
 am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
@@ -22498,7 +23152,7 @@ OPENSSL_PATH!$OPENSSL_PATH$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -22899,21 +23553,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X$ac_file : 'X\(//\)[^/]' \| \
-        X$ac_file : 'X\(//\)$' \| \
-        X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$_am_arg" : 'X\(//\)[^/]' \| \
+        X"$_am_arg" : 'X\(//\)$' \| \
+        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
            s//\1/
            q
@@ -22950,7 +23605,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
         X"$mf" : 'X\(//\)[^/]' \| \
index 029b383..8e39a3b 100644 (file)
@@ -1,6 +1,6 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
-AC_INIT([mod_chxj],[0.13.0-rc],[konn@users.sourceforge.jp])
+AC_INIT([mod_chxj],[0.13.0],[konn@users.sourceforge.jp])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/mod_chxj.c])
 AC_CANONICAL_TARGET
@@ -180,7 +180,7 @@ AC_ARG_WITH(openssl,
     CPPFLAGS="${CPPFLAGS} -I${openssl_prefix}/include"
     LDFLAGS="${LDFLAGS} -L${openssl_prefix}/lib"
     LDFLAGS="${LDFLAGS} -R${openssl_prefix}/lib"
-    OPENSSL_PATH="--with-openssl ${openssl_prefix}"
+    OPENSSL_PATH="--with-openssl=${openssl_prefix}"
   fi
 ])
 
index 88f3c97..f25dd6a 100644 (file)
     </device>
   </user_agent>
 
+  <!-- OSAKANA TARO add start -->
+  <user_agent pattern="^DoCoMo/2.0[ ]+(ISIM)+([^( ]+)(\(.+\))*$">
+  <!--
+  iモードHTMLシミュレータII (ver8.4)
+  -->
+  <!--
+  iHTML5.0/Flash Lite 1.1/Deco-mail1.0
+    DoCoMo/2.0 ISIM0801(c100;TB;W48H32)
+  -->
+      <device>
+      <device_id>ISIM0801</device_id>
+      <device_name>DoCoMo ISIM0801</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type><!-- IHTML5.0 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML5.0/Flash Lite 1.1/Adobe Reader LE1.0/Deco-mail1.0
+    DoCoMo/2.0 ISIM0802(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0802</device_id>
+      <device_name>DoCoMo ISIM0802</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type><!-- IHTML5.0 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML6.0/Flash Lite 1.1/Adobe Reader LE1.0/Deco-mail2.0/ToruCa1.0
+    DoCoMo/2.0 ISIM0803(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0803</device_id>
+      <device_name>DoCoMo ISIM0803</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML7.0/Flash Lite 1.1/Adobe Reader LE2.0/Deco-mail3.0/ToruCa2.0
+    DoCoMo/2.0 ISIM0804(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0804</device_id>
+      <device_name>DoCoMo ISIM0804</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML7.1/Flash Lite 3.0/Adobe Reader LE2.0/Deco-mail3.0/ToruCa2.0
+    DoCoMo/2.0 ISIM0805(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0805</device_id>
+      <device_name>DoCoMo ISIM0805</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.1/IXHTML2.1 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML7.2/Flash Lite 3.0/Adobe Reader LE2.0/Deco-mail4.0/ToruCa2.0
+    DoCoMo/2.0 ISIM0806(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0806</device_id>
+      <device_name>DoCoMo ISIM0806</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  <!--
+  iHTML7.2/Flash Lite 3.1/Adobe Reader LE2.0/Deco-mail4.0/ToruCa2.1
+    DoCoMo/2.0 ISIM0807(c100;TB;W48H32)
+  -->
+    <device>
+      <device_id>ISIM0807</device_id>
+      <device_name>DoCoMo ISIM0807</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+  <!--
+       QVGA: i-mode Browser2.0/Flash Lite 3.1/Adobe Reader LE2.0/Deco-mail4.0/ToruCa2.1
+    iMode2.0 DoCoMo/2.0 ISIM0808(c500;TB;W24H16)
+  -->
+    <device>
+      <device_id>ISIM0808</device_id>
+      <device_name>DoCoMo ISIM0808</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>480</width>
+      <heigh>640</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>512000</color>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>640</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+  
+  </user_agent>
+  <!-- OSAKANA TARO add end -->
   <!-- Sale in 2007.6 F904i_H -->
   <user_agent pattern="^DoCoMo/2.0[    ]+(F904i)\(c100;TB;W24H17\)$">
     <!--
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <device>
-      <device_id>UNKNOWN_DEVICE</device_id>
-      <device_name>UNKNOWN DoCoMo Device</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>118</width>
-      <heigh>128</heigh>
+       <!-- OSAKANA TARO add start -->
+       <!-- iモード対応HTML7.2(FOMA 906iなど) -->
+    <!--
+               DoCoMo/2.0 P04A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P04A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P04A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P04A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P04A(c100;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P04A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P04A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))  
+       -->
+    <device>
+      <device_id>P04A</device_id>
+      <device_name>DoCoMo P-04A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>350</heigh>
       <gif>true</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
-      <cache>100000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-  </user_agent>
-
-
-
-  <user_agent pattern="^DoCoMo/1.0/([^   /]+)/c[0-9][0-9]/TB$">
+       
+       <!--
+               DoCoMo/2.0 P05A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P05A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P05A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P05A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P05A(c100;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P05A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P05A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
     <device>
-      <device_id>F504i</device_id>
-      <device_name>F504i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
+      <device_id>P05A</device_id>
+      <device_name>DoCoMo P-05A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>136</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       <!--
+               DoCoMo/2.0 P06A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P06A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P06A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P06A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P06A(c100;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P06A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P06A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
     <device>
-      <device_id>F504iS</device_id>
-      <device_name>F504iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
+      <device_id>P06A</device_id>
+      <device_name>DoCoMo P-06A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       
+       <!--
+               DoCoMo/2.0 P10A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P10A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P10A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P10A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P10A(c100;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P10A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P10A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
     <device>
-      <device_id>N504i</device_id>
-      <device_name>N504i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
+      <device_id>P10A</device_id>
+      <device_name>DoCoMo P-10A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>160</wp_width>
-      <wp_heigh>200</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>N504iS</device_id>
-      <device_name>N504iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
+       
+       <!--
+               DoCoMo/2.0 SH04A(c100;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 SH04A(c100;TB;W24H12) (ブラウザからの通信時、ADF取得時(横画面))
+               DoCoMo/2.0 SH04A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 SH04A(c100;TB;W20H10) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 SH04A(c100;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 SH04A(c100;TB;W30H15) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 SH04A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 SH04A(c100;TB;W16H08) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 SH04A(c100;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH04A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH04A(c100;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH04A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+    <device>
+      <device_id>SH04A</device_id>
+      <device_name>DoCoMo SH-04A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>160</wp_width>
-      <wp_heigh>198</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>SO504i</device_id>
-      <device_name>SO504i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+
+       <!-- iモード対応HTML7.2(FOMA 906iなど) end -->
+       <!-- iモードブラウザ2.0 start -->
+       
+       <!--
+               DoCoMo/2.0 P07A3(c500;TB;W24H15) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 P07A3(c500;TB;W42H08) (ブラウザからの通信時、ADF取得時(横画面))
+               DoCoMo/2.0 P07A3(c500;TB;W20H12) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W35H06) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W30H18) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W53H09) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W28H05) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P07A3(c500;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P07A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 P07A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P07A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 P07A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+    <device>
+      <device_id>P07A</device_id>
+      <device_name>DoCoMo P-07A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
+       
+       <!--
+               DoCoMo/2.0 P08A3(c500;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P08A3(c500;TB;W20H12) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P08A3(c500;TB;W30H18) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P08A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P08A3(c500;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P08A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 P08A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P08A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 P08A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
     <device>
-      <device_id>P504i</device_id>
-      <device_name>P504i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <device_id>P08A</device_id>
+      <device_name>DoCoMo P-08A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>144</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+       <!--
+               DoCoMo/2.0 P09A3(c500;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 P09A3(c500;TB;W20H12) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P09A3(c500;TB;W30H18) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P09A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 P09A3(c500;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P09A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 P09A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P09A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 P09A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
     <device>
-      <device_id>P504iS</device_id>
-      <device_name>P504iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <device_id>P09A</device_id>
+      <device_name>DoCoMo P-09A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>144</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SH251i</device_id>
-      <device_name>SH251i</device_name>
-      <html_spec_type>CHTML_3_0</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!--
+               DoCoMo/2.0 N06A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 N06A3(c500;TB;W24H12) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 N06A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 N06A3(c500;TB;W20H10) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 N06A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 N06A3(c500;TB;W30H15) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 N06A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 N06A3(c500;TB;W16H8) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 N06A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N06A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N06A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N06A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N06A</device_id>
+      <device_name>DoCoMo N-06A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>SH251iS</device_id>
-      <device_name>SH251iS</device_name>
-      <html_spec_type>CHTML_3_0</html_spec_type>
-      <width>176</width>
-      <heigh>187</heigh>
+
+       <!--
+               DoCoMo/2.0 N07A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N07A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N07A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N07A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N07A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N07A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N07A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N07A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N07A</device_id>
+      <device_name>DoCoMo N-07A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>176</wp_width>
-      <wp_heigh>220</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>D251i</device_id>
-      <device_name>D251i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 N08A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N08A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N08A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N08A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N08A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N08A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N08A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N08A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N08A</device_id>
+      <device_name>DoCoMo N-08A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>D251iS</device_id>
-      <device_name>D251iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+
+       <!--
+               DoCoMo/2.0 N09A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N09A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N09A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N09A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N09A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N09A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N09A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N09A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N09A</device_id>
+      <device_name>DoCoMo N-09A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>F251i</device_id>
-      <device_name>F251i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>140</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!--
+               DoCoMo/2.0 F08A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 F08A3(c500;TB;W24H17) (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F08A3(c500;TB;W42H09) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F08A3(c500;TB;W24H10) (ブラウザからの通信時(横マルチ画面))
+               DoCoMo/2.0 F08A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W20H14) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W35H08) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W20H08) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W30H22) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W53H12) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W30H13) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W16H11) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W28H06) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W16H07) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W12H08) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W12H08) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W21H04) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F08A3(c500;TB;W12H05) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F08A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F08A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F08A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F08A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>F08A</device_id>
+      <device_name>DoCoMo F-08A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>156</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>N251i</device_id>
-      <device_name>N251i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>140</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!--
+               DoCoMo/2.0 F09A3(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 F09A3(c500;TB;W24H14) (ブラウザからの通信時(縦画面パッド表示))
+               DoCoMo/2.0 F09A3(c500;TB;W24H20) (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F09A3(c500;TB;W24H18) (ブラウザからの通信時(縦全画面パッド表示))
+               DoCoMo/2.0 F09A3(c500;TB;W48H09) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F09A3(c500;TB;W43H09) (ブラウザからの通信時(横画面パッド表示))
+               DoCoMo/2.0 F09A3(c500;TB;W24H10) (ブラウザからの通信時(横マルチ画面))
+               DoCoMo/2.0 F09A3(c500;TB;W24H08) (ブラウザからの通信時(横マルチ画面パッド表示))
+               DoCoMo/2.0 F09A3(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W20H11) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W20H17) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W20H15) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W40H08) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W36H08) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W20H08) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W20H07) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H17) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H25) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H23) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W60H12) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W54H12) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H13) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W30H10) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H09) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H13) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H12) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W32H06) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W28H06) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H07) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W16H05) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H08) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H07) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H10) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H09) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W24H04) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W21H04) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H05) (ブラウザからの通信時(横マルチ画面))1
+               DoCoMo/2.0 F09A3(c500;TB;W12H04) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F09A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F09A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F09A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F09A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>F09A</device_id>
+      <device_name>DoCoMo F-09A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>159</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>N251iS</device_id>
-      <device_name>N251iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>140</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>960</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!--
+               DoCoMo/2.0 SH05A3(c500;TB;W24H14) (ブラウザからの通信時)
+               DoCoMo/2.0 SH05A3(c500;TB;W20H12) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W30H18) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W16H09) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH05A3(c500;TB;W20H13) (ADF取得時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W30H20) (ADF取得時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W16H10) (ADF取得時)1
+               DoCoMo/2.0 SH05A3(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH05A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH05A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH05A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH05A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH05A</device_id>
+      <device_name>DoCoMo SH-05A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>158</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>P251iS</device_id>
-      <device_name>P251iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH06A3(c500;TB;W24H14) (ブラウザからの通信時(縦画面))
+               DoCoMo/2.0 SH06A3(c500;TB;W24H10) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 SH06A3(c500;TB;W20H12) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W20H09) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W30H18) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W30H13) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W16H09) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W16H07) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W24H16) (ADF取得時(縦画面))
+               DoCoMo/2.0 SH06A3(c500;TB;W24H12) (ADF取得時(横画面))
+               DoCoMo/2.0 SH06A3(c500;TB;W20H13) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W20H10) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W30H20) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W30H15) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W16H10) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W16H08) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH06A3(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH06A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH06A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH06A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH06A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH06A</device_id>
+      <device_name>DoCoMo SH-06A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>F671iS</device_id>
-      <device_name>F671iS</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>160</width>
-      <heigh>120</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH07A3(c500;TB;W24H14) (ブラウザからの通信時(縦画面))
+               DoCoMo/2.0 SH07A3(c500;TB;W24H10) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 SH07A3(c500;TB;W20H12) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W20H09) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W30H18) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W30H13) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W16H09) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W16H07) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W24H16) (ADF取得時(縦画面))
+               DoCoMo/2.0 SH07A3(c500;TB;W24H12) (ADF取得時(横画面))
+               DoCoMo/2.0 SH07A3(c500;TB;W20H13) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W20H10) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W30H20) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W30H15) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W16H10) (ADF取得時(縦画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W16H08) (ADF取得時(横画面))1
+               DoCoMo/2.0 SH07A3(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH07A3(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH07A3(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH07A3(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH07A3(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH07A</device_id>
+      <device_name>DoCoMo SH-07A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>160</wp_width>
-      <wp_heigh>120</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SO212i</device_id>
-      <device_name>SO212i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH08A(c500;TB;W24H14) (ブラウザからの通信時)
+               DoCoMo/2.0 SH08A(c500;TB;W20H12) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH08A(c500;TB;W30H18) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH08A(c500;TB;W16H09) (ブラウザからの通信時)1
+               DoCoMo/2.0 SH08A(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH08A(c500;TB;W20H13) (ADF取得時)1
+               DoCoMo/2.0 SH08A(c500;TB;W30H20) (ADF取得時)1
+               DoCoMo/2.0 SH08A(c500;TB;W16H10) (ADF取得時)1
+               DoCoMo/2.0 SH08A(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH08A(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH08A(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH08A(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH08A(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH08A</device_id>
+      <device_name>DoCoMo SH-08A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>128</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>F212i</device_id>
-      <device_name>F212i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH01B(c500;TB;W24H16) (ブラウザからの通信時(縦画面))
+               DoCoMo/2.0 SH01B(c500;TB;W24H10) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 SH01B(c500;TB;W24H14) (ブラウザからの通信時(縦閉画面))
+               DoCoMo/2.0 SH01B(c500;TB;W20H13) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W20H09) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W20H12) (ブラウザからの通信時(縦閉画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W30H20) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W30H13) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W30H18) (ブラウザからの通信時(縦閉画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W16H10) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W16H07) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W16H09) (ブラウザからの通信時(縦閉画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W40H26) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W40H18) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W40H24) (ブラウザからの通信時(縦閉画面))1
+               DoCoMo/2.0 SH01B(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH01B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH01B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH01B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH01B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH01B</device_id>
+      <device_name>DoCoMo SH-01B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>323</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>156</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>F661i</device_id>
-      <device_name>F661i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH02B(c500;TB;W24H16) (ブラウザからの通信時(通常画面))
+               DoCoMo/2.0 SH02B(c500;TB;W24H10) (ブラウザからの通信時(マルチ画面))
+               DoCoMo/2.0 SH02B(c500;TB;W20H13) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W20H09) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W30H20) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W30H13) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W16H10) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W16H07) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W40H26) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W40H18) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH02B(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH02B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH02B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH02B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH02B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH02B</device_id>
+      <device_name>DoCoMo SH-02B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>323</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>156</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>F672i</device_id>
-      <device_name>F672i</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>160</width>
-      <heigh>120</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH03B(c500;TB;W30H18) (ブラウザからの通信時(縦画面))
+               DoCoMo/2.0 SH03B(c500;TB;W30H13) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 SH03B(c500;TB;W20H12) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W20H09) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W24H14) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W24H10) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W40H24) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W40H18) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W16H09) (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W16H07) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 SH03B(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH03B(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH03B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH03B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH03B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH03B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH03B</device_id>
+      <device_name>DoCoMo SH-03B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>160</wp_width>
-      <wp_heigh>120</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SO213i</device_id>
-      <device_name>premini (SO213i)</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH04B(c500;TB;W24H14) (ブラウザからの通信時(通常画面))
+               DoCoMo/2.0 SH04B(c500;TB;W24H10) (ブラウザからの通信時(マルチ画面))
+               DoCoMo/2.0 SH04B(c500;TB;W20H12) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W20H09) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W30H18) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W30H13) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W16H09) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W16H07) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W24H16) (ADF取得時(通常画面))
+               DoCoMo/2.0 SH04B(c500;TB;W24H12) (ADF取得時(マルチ画面))
+               DoCoMo/2.0 SH04B(c500;TB;W20H13) (ADF取得時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W20H10) (ADF取得時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W30H20) (ADF取得時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W30H15) (ADF取得時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W16H10) (ADF取得時(通常画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W16H08) (ADF取得時(マルチ画面))1
+               DoCoMo/2.0 SH04B(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 SH04B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH04B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH04B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH04B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH04B</device_id>
+      <device_name>DoCoMo SH-04B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>296</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>128</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SO213iS</device_id>
-      <device_name>premini-S (SO213iS)</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 SH05B(c500;TB;W24H16) (ブラウザからの通信時(通常画面))
+               DoCoMo/2.0 SH05B(c500;TB;W24H10) (ブラウザからの通信時(マルチ画面))
+               DoCoMo/2.0 SH05B(c500;TB;W20H13) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W20H09) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W30H20) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W30H13) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W16H10) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W16H07) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W40H26) (ブラウザからの通信時(通常画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W40H18) (ブラウザからの通信時(マルチ画面))1
+               DoCoMo/2.0 SH05B(c500;TB;W24H16) (ADF取得時)
+               DoCoMo/2.0 SH05B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 SH05B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 SH05B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 SH05B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>SH05B</device_id>
+      <device_name>DoCoMo SH-05B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>323</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>128</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>N2701</device_id>
-      <device_name>N2701</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>176</width>
-      <heigh>198</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 F01B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 F01B(c500;TB;W24H14) (ブラウザからの通信時(縦画面パッド表示))
+               DoCoMo/2.0 F01B(c500;TB;W24H20) (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F01B(c500;TB;W24H18) (ブラウザからの通信時(縦全画面パッド表示))
+               DoCoMo/2.0 F01B(c500;TB;W48H09) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F01B(c500;TB;W43H09) (ブラウザからの通信時(横画面パッド表示))
+               DoCoMo/2.0 F01B(c500;TB;W24H10) (ブラウザからの通信時(縦マルチ画面))
+               DoCoMo/2.0 F01B(c500;TB;W24H08) (ブラウザからの通信時(横マルチ画面パッド表示))
+               DoCoMo/2.0 F01B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F01B(c500;TB;W20H11) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W20H16) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F01B(c500;TB;W20H15) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W40H08) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F01B(c500;TB;W36H08) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W20H08) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F01B(c500;TB;W20H07) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F01B(c500;TB;W30H17) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W30H25) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F01B(c500;TB;W30H22) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W60H12) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F01B(c500;TB;W54H12) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W30H13) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F01B(c500;TB;W30H10) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F01B(c500;TB;W16H09) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W16H13) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F01B(c500;TB;W16H12) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W32H06) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F01B(c500;TB;W28H06) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W16H07) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F01B(c500;TB;W16H05) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W12H08) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F01B(c500;TB;W12H07) (ブラウザからの通信時(縦画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W12H10) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F01B(c500;TB;W12H09) (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W24H04) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F01B(c500;TB;W21H04) (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;TB;W12H05) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F01B(c500;TB;W12H04) (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F01B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F01B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F01B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F01B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>F01B</device_id>
+      <device_name>DoCoMo F-01B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>176</wp_width>
-      <wp_heigh>198</wp_heigh>
-      <cache>100000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-
-    <!-- Sale in 2005.10 RADIDEN(SO213iWR) -->
-    <device>
-      <device_id>SO213iWR</device_id>
-      <device_name>SO213iWR</device_name>
-      <html_spec_type>CHTML_4_0</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>960</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 F02B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 F02B(c500;TB;W24H17) (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F02B(c500;TB;W42H09) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F02B(c500;TB;W24H10) (ブラウザからの通信時(縦マルチ画面))
+               DoCoMo/2.0 F02B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F02B(c500;TB;W20H14) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F02B(c500;TB;W35H08) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F02B(c500;TB;W20H08) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F02B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F02B(c500;TB;W30H22) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F02B(c500;TB;W53H12) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F02B(c500;TB;W30H13) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F02B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F02B(c500;TB;W16H11) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F02B(c500;TB;W28H06) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F02B(c500;TB;W16H07) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F02B(c500;TB;W12H08) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F02B(c500;TB;W12H08) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F02B(c500;TB;W21H04) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F02B(c500;TB;W12H05) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F02B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F02B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F02B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F02B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>F02B</device_id>
+      <device_name>DoCoMo F-02B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>128</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-
-  </user_agent>
-
-
-
-  <user_agent pattern="^DoCoMo/1.0/([^   /]+)/c[0-9][0-9]/TB/W[0-9][0-9]H[0-9][0-9]$$">
-    <device>
-      <device_id>P213i</device_id>
-      <device_name>prosolid(P213i)</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 F03B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 F03B(c500;TB;W24H17) (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F03B(c500;TB;W42H09) (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F03B(c500;TB;W24H10) (ブラウザからの通信時(縦マルチ画面))
+               DoCoMo/2.0 F03B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F03B(c500;TB;W20H14) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F03B(c500;TB;W35H08) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F03B(c500;TB;W20H08) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F03B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F03B(c500;TB;W30H22) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F03B(c500;TB;W53H12) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F03B(c500;TB;W30H13) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F03B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F03B(c500;TB;W16H11) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F03B(c500;TB;W28H06) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F03B(c500;TB;W16H07) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F03B(c500;TB;W12H08) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 F03B(c500;TB;W12H08) (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F03B(c500;TB;W21H04) (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F03B(c500;TB;W12H05) (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F03B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F03B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F03B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F03B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>F03B</device_id>
+      <device_name>DoCoMo F-03B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>10000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>D505i</device_id>
-      <device_name>D505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 F04B(c500;TB;W24H16)  (ブラウザからの通信時、ADF取得時(通常画面))
+               DoCoMo/2.0 F04B(c500;TB;W24H14)  (ブラウザからの通信時(通常画面パッド表示))
+               DoCoMo/2.0 F04B(c500;TB;W24H20)  (ブラウザからの通信時(縦全画面))
+               DoCoMo/2.0 F04B(c500;TB;W24H18)  (ブラウザからの通信時(縦全画面パッド表示))
+               DoCoMo/2.0 F04B(c500;TB;W48H09)  (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 F04B(c500;TB;W43H09)  (ブラウザからの通信時(横画面パッド表示))
+               DoCoMo/2.0 F04B(c500;TB;W24H10)  (ブラウザからの通信時(縦マルチ画面))
+               DoCoMo/2.0 F04B(c500;TB;W24H08)  (ブラウザからの通信時(横マルチ画面パッド表示))
+               DoCoMo/2.0 F04B(c500;TB;W20H13)  (ブラウザからの通信時、ADF取得時(通常画面))1
+               DoCoMo/2.0 F04B(c500;TB;W20H11)  (ブラウザからの通信時(通常画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W20H16)  (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F04B(c500;TB;W20H15)  (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W40H08)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F04B(c500;TB;W36H08)  (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W20H08)  (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F04B(c500;TB;W20H07)  (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W30H20)  (ブラウザからの通信時、ADF取得時(通常画面))1
+               DoCoMo/2.0 F04B(c500;TB;W30H17)  (ブラウザからの通信時(通常画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W30H25)  (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F04B(c500;TB;W30H22)  (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W60H12)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F04B(c500;TB;W54H12)  (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W30H13)  (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F04B(c500;TB;W30H10)  (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W16H10)  (ブラウザからの通信時、ADF取得時(通常画面))1
+               DoCoMo/2.0 F04B(c500;TB;W16H09)  (ブラウザからの通信時(通常画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W16H13)  (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F04B(c500;TB;W16H12)  (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W32H06)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F04B(c500;TB;W28H06)  (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W16H07)  (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F04B(c500;TB;W16H05)  (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W12H08)  (ブラウザからの通信時、ADF取得時(通常画面))1
+               DoCoMo/2.0 F04B(c500;TB;W12H07)  (ブラウザからの通信時(通常画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W12H10)  (ブラウザからの通信時(縦全画面))1
+               DoCoMo/2.0 F04B(c500;TB;W12H09)  (ブラウザからの通信時(縦全画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W24H04)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 F04B(c500;TB;W21H04)  (ブラウザからの通信時(横画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;TB;W12H05)  (ブラウザからの通信時(縦マルチ画面))1
+               DoCoMo/2.0 F04B(c500;TB;W12H04)  (ブラウザからの通信時(横マルチ画面パッド表示))1
+               DoCoMo/2.0 F04B(c500;SD)  (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 F04B(c500;TD)  (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F04B(c500;SJ)  (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 F04B(c500;TJ)  (iアプリからの通信時(DoJaプロファイル)) 
+       -->
+       <device>
+      <device_id>F04B</device_id>
+      <device_name>DoCoMo F-04B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>270</heigh>
+      <heigh>324</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>D505iS</device_id>
-      <device_name>D505iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>960</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 P01B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 P01B(c500;TB;W24H15) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 P01B(c500;TB;W42H08) (ブラウザからの通信時、ADF取得時(横画面))
+               DoCoMo/2.0 P01B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W20H12) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W35H07) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P01B(c500;TB;W35H06) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P01B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W30H18) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W53H11) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P01B(c500;TB;W53H09) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P01B(c500;TB;W16H11) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P01B(c500;TB;W28H05) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P01B(c500;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 P01B(c500;TB;W24H13) (トルカ詳細化時)
+               DoCoMo/2.0 P01B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 P01B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P01B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 P01B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>P01B</device_id>
+      <device_name>DoCoMo P-01B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>270</heigh>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SO505i</device_id>
-      <device_name>SO505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>256</width>
-      <heigh>240</heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 P02B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 P02B(c500;TB;W42H08) (ブラウザからの通信時、ADF取得時(横画面))
+               DoCoMo/2.0 P02B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P02B(c500;TB;W35H07) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P02B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P02B(c500;TB;W53H11) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P02B(c500;TB;W16H11) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P02B(c500;TB;W28H05) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P02B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 P02B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P02B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 P02B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>P02B</device_id>
+      <device_name>DoCoMo P-02B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
+      <width>240</width>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>256</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SO505iS</device_id>
-      <device_name>SO505iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 N01B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N01B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N01B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N01B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N01B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N01B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N01B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N01B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N01B</device_id>
+      <device_name>DoCoMo N-01B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>256</heigh>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SH505i</device_id>
-      <device_name>SH505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 N02B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N02B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N02B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N02B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N02B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N02B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N02B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N02B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N02B</device_id>
+      <device_name>DoCoMo N-02B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>252</heigh>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>SH505iS</device_id>
-      <device_name>SH505iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 N03B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N03B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N03B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N03B(c500;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N03B(c500;SD) (JAR取得時(Starプロファイル))
+               DoCoMo/2.0 N03B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N03B(c500;SJ) (iアプリからの通信時(Starプロファイル))
+               DoCoMo/2.0 N03B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>N03B</device_id>
+      <device_name>DoCoMo N-03B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>252</heigh>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>N505i</device_id>
-      <device_name>N505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!-- iモードブラウザ2.0 end -->
+       <!-- iモードブラウザ2.0LE start -->
+       <!--
+               DoCoMo/2.0 P03B(c500;TB;W24H16) (ブラウザからの通信時、ADF取得時(縦画面))
+               DoCoMo/2.0 P03B(c500;TB;W42H08) (ブラウザからの通信時、ADF取得時(横画面))
+               DoCoMo/2.0 P03B(c500;TB;W20H13) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P03B(c500;TB;W35H07) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P03B(c500;TB;W30H20) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P03B(c500;TB;W53H11) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P03B(c500;TB;W16H11) (ブラウザからの通信時、ADF取得時(縦画面))1
+               DoCoMo/2.0 P03B(c500;TB;W28H05) (ブラウザからの通信時、ADF取得時(横画面))1
+               DoCoMo/2.0 P03B(c500;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 P03B(c500;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>P03B</device_id>
+      <device_name>DoCoMo P-03B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>270</heigh>
+      <heigh>331</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>270</wp_heigh>
-      <cache>20000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>N505iS</device_id>
-      <device_name>N505iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <wp_heigh>427</wp_heigh>
+      <cache>512000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               DoCoMo/2.0 L01B(c500;TB;W24H16)  (ブラウザからの通信時(縦画面))
+               DoCoMo/2.0 L01B(c500;TB;W40H10)  (ブラウザからの通信時(横画面))
+               DoCoMo/2.0 L01B(c500;TB;W20H13)  (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 L01B(c500;TB;W33H09)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 L01B(c500;TB;W30H20)  (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 L01B(c500;TB;W50H13)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 L01B(c500;TB;W16H11)  (ブラウザからの通信時(縦画面))1
+               DoCoMo/2.0 L01B(c500;TB;W26H07)  (ブラウザからの通信時(横画面))1
+               DoCoMo/2.0 L01B(c500;TB;W21H11)  (ADF取得時)
+               DoCoMo/2.0 L01B(c500;TD)  (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L01B(c500;TJ)  (iアプリからの通信時(DoJaプロファイル))
+       -->
+               <device>
+      <device_id>L01B</device_id>
+      <device_name>DoCoMo L-01B</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.2/IXHTML2.3 -->
       <width>240</width>
-      <heigh>270</heigh>
+      <heigh>330</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>270</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>512000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>F505i</device_id>
-      <device_name>F505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+
+       <!-- iモードブラウザ2.0LE end -->
+       
+       <!-- iモード対応HTML6.0(FOMA 902iなど) の追加分 start -->
+       <!--
+               DoCoMo/2.0 L03A(c100;TB;W16H09) (ブラウザからの通信時)
+               DoCoMo/2.0 L03A(c100;TB;W20H11) (ブラウザからの通信時)1
+               DoCoMo/2.0 L03A(c100;TB;W24H14) (ブラウザからの通信時)1
+               DoCoMo/2.0 L03A(c100;TB;W20H11) (ADF取得時)
+               DoCoMo/2.0 L03A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L03A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+         <device>
+      <device_id>L03A</device_id>
+      <device_name>DoCoMo L-03A</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
       <width>240</width>
-      <heigh>268</heigh>
+      <heigh>280</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>268</wp_heigh>
-      <cache>20000</cache>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>F505iGPS</device_id>
-      <device_name>F505iGPS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+
+       <!--
+               DoCoMo/2.0 L04A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 L04A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L04A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L04A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L04A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L04A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+         <device>
+      <device_id>L03A</device_id>
+      <device_name>DoCoMo L-03A</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
       <width>240</width>
-      <heigh>268</heigh>
+      <heigh>313</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>268</wp_heigh>
-      <cache>20000</cache>
+       <!--
+               DoCoMo/2.0 L06A(c100;TB;W24H15) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 L06A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L06A(c100;TB;W30H19) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L06A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 L06A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L06A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>L06A</device_id>
+      <device_name>DoCoMo L-06A</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
+      <width>240</width>
+      <heigh>313</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>P505i</device_id>
-      <device_name>P505i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+       <!--
+               DoCoMo/2.0 L02B(c100;TB;W24H16) (ブラウザからの通信時)
+               DoCoMo/2.0 L02B(c100;TB;W20H13) (ブラウザからの通信時)1
+               DoCoMo/2.0 L02B(c100;TB;W30H20) (ブラウザからの通信時)1
+               DoCoMo/2.0 L02B(c100;TB;W16H11) (ブラウザからの通信時)1
+               DoCoMo/2.0 L02B(c100;TB;W21H11) (ADF取得時)1
+               DoCoMo/2.0 L02B(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L02B(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>L02B</device_id>
+      <device_name>DoCoMo L-02B</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
       <width>240</width>
-      <heigh>266</heigh>
+      <heigh>330</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>P505iS</device_id>
-      <device_name>P505iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+       <!--
+               DoCoMo/2.0 L03B(c100;TB;W24H16) (ブラウザからの通信時)
+               DoCoMo/2.0 L03B(c100;TB;W20H13) (ブラウザからの通信時)1
+               DoCoMo/2.0 L03B(c100;TB;W30H20) (ブラウザからの通信時)1
+               DoCoMo/2.0 L03B(c100;TB;W16H11) (ブラウザからの通信時)1
+               DoCoMo/2.0 L03B(c100;TB;W21H11) (ADF取得時)
+               DoCoMo/2.0 L03B(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 L03B(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+       <device>
+      <device_id>L03B</device_id>
+      <device_name>DoCoMo L-03B</device_name>
+      <html_spec_type>CHTML_6_0</html_spec_type><!-- IHTML6.0/IXHTML2.0 -->
       <width>240</width>
-      <heigh>266</heigh>
+      <heigh>330</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>102400</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       
+       <!-- iモード対応HTML6.0(FOMA 902iなど) の追加分 end -->
 
+       <!-- iモード対応HTML7.1(FOMA 905iなど) の追加分 start -->
+       <!--
+               DoCoMo/2.0 N05A(c100;TB;W20H13) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 N05A(c100;TB;W24H16) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N05A(c100;TB;W30H20) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N05A(c100;TB;W16H10) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 N05A(c100;TB;W24H16) (トルカ詳細化時)
+               DoCoMo/2.0 N05A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 N05A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->
+    <device>
+      <device_id>N05A</device_id>
+      <device_name>DoCoMo N-05A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.1/IXHTML2.2 -->
+      <width>240</width>
+      <heigh>320</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_heigh>427</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       <!--
+       F-07A(らくらくホン ベーシックII)
+               DoCoMo/2.0 F07A(c100;TB;W20H08) (ブラウザからの通信時)
+               DoCoMo/2.0 F07A(c100;TB;W16H08) (ブラウザからの通信時)1
+       -->
     <device>
-      <device_id>D252i</device_id>
-      <device_name>D252i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>176</width>
-      <heigh>198</heigh>
+      <device_id>F07A</device_id>
+      <device_name>DoCoMo F-07A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.1/IXHTML2.2 -->
+      <width>240</width>
+      <heigh>256</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>176</wp_width>
-      <wp_heigh>240</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       <!--
+       F-10A(らくらくホン6)
+               DoCoMo/2.0 F10A(c100;TB;W20H09) (ブラウザからの通信時、ADF取得時)
+               DoCoMo/2.0 F10A(c100;TB;W16H09) (ブラウザからの通信時、ADF取得時)1
+               DoCoMo/2.0 F10A(c100;TD) (JAR取得時(DoJaプロファイル))
+               DoCoMo/2.0 F10A(c100;TJ) (iアプリからの通信時(DoJaプロファイル))
+       -->     
     <device>
-      <device_id>SH252i</device_id>
-      <device_name>SH252i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <device_id>F10A</device_id>
+      <device_name>DoCoMo F-10A</device_name>
+      <html_spec_type>CHTML_7_0</html_spec_type><!-- IHTML7.1/IXHTML2.2 -->
       <width>240</width>
-      <heigh>252</heigh>
+      <heigh>330</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>10000</cache>
+      <wp_heigh>400</wp_heigh>
+      <cache>102400</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       <!-- iモード対応HTML7.1(FOMA 905iなど) の追加分 end -->
+       
+       <!-- OSAKANA TARO add end -->
+       
+       
     <device>
-      <device_id>P252i</device_id>
-      <device_name>P252i</device_name>
+      <device_id>UNKNOWN_DEVICE</device_id>
+      <device_name>UNKNOWN DoCoMo Device</device_name>
       <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <width>118</width>
+      <heigh>128</heigh>
       <gif>true</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>10000</cache>
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>100000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+  </user_agent>
+
+
+
+  <user_agent pattern="^DoCoMo/1.0/([^   /]+)/c[0-9][0-9]/TB$">
     <device>
-      <device_id>N252i</device_id>
-      <device_name>N252i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <device_id>F504i</device_id>
+      <device_name>F504i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
       <width>132</width>
-      <heigh>140</heigh>
+      <heigh>136</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <emoji_type></emoji_type>
 
       <wp_width>132</wp_width>
-      <wp_heigh>158</wp_heigh>
+      <wp_heigh>136</wp_heigh>
       <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>P252iS</device_id>
-      <device_name>P252iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <device_id>F504iS</device_id>
+      <device_name>F504iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
       <width>132</width>
-      <heigh>144</heigh>
+      <heigh>136</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>D253i</device_id>
-      <device_name>D253i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>176</width>
-      <heigh>198</heigh>
+      <device_id>N504i</device_id>
+      <device_name>N504i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>160</width>
+      <heigh>180</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>176</wp_width>
-      <wp_heigh>240</wp_heigh>
+      <wp_width>160</wp_width>
+      <wp_heigh>200</wp_heigh>
       <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>N253i</device_id>
-      <device_name>N253i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <device_id>N504iS</device_id>
+      <device_name>N504iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
       <width>160</width>
       <heigh>180</heigh>
       <gif>true</gif>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>P253i</device_id>
-      <device_name>P253i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <device_id>SO504i</device_id>
+      <device_name>SO504i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
       <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <device>
-      <device_id>D253iWM</device_id>
-      <device_name>MusicPORTER(D253iWM)</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>220</width>
+      <device_id>P504i</device_id>
+      <device_name>P504i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
       <heigh>144</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>220</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>144</wp_heigh>
       <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>P253iS</device_id>
-      <device_name>Lechiffon(P253iS)</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
+      <device_id>P504iS</device_id>
+      <device_name>P504iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
       <width>132</width>
       <heigh>144</heigh>
       <gif>true</gif>
       <emoji_type></emoji_type>
 
       <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_heigh>144</wp_heigh>
       <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>D506i</device_id>
-      <device_name>D506i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <device_id>SH251i</device_id>
+      <device_name>SH251i</device_name>
+      <html_spec_type>CHTML_3_0</html_spec_type>
+      <width>120</width>
+      <heigh>130</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>F506i</device_id>
-      <device_name>F506i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>268</heigh>
+      <device_id>SH251iS</device_id>
+      <device_name>SH251iS</device_name>
+      <html_spec_type>CHTML_3_0</html_spec_type>
+      <width>176</width>
+      <heigh>187</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>268</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>176</wp_width>
+      <wp_heigh>220</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>N506i</device_id>
-      <device_name>N506i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>295</heigh>
+      <device_id>D251i</device_id>
+      <device_name>D251i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>P506iC</device_id>
-      <device_name>P506iC</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>266</heigh>
-      <gif>true</gif>
+      <device_id>D251iS</device_id>
+      <device_name>D251iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>F251i</device_id>
+      <device_name>F251i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>140</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>156</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>SH506iC</device_id>
-      <device_name>SH506iC</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>252</heigh>
+      <device_id>N251i</device_id>
+      <device_name>N251i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>140</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>159</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>SO506iC</device_id>
-      <device_name>SO506iC</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>256</heigh>
+      <device_id>N251iS</device_id>
+      <device_name>N251iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>140</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>158</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>N506iS</device_id>
-      <device_name>N506iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>295</heigh>
+      <device_id>P251iS</device_id>
+      <device_name>P251iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>N506iS2</device_id>
-      <device_name>N506iSII</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>295</heigh>
+      <device_id>F671iS</device_id>
+      <device_name>F671iS</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>160</width>
+      <heigh>120</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>160</wp_width>
+      <wp_heigh>120</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>SO506i</device_id>
-      <device_name>premini-II SO506i</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>256</heigh>
+      <device_id>SO212i</device_id>
+      <device_name>SO212i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>128</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>F212i</device_id>
+      <device_name>F212i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>136</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>156</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <device>
+      <device_id>F661i</device_id>
+      <device_name>F661i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>132</width>
+      <heigh>136</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
 
-    <!-- Sale 2005.5 mova premini-IIS(SO506iS) -->
+      <wp_width>132</wp_width>
+      <wp_heigh>156</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
     <device>
-      <device_id>SO506iS</device_id>
-      <device_name>premini-IIS SO506iS</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>256</heigh>
+      <device_id>F672i</device_id>
+      <device_name>F672i</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>160</width>
+      <heigh>120</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>false</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>160</wp_width>
+      <wp_heigh>120</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SO213i</device_id>
+      <device_name>premini (SO213i)</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>128</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>10000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <device>
+      <device_id>SO213iS</device_id>
+      <device_name>premini-S (SO213iS)</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
 
-    <!-- Sale in 2006.3 N506iSII -->
-    <!--
-      DoCoMo/1.0/N506iS2/c20/TB/W20H11
-      DoCoMo/1.0/N506iS2/c20/TB/W16H09
-      DoCoMo/1.0/N506iS2/c20/TB/W30H15
-    -->
+      <wp_width>128</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
     <device>
-      <device_id>N506iS2</device_id>
-      <device_name>N506iSII</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>295</heigh>
+      <device_id>N2701</device_id>
+      <device_name>N2701</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>176</width>
+      <heigh>198</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <emoji_type></emoji_type>
+
+      <wp_width>176</wp_width>
+      <wp_heigh>198</wp_heigh>
+      <cache>100000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!-- Sale in 2005.10 RADIDEN(SO213iWR) -->
+    <device>
+      <device_id>SO213iWR</device_id>
+      <device_name>SO213iWR</device_name>
+      <html_spec_type>CHTML_4_0</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
-      <png>false</png>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <emoji_type></emoji_type>
+
+      <wp_width>128</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+  </user_agent>
+
+
+
+  <user_agent pattern="^DoCoMo/1.0/([^   /]+)/c[0-9][0-9]/TB/W[0-9][0-9]H[0-9][0-9]$$">
+    <device>
+      <device_id>P213i</device_id>
+      <device_name>prosolid(P213i)</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D505i</device_id>
+      <device_name>D505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D505iS</device_id>
+      <device_name>D505iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SO505i</device_id>
+      <device_name>SO505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>256</width>
+      <heigh>240</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>256</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SO505iS</device_id>
+      <device_name>SO505iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>256</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SH505i</device_id>
+      <device_name>SH505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>252</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SH505iS</device_id>
+      <device_name>SH505iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>252</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N505i</device_id>
+      <device_name>N505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>270</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N505iS</device_id>
+      <device_name>N505iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>270</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>F505i</device_id>
+      <device_name>F505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>268</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>268</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>F505iGPS</device_id>
+      <device_name>F505iGPS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>268</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>268</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P505i</device_id>
+      <device_name>P505i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>266</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P505iS</device_id>
+      <device_name>P505iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>266</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D252i</device_id>
+      <device_name>D252i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>176</width>
+      <heigh>198</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>176</wp_width>
+      <wp_heigh>240</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SH252i</device_id>
+      <device_name>SH252i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>252</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P252i</device_id>
+      <device_name>P252i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N252i</device_id>
+      <device_name>N252i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>140</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>158</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P252iS</device_id>
+      <device_name>P252iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D253i</device_id>
+      <device_name>D253i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>176</width>
+      <heigh>198</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>176</wp_width>
+      <wp_heigh>240</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N253i</device_id>
+      <device_name>N253i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>160</width>
+      <heigh>180</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>160</wp_width>
+      <wp_heigh>198</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P253i</device_id>
+      <device_name>P253i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D253iWM</device_id>
+      <device_name>MusicPORTER(D253iWM)</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>220</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>220</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P253iS</device_id>
+      <device_name>Lechiffon(P253iS)</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>10000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>D506i</device_id>
+      <device_name>D506i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>F506i</device_id>
+      <device_name>F506i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>268</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>268</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N506i</device_id>
+      <device_name>N506i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>295</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>P506iC</device_id>
+      <device_name>P506iC</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>266</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SH506iC</device_id>
+      <device_name>SH506iC</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>252</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SO506iC</device_id>
+      <device_name>SO506iC</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>256</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N506iS</device_id>
+      <device_name>N506iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>295</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>N506iS2</device_id>
+      <device_name>N506iSII</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>295</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>SO506i</device_id>
+      <device_name>premini-II SO506i</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>256</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!-- Sale 2005.5 mova premini-IIS(SO506iS) -->
+    <device>
+      <device_id>SO506iS</device_id>
+      <device_name>premini-IIS SO506iS</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>256</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!-- Sale in 2006.3 N506iSII -->
+    <!--
+      DoCoMo/1.0/N506iS2/c20/TB/W20H11
+      DoCoMo/1.0/N506iS2/c20/TB/W16H09
+      DoCoMo/1.0/N506iS2/c20/TB/W30H15
+    -->
+    <device>
+      <device_id>N506iS2</device_id>
+      <device_name>N506iSII</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>295</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!-- Sale in 2006.4 P506iCII -->
+    <!--
+      DoCoMo/1.0/P506iC/c20/TB/W20H10
+      DoCoMo/1.0/P506iC/c20/TB/W30H14
+    -->
+    <device>
+      <device_id>P506iCII</device_id>
+      <device_name>P506iCII</device_name>
+      <html_spec_type>CHTML_5_0</html_spec_type>
+      <width>240</width>
+      <heigh>266</heigh>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>false</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>20000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+  </user_agent>
+
+  <!--=======================================================================-->
+  <!-- Softbank/Vodafone/J-Phone                                             -->
+  <!--=======================================================================-->
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)$">
+    <!-- C2 -->
+    <device>
+      <device_id>J-SH02</device_id>
+      <device_name>J-SH02</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>89</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>84</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-DN02</device_id>
+      <device_name>J-DN02</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>116</width>
+      <heigh>122</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>4</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>94</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-P02</device_id>
+      <device_name>J-P02</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>89</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>4</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>78</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SA02</device_id>
+      <device_name>J-SA02</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>76</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>80</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH03</device_id>
+      <device_name>J-SH03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>84</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-T04</device_id>
+      <device_name>J-T04</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>90</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>90</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-P03</device_id>
+      <device_name>J-P03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>95</heigh>
+      <gif>false</gif>
+      <jpeg>false</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>95</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <!-- C3 -->
+    <device>
+      <device_id>J-K03</device_id>
+      <device_name>J-K03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>110</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-K03S</device_id>
+      <device_name>J-K03S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>110</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-D03</device_id>
+      <device_name>J-D03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-D03S</device_id>
+      <device_name>J-D03S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-PE03</device_id>
+      <device_name>J-PE03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>96</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-PE03S</device_id>
+      <device_name>J-PE03S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>96</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH04</device_id>
+      <device_name>J-SH04</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH04S</device_id>
+      <device_name>J-SH04S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH04B</device_id>
+      <device_name>J-SH04B</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH04BS</device_id>
+      <device_name>J-SH04BS</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH05</device_id>
+      <device_name>J-SH05</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH05S</device_id>
+      <device_name>J-SH05S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-N03</device_id>
+      <device_name>J-N03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>126</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-N03S</device_id>
+      <device_name>J-N03S</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>126</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-T05</device_id>
+      <device_name>J-T05</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-K04</device_id>
+      <device_name>J-K04</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>110</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-D04</device_id>
+      <device_name>J-D04</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-PE03II</device_id>
+      <device_name>J-PE03II</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>96</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SH06</device_id>
+      <device_name>J-SH06</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>96</width>
+      <heigh>104</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SA03</device_id>
+      <device_name>J-SA03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>126</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-DN03</device_id>
+      <device_name>J-DN03</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>130</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-NM01</device_id>
+      <device_name>J-NM01</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>126</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-N03II</device_id>
+      <device_name>J-N03II</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>126</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-D31</device_id>
+      <device_name>J-D31</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>117</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>117</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SA04</device_id>
+      <device_name>J-SA04</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>130</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>120</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-K05</device_id>
+      <device_name>J-K05</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>110</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>256</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-NM02</device_id>
+      <device_name>J-NM02</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>130</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SA05</device_id>
+      <device_name>J-SA05</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>120</width>
+      <heigh>112</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>120</wp_width>
+      <wp_heigh>112</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-T07</device_id>
+      <device_name>J-T07</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>144</width>
+      <heigh>136</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-T09</device_id>
+      <device_name>J-T09</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>144</width>
+      <heigh>144</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>J-SA06</device_id>
+      <device_name>J-SA06</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>132</width>
+      <heigh>144</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>65536</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>V301T</device_id>
+      <device_name>V301T</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>222</width>
+      <heigh>261</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+    <device>
+      <device_id>V301D</device_id>
+      <device_name>V301D</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>132</width>
+      <heigh>136</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <color>262144</color>
+      <emoji_type></emoji_type>
+
+      <wp_width>132</wp_width>
+      <wp_heigh>153</wp_heigh>
+      <cache>6000</cache>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
+    </device>
+    <device>
+      <device_id>V302T</device_id>
+      <device_name>V302T</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>144</width>
+      <heigh>140</heigh>
+      <gif>false</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!-- Sale in 2006.4 P506iCII -->
-    <!--
-      DoCoMo/1.0/P506iC/c20/TB/W20H10
-      DoCoMo/1.0/P506iC/c20/TB/W30H14
-    -->
     <device>
-      <device_id>P506iCII</device_id>
-      <device_name>P506iCII</device_name>
-      <html_spec_type>CHTML_5_0</html_spec_type>
-      <width>240</width>
-      <heigh>266</heigh>
-      <gif>true</gif>
+      <device_id>KOTO</device_id>
+      <device_name>KOTO</device_name>
+      <html_spec_type>JHTML</html_spec_type>
+      <width>222</width>
+      <heigh>320</heigh>
+      <gif>false</gif>
       <jpeg>true</jpeg>
-      <png>false</png>
+      <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>20000</cache>
+      <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-  </user_agent>
-
-  <!--=======================================================================-->
-  <!-- Softbank/Vodafone/J-Phone                                             -->
-  <!--=======================================================================-->
-  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)$">
-    <!-- C2 -->
     <device>
-      <device_id>J-SH02</device_id>
-      <device_name>J-SH02</device_name>
+      <device_id>V303T</device_id>
+      <device_name>V303T</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>89</heigh>
+      <width>222</width>
+      <heigh>320</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>84</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- C4 -->
     <device>
-      <device_id>J-DN02</device_id>
-      <device_name>J-DN02</device_name>
+      <device_id>J-SH07</device_id>
+      <device_name>J-SH07</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>116</width>
-      <heigh>122</heigh>
+      <width>120</width>
+      <heigh>117</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>94</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-P02</device_id>
-      <device_name>J-P02</device_name>
+      <device_id>J-T06</device_id>
+      <device_name>J-T06</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>89</heigh>
+      <width>120</width>
+      <heigh>126</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>78</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>143</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA02</device_id>
-      <device_name>J-SA02</device_name>
+      <device_id>J-D05</device_id>
+      <device_name>J-D05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>76</heigh>
+      <width>132</width>
+      <heigh>126</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>80</wp_heigh>
+      <wp_width>140</wp_width>
+      <wp_heigh>132</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH03</device_id>
-      <device_name>J-SH03</device_name>
+      <device_id>J-D06</device_id>
+      <device_name>J-D06</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>132</width>
+      <heigh>126</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>84</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>137</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T04</device_id>
-      <device_name>J-T04</device_name>
+      <device_id>J-N04</device_id>
+      <device_name>J-N04</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>90</heigh>
+      <width>120</width>
+      <heigh>126</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>90</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-P03</device_id>
-      <device_name>J-P03</device_name>
+      <device_id>J-N05</device_id>
+      <device_name>J-N05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>95</heigh>
+      <width>160</width>
+      <heigh>180</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>95</wp_heigh>
+      <wp_width>159</wp_width>
+      <wp_heigh>179</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- C3 -->
     <device>
-      <device_id>J-K03</device_id>
-      <device_name>J-K03</device_name>
+      <device_id>J-SH08</device_id>
+      <device_name>J-SH08</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>110</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-K03S</device_id>
-      <device_name>J-K03S</device_name>
+      <device_id>J-SH09</device_id>
+      <device_name>J-SH09</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>110</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D03</device_id>
-      <device_name>J-D03</device_name>
+      <device_id>J-T08</device_id>
+      <device_name>J-T08</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>222</width>
+      <heigh>261</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D03S</device_id>
-      <device_name>J-D03S</device_name>
+      <device_id>J-SH10</device_id>
+      <device_name>J-SH010</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>240</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>J-PE03</device_id>
-      <device_name>J-PE03</device_name>
+    <device>
+      <device_id>J-D08</device_id>
+      <device_name>J-D08</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>96</heigh>
+      <width>132</width>
+      <heigh>136</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>136</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-PE03S</device_id>
-      <device_name>J-PE03S</device_name>
+      <device_id>J-T10</device_id>
+      <device_name>J-T010</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>96</heigh>
+      <width>222</width>
+      <heigh>261</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04</device_id>
-      <device_name>J-SH04</device_name>
+      <device_id>V401SH</device_id>
+      <device_name>V401SH</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>222</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+  </user_agent>
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)_.+$">
+    <!-- C2 -->
     <device>
-      <device_id>J-SH04S</device_id>
-      <device_name>J-SH04S</device_name>
+      <device_id>J-SH02</device_id>
+      <device_name>J-SH02</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>96</width>
-      <heigh>104</heigh>
+      <heigh>89</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
       <emoji_type></emoji_type>
 
       <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_heigh>84</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04B</device_id>
-      <device_name>J-SH04B</device_name>
+      <device_id>J-DN02</device_id>
+      <device_name>J-DN02</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>116</width>
+      <heigh>122</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>94</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04BS</device_id>
-      <device_name>J-SH04BS</device_name>
+      <device_id>J-P02</device_id>
+      <device_name>J-P02</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>96</width>
-      <heigh>104</heigh>
+      <heigh>89</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4</color>
       <emoji_type></emoji_type>
 
       <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_heigh>78</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH05</device_id>
-      <device_name>J-SH05</device_name>
+      <device_id>J-SA02</device_id>
+      <device_name>J-SA02</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>96</width>
+      <heigh>76</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>80</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH05S</device_id>
-      <device_name>J-SH05S</device_name>
+      <device_id>J-SH03</device_id>
+      <device_name>J-SH03</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>84</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N03</device_id>
-      <device_name>J-N03</device_name>
+      <device_id>J-T04</device_id>
+      <device_name>J-T04</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>96</width>
+      <heigh>90</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
       <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>90</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N03S</device_id>
-      <device_name>J-N03S</device_name>
+      <device_id>J-P03</device_id>
+      <device_name>J-P03</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>96</width>
+      <heigh>95</heigh>
       <gif>false</gif>
-      <jpeg>true</jpeg>
+      <jpeg>false</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
       <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>95</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T05</device_id>
-      <device_name>J-T05</device_name>
+      <device_id>J-SA04</device_id>
+      <device_name>J-SA04</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>112</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
+      <wp_heigh>120</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
+    <!-- C3 -->
     <device>
-      <device_id>J-K04</device_id>
-      <device_name>J-K04</device_name>
+      <device_id>J-K03</device_id>
+      <device_name>J-K03</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
       <heigh>110</heigh>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D04</device_id>
-      <device_name>J-D04</device_name>
+      <device_id>J-K03S</device_id>
+      <device_name>J-K03S</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>117</heigh>
+      <heigh>110</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_heigh>110</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-PE03II</device_id>
-      <device_name>J-PE03II</device_name>
+      <device_id>J-D03</device_id>
+      <device_name>J-D03</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>96</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
-    </device>
-    <device>
-      <device_id>J-SH06</device_id>
-      <device_name>J-SH06</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
-      <gif>false</gif>
-      <jpeg>true</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>65536</color>
-      <emoji_type></emoji_type>
-
-      <wp_width>96</wp_width>
       <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA03</device_id>
-      <device_name>J-SA03</device_name>
+      <device_id>J-D03S</device_id>
+      <device_name>J-D03S</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>126</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-DN03</device_id>
-      <device_name>J-DN03</device_name>
+      <device_id>J-PE03</device_id>
+      <device_name>J-PE03</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>130</heigh>
+      <heigh>96</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-NM01</device_id>
-      <device_name>J-NM01</device_name>
+      <device_id>J-PE03S</device_id>
+      <device_name>J-PE03S</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>126</heigh>
+      <heigh>96</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N03II</device_id>
-      <device_name>J-N03II</device_name>
+      <device_id>J-SH04</device_id>
+      <device_name>J-SH04</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D31</device_id>
-      <device_name>J-D31</device_name>
+      <device_id>J-SH04S</device_id>
+      <device_name>J-SH04S</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>117</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA04</device_id>
-      <device_name>J-SA04</device_name>
+      <device_id>J-SH04B</device_id>
+      <device_name>J-SH04B</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>120</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-K05</device_id>
-      <device_name>J-K05</device_name>
+      <device_id>J-SH04BS</device_id>
+      <device_name>J-SH04BS</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>110</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-NM02</device_id>
-      <device_name>J-NM02</device_name>
+      <device_id>J-SH05</device_id>
+      <device_name>J-SH05</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>130</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA05</device_id>
-      <device_name>J-SA05</device_name>
+      <device_id>J-SH05S</device_id>
+      <device_name>J-SH05S</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>112</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>112</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T07</device_id>
-      <device_name>J-T07</device_name>
+      <device_id>J-N03</device_id>
+      <device_name>J-N03</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>136</heigh>
+      <width>120</width>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T09</device_id>
-      <device_name>J-T09</device_name>
+      <device_id>J-N03S</device_id>
+      <device_name>J-N03S</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>144</heigh>
+      <width>120</width>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA06</device_id>
-      <device_name>J-SA06</device_name>
+      <device_id>J-T05</device_id>
+      <device_name>J-T05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
+      <width>120</width>
+      <heigh>112</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>V301T</device_id>
-      <device_name>V301T</device_name>
+      <device_id>J-K04</device_id>
+      <device_name>J-K04</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>261</heigh>
+      <width>120</width>
+      <heigh>110</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>V301D</device_id>
-      <device_name>V301D</device_name>
+      <device_id>J-D04</device_id>
+      <device_name>J-D04</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
+      <width>120</width>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>153</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>V302T</device_id>
-      <device_name>V302T</device_name>
+      <device_id>J-PE03II</device_id>
+      <device_name>J-PE03II</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>140</heigh>
+      <width>120</width>
+      <heigh>96</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>KOTO</device_id>
-      <device_name>KOTO</device_name>
+      <device_id>J-SH06</device_id>
+      <device_name>J-SH06</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>320</heigh>
+      <width>96</width>
+      <heigh>104</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>96</wp_width>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>V303T</device_id>
-      <device_name>V303T</device_name>
+      <device_id>J-SA03</device_id>
+      <device_name>J-SA03</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>320</heigh>
+      <width>120</width>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>128</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
-
-    <!-- C4 -->
     <device>
-      <device_id>J-SH07</device_id>
-      <device_name>J-SH07</device_name>
+      <device_id>J-DN03</device_id>
+      <device_name>J-DN03</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>117</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_heigh>130</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T06</device_id>
-      <device_name>J-T06</device_name>
+      <device_id>J-NM01</device_id>
+      <device_name>J-NM01</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
       <heigh>126</heigh>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>143</wp_heigh>
+      <wp_heigh>128</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D05</device_id>
-      <device_name>J-D05</device_name>
+      <device_id>J-N03II</device_id>
+      <device_name>J-N03II</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>126</heigh>
+      <width>118</width>
+      <heigh>124</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>140</wp_width>
-      <wp_heigh>132</wp_heigh>
+      <wp_width>118</wp_width>
+      <wp_heigh>124</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D06</device_id>
-      <device_name>J-D06</device_name>
+      <device_id>J-D31</device_id>
+      <device_name>J-D31</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>126</heigh>
+      <width>120</width>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>137</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>117</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N04</device_id>
-      <device_name>J-N04</device_name>
+      <device_id>J-SA04</device_id>
+      <device_name>J-SA04</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>126</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_heigh>120</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N05</device_id>
-      <device_name>J-N05</device_name>
+      <device_id>J-K05</device_id>
+      <device_name>J-K05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
+      <width>120</width>
+      <heigh>110</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>256</color>
       <emoji_type></emoji_type>
 
-      <wp_width>159</wp_width>
-      <wp_heigh>179</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>110</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH08</device_id>
-      <device_name>J-SH08</device_name>
+      <device_id>J-NM02</device_id>
+      <device_name>J-NM02</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>117</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_heigh>128</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH09</device_id>
-      <device_name>J-SH09</device_name>
+      <device_id>J-SA05</device_id>
+      <device_name>J-SA05</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>130</heigh>
+      <heigh>112</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_heigh>112</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
+      <dpi_width>72</dpi_width>
+      <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T08</device_id>
-      <device_name>J-T08</device_name>
+      <device_id>J-T07</device_id>
+      <device_name>J-T07</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>261</heigh>
+      <width>144</width>
+      <heigh>136</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
       <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH10</device_id>
-      <device_name>J-SH010</device_name>
+      <device_id>J-T09</device_id>
+      <device_name>J-T09</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>240</width>
-      <heigh>260</heigh>
+      <width>144</width>
+      <heigh>144</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
       <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D08</device_id>
-      <device_name>J-D08</device_name>
+      <device_id>J-SA06</device_id>
+      <device_name>J-SA06</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>132</width>
-      <heigh>136</heigh>
+      <heigh>144</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>132</wp_width>
-      <wp_heigh>136</wp_heigh>
+      <wp_heigh>176</wp_heigh>
       <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T10</device_id>
-      <device_name>J-T010</device_name>
+      <device_id>V301T</device_id>
+      <device_name>V301T</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>222</width>
       <heigh>261</heigh>
       <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>V401SH</device_id>
-      <device_name>V401SH</device_name>
+      <device_id>V301D</device_id>
+      <device_name>V301D</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>260</heigh>
+      <width>132</width>
+      <heigh>136</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>153</wp_heigh>
       <cache>6000</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-  </user_agent>
-  <user_agent pattern="^J-PHONE/[^/ ]+/([^/_]+)_.+$">
-    <!-- C2 -->
-    <device>
-      <device_id>J-SH02</device_id>
-      <device_name>J-SH02</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>89</heigh>
-      <gif>false</gif>
-      <jpeg>false</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>256</color>
-      <emoji_type></emoji_type>
-
-      <wp_width>96</wp_width>
-      <wp_heigh>84</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
-    </device>
-    <device>
-      <device_id>J-DN02</device_id>
-      <device_name>J-DN02</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>116</width>
-      <heigh>122</heigh>
-      <gif>false</gif>
-      <jpeg>false</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>4</color>
-      <emoji_type></emoji_type>
-
-      <wp_width>120</wp_width>
-      <wp_heigh>94</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
-    </device>
-    <device>
-      <device_id>J-P02</device_id>
-      <device_name>J-P02</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>89</heigh>
-      <gif>false</gif>
-      <jpeg>false</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>4</color>
-      <emoji_type></emoji_type>
-
-      <wp_width>96</wp_width>
-      <wp_heigh>78</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
-    </device>
     <device>
-      <device_id>J-SA02</device_id>
-      <device_name>J-SA02</device_name>
+      <device_id>V302T</device_id>
+      <device_name>V301T</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>76</heigh>
+      <width>144</width>
+      <heigh>140</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>80</wp_heigh>
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH03</device_id>
-      <device_name>J-SH03</device_name>
+      <device_id>KOTO</device_id>
+      <device_name>KOTO</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>222</width>
+      <heigh>320</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>84</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T04</device_id>
-      <device_name>J-T04</device_name>
+      <device_id>V303T</device_id>
+      <device_name>V303T</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>90</heigh>
+      <width>222</width>
+      <heigh>320</heigh>
       <gif>false</gif>
-      <jpeg>false</jpeg>
+      <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>90</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>J-P03</device_id>
-      <device_name>J-P03</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>95</heigh>
-      <gif>false</gif>
-      <jpeg>false</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>256</color>
-      <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>95</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
-    </device>
+    <!-- C4 -->
     <device>
-      <device_id>J-SA04</device_id>
-      <device_name>J-SA04</device_name>
+      <device_id>J-SH07</device_id>
+      <device_name>J-SH07</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>130</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>120</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
-    <!-- C3 -->
     <device>
-      <device_id>J-K03</device_id>
-      <device_name>J-K03</device_name>
+      <device_id>J-T06</device_id>
+      <device_name>J-T06</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>110</heigh>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
+      <wp_heigh>143</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-K03S</device_id>
-      <device_name>J-K03S</device_name>
+      <device_id>J-D05</device_id>
+      <device_name>J-D05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>110</heigh>
+      <width>132</width>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
-
-      <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
+
+      <wp_width>140</wp_width>
+      <wp_heigh>132</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D03</device_id>
-      <device_name>J-D03</device_name>
+      <device_id>J-D06</device_id>
+      <device_name>J-D06</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>132</width>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>137</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D03S</device_id>
-      <device_name>J-D03S</device_name>
+      <device_id>J-N04</device_id>
+      <device_name>J-N04</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>117</heigh>
+      <heigh>126</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_heigh>126</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-PE03</device_id>
-      <device_name>J-PE03</device_name>
+      <device_id>J-N05</device_id>
+      <device_name>J-N05</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>96</heigh>
+      <width>160</width>
+      <heigh>180</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_width>159</wp_width>
+      <wp_heigh>179</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-PE03S</device_id>
-      <device_name>J-PE03S</device_name>
+      <device_id>J-SH08</device_id>
+      <device_name>J-SH08</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>96</heigh>
+      <heigh>117</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04</device_id>
-      <device_name>J-SH04</device_name>
+      <device_id>J-SH09</device_id>
+      <device_name>J-SH09</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>120</width>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>120</wp_width>
+      <wp_heigh>160</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04S</device_id>
-      <device_name>J-SH04S</device_name>
+      <device_id>J-T08</device_id>
+      <device_name>J-T08</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>222</width>
+      <heigh>261</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04B</device_id>
-      <device_name>J-SH04B</device_name>
+      <device_id>J-SH10</device_id>
+      <device_name>J-SH010</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>240</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH04BS</device_id>
-      <device_name>J-SH04BS</device_name>
+      <device_id>J-D08</device_id>
+      <device_name>J-D08</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>132</width>
+      <heigh>136</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
+      <wp_width>132</wp_width>
+      <wp_heigh>136</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH05</device_id>
-      <device_name>J-SH05</device_name>
+      <device_id>J-T10</device_id>
+      <device_name>J-T010</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>222</width>
+      <heigh>261</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH05S</device_id>
-      <device_name>J-SH05S</device_name>
+      <device_id>V401SH</device_id>
+      <device_name>V401SH</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>222</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>6000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
+  </user_agent>
+
+
+  <user_agent pattern="^J-PHONE/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <!-- P4 -->
     <device>
-      <device_id>J-N03</device_id>
-      <device_name>J-N03</device_name>
+      <device_id>J-SH51</device_id>
+      <device_name>J-SH51</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>126</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
-      <cache>6000</cache>
+      <wp_heigh>130</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-N03S</device_id>
-      <device_name>J-N03S</device_name>
+      <device_id>J-K51</device_id>
+      <device_name>J-K51</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>128</width>
+      <heigh>128</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>4096</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>128</wp_width>
+      <wp_heigh>160</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-T05</device_id>
-      <device_name>J-T05</device_name>
+      <device_id>J-T51</device_id>
+      <device_name>J-T51</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
+      <width>144</width>
+      <heigh>144</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>144</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-K04</device_id>
-      <device_name>J-K04</device_name>
+      <device_id>J-P51</device_id>
+      <device_name>J-P51</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>110</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
-      <cache>6000</cache>
+      <wp_heigh>160</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-D04</device_id>
-      <device_name>J-D04</device_name>
+      <device_id>J-SA51</device_id>
+      <device_name>J-SA51</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <width>132</width>
+      <heigh>144</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>132</wp_width>
+      <wp_heigh>144</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-PE03II</device_id>
-      <device_name>J-PE03II</device_name>
+      <device_id>J-SH52</device_id>
+      <device_name>J-SH52</device_name>
       <html_spec_type>JHTML</html_spec_type>
       <width>120</width>
-      <heigh>96</heigh>
+      <heigh>130</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
-      <cache>6000</cache>
+      <wp_heigh>160</wp_heigh>
+      <cache>12000</cache>
       <dpi_width>72</dpi_width>
       <dpi_heigh>72</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SH06</device_id>
-      <device_name>J-SH06</device_name>
+      <device_id>J-N51</device_id>
+      <device_name>J-N51</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>96</width>
-      <heigh>104</heigh>
+      <width>160</width>
+      <heigh>180</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>96</wp_width>
-      <wp_heigh>130</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>160</wp_width>
+      <wp_heigh>180</wp_heigh>
+      <cache>12000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA03</device_id>
-      <device_name>J-SA03</device_name>
+      <device_id>V601N</device_id>
+      <device_name>V601N</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>160</width>
+      <heigh>180</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>160</wp_width>
+      <wp_heigh>180</wp_heigh>
+      <cache>12000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- P5 -->
     <device>
-      <device_id>J-DN03</device_id>
-      <device_name>J-DN03</device_name>
+      <device_id>J-SH53</device_id>
+      <device_name>J-SH53</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
+      <width>240</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>12000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-NM01</device_id>
-      <device_name>J-NM01</device_name>
+      <device_id>V601SH</device_id>
+      <device_name>V601SH</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
+      <width>240</width>
+      <heigh>260</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>12000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- W -->
     <device>
-      <device_id>J-N03II</device_id>
-      <device_name>J-N03II</device_name>
+      <device_id>V801SA</device_id>
+      <device_name>V801SA</device_name>
       <html_spec_type>JHTML</html_spec_type>
-      <width>118</width>
-      <heigh>124</heigh>
+      <width>240</width>
+      <heigh>256</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>118</wp_width>
-      <wp_heigh>124</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>200000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+  </user_agent>
+  <user_agent pattern="^Vodafone/[^/ ]+/([^/ _]+?)[/ _].+?$">
     <device>
-      <device_id>J-D31</device_id>
-      <device_name>J-D31</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
+      <device_id>V702NK</device_id>
+      <device_name>V702NK</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>208</width>
+      <heigh>176</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>117</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>208</wp_width>
+      <wp_heigh>176</wp_heigh>
+      <cache>300000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>J-SA04</device_id>
-      <device_name>J-SA04</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
+      <device_id>V802SE</device_id>
+      <device_name>V802SE</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>120</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>176</wp_width>
+      <wp_heigh>208</wp_heigh>
+      <cache>200000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
     <device>
-      <device_id>J-K05</device_id>
-      <device_name>J-K05</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>110</heigh>
+      <device_id>V802SH</device_id>
+      <device_name>V802SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>256</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>110</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>200000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
     <device>
-      <device_id>J-NM02</device_id>
-      <device_name>J-NM02</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
+      <device_id>V802N</device_id>
+      <device_name>V802N</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>128</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>200000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2005.8 902SH-->
+    <!-- 
+      Vodafone/1.0/V902SH/SHJ002[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-SA05</device_id>
-      <device_name>J-SA05</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>112</heigh>
-      <gif>false</gif>
+      <device_id>V902SH</device_id>
+      <device_name>902SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>112</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2005.8 902T -->
+    <!-- 
+      Vodafone/1.0/V902T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-T07</device_id>
-      <device_name>J-T07</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>136</heigh>
-      <gif>false</gif>
+      <device_id>V902T</device_id>
+      <device_name>902T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>261</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2005.8 703SH -->
+    <!-- 
+      Vodafone/1.0/V703SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-T09</device_id>
-      <device_name>J-T09</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>144</heigh>
-      <gif>false</gif>
+      <device_id>V703SH</device_id>
+      <device_name>703SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <device>
-      <device_id>J-SA06</device_id>
-      <device_name>J-SA06</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
-      <gif>false</gif>
+    <!-- Sale in 2005.9 802SH -->
+    <!-- 
+      Vodafone/1.0/V802SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
+    <device>
+      <device_id>V802SH</device_id>
+      <device_name>802SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2005.9 703SHf -->
+    <!-- 
+      Vodafone/1.0/V703SHf/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>V301T</device_id>
-      <device_name>V301T</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>261</heigh>
-      <gif>false</gif>
+      <device_id>V703SHf</device_id>
+      <device_name>703SHf</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2005.9 703N -->
+    <!-- 
+      Vodafone/1.0/V703N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1.307 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>V301D</device_id>
-      <device_name>V301D</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
-      <gif>false</gif>
+      <device_id>V703N</device_id>
+      <device_name>703N</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>269</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>153</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2005.10 903T -->
+    <!-- 
+      Vodafone/1.0/V903T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>V302T</device_id>
-      <device_name>V301T</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>140</heigh>
-      <gif>false</gif>
+      <device_id>V903T</device_id>
+      <device_name>903T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>261</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.2 903SH -->
+    <!-- 
+      Vodafone/1.0/V903SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>KOTO</device_id>
-      <device_name>KOTO</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>320</heigh>
-      <gif>false</gif>
+      <device_id>V903SH</device_id>
+      <device_name>903SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.3 702NKII -->
+    <!-- 
+      Vodafone/1.0/V702NK2/NKJ001[/Serial] Series60/2.6 Nokia6680/4.04.28 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V303T</device_id>
-      <device_name>V303T</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>320</heigh>
-      <gif>false</gif>
+      <device_id>V702NK2</device_id>
+      <device_name>702NKII</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>173</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>174</wp_width>
+      <wp_heigh>143</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- C4 -->
+    <!-- Sale in 2006.3 904T -->
+    <!-- 
+      Vodafone/1.0/V904T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-SH07</device_id>
-      <device_name>J-SH07</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
-      <gif>false</gif>
+      <device_id>V904T</device_id>
+      <device_name>904T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>261</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.5 803T -->
+    <!-- 
+      Vodafone/1.0/V803T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-T06</device_id>
-      <device_name>J-T06</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
-      <gif>false</gif>
+      <device_id>V803T</device_id>
+      <device_name>803T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>261</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>143</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.8 702NK -->
+    <!-- 
+      Vodafone/1.0/V702NK/NKJ001[/Serial] Series60/2.6 Nokia6630/2.39.148 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-D05</device_id>
-      <device_name>J-D05</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>126</heigh>
-      <gif>false</gif>
+      <device_id>V702NK</device_id>
+      <device_name>702NK</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>173</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>140</wp_width>
-      <wp_heigh>132</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>176</wp_width>
+      <wp_heigh>208</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V804SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.3.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-D06</device_id>
-      <device_name>J-D06</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>126</heigh>
-      <gif>false</gif>
+      <device_id>V804SH</device_id>
+      <device_name>804SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>137</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V804SS/SSJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-N04</device_id>
-      <device_name>J-N04</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>126</heigh>
-      <gif>false</gif>
+      <device_id>V804SS</device_id>
+      <device_name>804SS</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>126</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V904SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-N05</device_id>
-      <device_name>J-N05</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
-      <gif>false</gif>
+      <device_id>V904SH</device_id>
+      <device_name>904SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>480</width>
+      <heigh>540</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>159</wp_width>
-      <wp_heigh>179</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>640</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V905SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-SH08</device_id>
-      <device_name>J-SH08</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>117</heigh>
-      <gif>false</gif>
+      <device_id>V905SH</device_id>
+      <device_name>905SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>350</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V804N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-SH09</device_id>
-      <device_name>J-SH09</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
-      <gif>false</gif>
+      <device_id>V804N</device_id>
+      <device_name>804N</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>6000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V705SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-T08</device_id>
-      <device_name>J-T08</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>261</heigh>
-      <gif>false</gif>
+      <device_id>V705SH</device_id>
+      <device_name>705SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V705T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-SH10</device_id>
-      <device_name>J-SH010</device_name>
-      <html_spec_type>JHTML</html_spec_type>
+      <device_id>V705T</device_id>
+      <device_name>705T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
       <width>240</width>
-      <heigh>260</heigh>
-      <gif>false</gif>
+      <heigh>261</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!--
+      Vodafone/1.0/V804NK/NKJ001[/Serial] Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-D08</device_id>
-      <device_name>J-D08</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>136</heigh>
-      <gif>false</gif>
+      <device_id>V804NK</device_id>
+      <device_name>804NK</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>240</width>
+      <heigh>276</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>136</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+  </user_agent>
+  <user_agent pattern="^MOT-([^/ ]+?)/.+?$">
     <device>
-      <device_id>J-T10</device_id>
-      <device_name>J-T010</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>261</heigh>
+      <device_id>C980</device_id>
+      <device_name>702sMO</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <cache>300000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
     <device>
-      <device_id>V401SH</device_id>
-      <device_name>V401SH</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>222</width>
-      <heigh>260</heigh>
+      <device_id>V980</device_id>
+      <device_name>702MO</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>176</width>
+      <heigh>220</heigh>
       <gif>false</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>6000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>176</wp_width>
+      <wp_heigh>220</wp_heigh>
+      <cache>300000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
   </user_agent>
 
-
-  <user_agent pattern="^J-PHONE/[^/ ]+/([^/ _]+?)[/ _].+?$">
-    <!-- P4 -->
+  <user_agent pattern="^SoftBank/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <!-- Sale in 2006.10 706P -->
+    <!-- 
+      SoftBank/1.0/706P/PJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-SH51</device_id>
-      <device_name>J-SH51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
-      <gif>false</gif>
+      <device_id>706P</device_id>
+      <device_name>SoftBank 706P</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>236</width>
+      <heigh>258</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>130</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2006.11 910SH -->
+    <!-- 
+      SoftBank/1.0/910SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-K51</device_id>
-      <device_name>J-K51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>128</width>
-      <heigh>128</heigh>
-      <gif>false</gif>
+      <device_id>910SH</device_id>
+      <device_name>SoftBank 910SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>468</width>
+      <heigh>540</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>4096</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>128</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>640</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.11 911SH -->
+    <!-- 
+      SoftBank/1.0/911SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-T51</device_id>
-      <device_name>J-T51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>144</width>
-      <heigh>144</heigh>
-      <gif>false</gif>
+      <device_id>911SH</device_id>
+      <device_name>SoftBank 911SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>234</width>
+      <heigh>350</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>144</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2006.12 706N -->
+    <!-- 
+      SoftBank/1.0/706N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-P51</device_id>
-      <device_name>J-P51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
-      <gif>false</gif>
+      <device_id>706N</device_id>
+      <device_name>SoftBank 706N</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>233</width>
+      <heigh>269</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2006.12 705N -->
+    <!-- 
+      SoftBank/1.0/705N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    -->
     <device>
-      <device_id>J-SA51</device_id>
-      <device_name>J-SA51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>132</width>
-      <heigh>144</heigh>
-      <gif>false</gif>
+      <device_id>705N</device_id>
+      <device_name>SoftBank 705N</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>233</width>
+      <heigh>269</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>65536</color>
       <emoji_type></emoji_type>
 
-      <wp_width>132</wp_width>
-      <wp_heigh>144</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2007.1 708SC -->
+    <!-- 
+      SoftBank/1.0/708SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-SH52</device_id>
-      <device_name>J-SH52</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>120</width>
-      <heigh>130</heigh>
-      <gif>false</gif>
+      <device_id>708SC</device_id>
+      <device_name>SoftBank 708SC</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>310</width>
+      <heigh>186</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>120</wp_width>
-      <wp_heigh>160</wp_heigh>
-      <cache>12000</cache>
-      <dpi_width>72</dpi_width>
-      <dpi_heigh>72</dpi_heigh>
+      <wp_width>320</wp_width>
+      <wp_heigh>240</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2007.4 810P -->
+    <!-- 
+      SoftBank/1.0/810P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-N51</device_id>
-      <device_name>J-N51</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
-      <gif>false</gif>
+      <device_id>810P</device_id>
+      <device_name>SoftBank 810P</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>236</width>
+      <heigh>258</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
 
-      <wp_width>160</wp_width>
-      <wp_heigh>180</wp_heigh>
-      <cache>12000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2007.4 812SH -->
+    <!-- 
+      SoftBank/1.0/812SH/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V601N</device_id>
-      <device_name>V601N</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>160</width>
-      <heigh>180</heigh>
-      <gif>false</gif>
+      <device_id>812SH</device_id>
+      <device_name>SoftBank 812SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>234</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>160</wp_width>
-      <wp_heigh>180</wp_heigh>
-      <cache>12000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- P5 -->
+    <!-- Sale in 2007.4 813SH -->
+    <!-- 
+      SoftBank/1.0/813SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>J-SH53</device_id>
-      <device_name>J-SH53</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>240</width>
-      <heigh>260</heigh>
-      <gif>false</gif>
+      <device_id>813SH</device_id>
+      <device_name>SoftBank 813SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>234</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>12000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- Sale in 2007.4 813SH for Biz -->
+    <!-- 
+      SoftBank/1.0/813SHe/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V601SH</device_id>
-      <device_name>V601SH</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>240</width>
-      <heigh>260</heigh>
-      <gif>false</gif>
+      <device_id>813SHe</device_id>
+      <device_name>SoftBank 813SH for Biz</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>234</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>12000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- W -->
+    <!-- Sale in 2007.4 912SH -->
+    <!-- 
+      SoftBank/1.0/912SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V801SA</device_id>
-      <device_name>V801SA</device_name>
-      <html_spec_type>JHTML</html_spec_type>
-      <width>240</width>
-      <heigh>256</heigh>
-      <gif>false</gif>
+      <device_id>912SH</device_id>
+      <device_name>SoftBank 912SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>468</width>
+      <heigh>700</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
-      <cache>200000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-  </user_agent>
-  <user_agent pattern="^Vodafone/[^/ ]+/([^/ _]+?)[/ _].+?$">
+    <!-- Sale in 2007.4 911T -->
+    <!-- 
+      SoftBank/1.0/911T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V702NK</device_id>
-      <device_name>V702NK</device_name>
+      <device_id>911T</device_id>
+      <device_name>SoftBank 911T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>208</width>
-      <heigh>176</heigh>
-      <gif>false</gif>
+      <width>234</width>
+      <heigh>339</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>208</wp_width>
-      <wp_heigh>176</wp_heigh>
-      <cache>300000</cache>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+    <!-- Sale in 2007.5 812SHs -->
+    <!-- 
+      SoftBank/1.0/812SHs/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V802SE</device_id>
-      <device_name>V802SE</device_name>
-      <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>220</heigh>
-      <gif>false</gif>
+      <device_id>812Hs</device_id>
+      <device_name>SoftBank 812SHs</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>234</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>176</wp_width>
-      <wp_heigh>208</wp_heigh>
-      <cache>200000</cache>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+    <!-- Sale in 2007.5 816SH -->
+    <!-- 
+       SoftBank/1.0/816SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V802SH</device_id>
-      <device_name>V802SH</device_name>
+      <device_id>816SH</device_id>
+      <device_name>SoftBank 816SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>220</heigh>
-      <gif>false</gif>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>200000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+    <!-- Sale in 2007.5 815SH -->
+    <!-- 
+      SoftBank/1.0/815SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
     <device>
-      <device_id>V802N</device_id>
-      <device_name>V802N</device_name>
+      <device_id>815SH</device_id>
+      <device_name>SoftBank 815SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>220</heigh>
-      <gif>false</gif>
+      <width>240</width>
+      <heigh>270</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>200000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2005.8 902SH-->
+    <!-- Sale in 2007.5 814SH -->
     <!-- 
-      Vodafone/1.0/V902SH/SHJ002[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/814SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V902SH</device_id>
-      <device_name>902SH</device_name>
+      <device_id>814SH</device_id>
+      <device_name>SoftBank 814SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>468</width>
+      <heigh>540</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>640</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2005.8 902T -->
+
+    <!-- Sale in 2007.5 912T -->
     <!-- 
-      Vodafone/1.0/V902T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/912T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V902T</device_id>
-      <device_name>902T</device_name>
+      <device_id>912T</device_id>
+      <device_name>SoftBank 912T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>261</heigh>
+      <width>234</width>
+      <heigh>339</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2005.8 703SH -->
+    <!-- Sale in 2007.5 815T -->
     <!-- 
-      Vodafone/1.0/V703SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/815T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V703SH</device_id>
-      <device_name>703SH</device_name>
+      <device_id>815T</device_id>
+      <device_name>SoftBank 815T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2005.9 802SH -->
+    <!-- Sale in 2007.5 814T -->
     <!-- 
-      Vodafone/1.0/V802SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/814T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V802SH</device_id>
-      <device_name>802SH</device_name>
+      <device_id>814T</device_id>
+      <device_name>SoftBank 814T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2005.9 703SHf -->
+
+    <!-- Sale in 2007.6 805SC -->
     <!-- 
-      Vodafone/1.0/V703SHf/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/805SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V703SHf</device_id>
-      <device_name>703SHf</device_name>
+      <device_id>805SC</device_id>
+      <device_name>SoftBank 805SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
+      <width>230</width>
       <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2005.9 703N -->
+
+    <!-- Sale in 2007.8 913SH/913SHG -->
     <!-- 
-      Vodafone/1.0/V703N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1.307 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/913SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V703N</device_id>
-      <device_name>703N</device_name>
+      <device_id>913SH</device_id>
+      <device_name>SoftBank 913SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>269</heigh>
+      <width>234</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2005.10 903T -->
+    <!-- Sale in 2007.9 820SH -->
     <!-- 
-      Vodafone/1.0/V903T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/820SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V903T</device_id>
-      <device_name>903T</device_name>
+      <device_id>820SH</device_id>
+      <device_name>SoftBank 820SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>261</heigh>
+      <width>234</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2006.2 903SH -->
+    <!-- Sale in 2007.9 821SH -->
     <!-- 
-      Vodafone/1.0/V903SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/821SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V903SH</device_id>
-      <device_name>903SH</device_name>
+      <device_id>821SH</device_id>
+      <device_name>SoftBank 821SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>234</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2006.3 702NKII -->
+    <!-- Sale in 2007.9 820P -->
     <!-- 
-      Vodafone/1.0/V702NK2/NKJ001[/Serial] Series60/2.6 Nokia6680/4.04.28 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/820P/PJP10[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V702NK2</device_id>
-      <device_name>702NKII</device_name>
+      <device_id>820P</device_id>
+      <device_name>SoftBank 820P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>173</heigh>
+      <width>234</width>
+      <heigh>342</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
 
-      <wp_width>174</wp_width>
-      <wp_heigh>143</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2006.3 904T -->
+    <!-- Sale in 2007.9 920SH -->
     <!-- 
-      Vodafone/1.0/V904T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/920SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V904T</device_id>
-      <device_name>904T</device_name>
+      <device_id>920SH</device_id>
+      <device_name>SoftBank 920SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>261</heigh>
+      <width>468</width>
+      <heigh>700</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2006.5 803T -->
+    <!-- Sale in 2007.10 821P -->
     <!-- 
-      Vodafone/1.0/V803T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/821P/PJP10[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V803T</device_id>
-      <device_name>803T</device_name>
+      <device_id>821P</device_id>
+      <device_name>SoftBank 821P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>240</width>
-      <heigh>261</heigh>
+      <heigh>342</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2006.8 702NK -->
+    <!-- Sale in 2007.12 705P/705Px -->
     <!-- 
-      Vodafone/1.0/V702NK/NKJ001[/Serial] Series60/2.6 Nokia6630/2.39.148 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/705P/PJP10[/Serial] Browser/Teleca-Browser/3.1 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V702NK</device_id>
-      <device_name>702NK</device_name>
+      <device_id>705P</device_id>
+      <device_name>SoftBank 705P/705Px</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>173</heigh>
+      <width>236</width>
+      <heigh>258</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
 
-      <wp_width>176</wp_width>
-      <wp_heigh>208</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V804SH/SHJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.3.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/910T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>V804SH</device_id>
-      <device_name>804SH</device_name>
+      <device_id>910T</device_id>
+      <device_name>SoftBank 910T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V804SS/SSJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/810SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V804SS</device_id>
-      <device_name>804SS</device_name>
+      <device_id>810SH</device_id>
+      <device_name>SoftBank 810SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>264</heigh>
+      <width>468</width>
+      <heigh>540</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>640</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V904SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/811SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V904SH</device_id>
-      <device_name>904SH</device_name>
+      <device_id>811SH</device_id>
+      <device_name>SoftBank 811SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>480</width>
+      <width>468</width>
       <heigh>540</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V905SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/705SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V905SH</device_id>
-      <device_name>905SH</device_name>
+      <device_id>705SC</device_id>
+      <device_name>SoftBank 705SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>350</heigh>
+      <width>230</width>
+      <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V804N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/706SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V804N</device_id>
-      <device_name>804N</device_name>
+      <device_id>706SC</device_id>
+      <device_name>SoftBank 706SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <width>230</width>
+      <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V705SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      SoftBank/1.0/810T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>V705SH</device_id>
-      <device_name>705SH</device_name>
+      <device_id>810T</device_id>
+      <device_name>SoftBank 810T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
     <!--
-      Vodafone/1.0/V705T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      SoftBank/1.0/811T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>V705T</device_id>
-      <device_name>705T</device_name>
+      <device_id>811T</device_id>
+      <device_name>SoftBank 811T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>261</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
     </device>
 
     <!--
-      Vodafone/1.0/V804NK/NKJ001[/Serial] Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>V804NK</device_id>
-      <device_name>804NK</device_name>
+      <device_id>707SC</device_id>
+      <device_name>SoftBank 707SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>276</heigh>
+      <width>230</width>
+      <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-  </user_agent>
-  <user_agent pattern="^MOT-([^/ ]+?)/.+?$">
+    <!--
+    -->
     <device>
-      <device_id>C980</device_id>
-      <device_name>702sMO</device_name>
+      <device_id>709SC</device_id>
+      <device_name>SoftBank 709SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>220</heigh>
-      <gif>false</gif>
+      <width>230</width>
+      <heigh>264</heigh>
+      <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
-      <cache>300000</cache>
-      <dpi_width>96</dpi_width>
-      <dpi_heigh>96</dpi_heigh>
-    </device>
-    <device>
-      <device_id>V980</device_id>
-      <device_name>702MO</device_name>
-      <html_spec_type>JXHTML</html_spec_type>
-      <width>176</width>
-      <heigh>220</heigh>
-      <gif>false</gif>
-      <jpeg>true</jpeg>
-      <png>true</png>
-      <bmp2>false</bmp2>
-      <bmp4>false</bmp4>
-      <color>65536</color>
-      <emoji_type></emoji_type>
-
-      <wp_width>176</wp_width>
-      <wp_heigh>220</wp_heigh>
-      <cache>300000</cache>
+      <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-  </user_agent>
-
-  <user_agent pattern="^SoftBank/[^/ ]+/([^/ _]+?)[/ _].+?$">
-    <!-- Sale in 2006.10 706P -->
-    <!-- 
-      SoftBank/1.0/706P/PJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      SoftBank/1.0/705NK/NKJ001[/Serial] Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>706P</device_id>
-      <device_name>SoftBank 706P</device_name>
+      <device_id>705NK</device_id>
+      <device_name>SoftBank 705NK</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>236</width>
-      <heigh>258</heigh>
+      <width>240</width>
+      <heigh>267</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2006.11 910SH -->
-    <!-- 
-      SoftBank/1.0/910SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      SoftBank/1.0/812T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>910SH</device_id>
-      <device_name>SoftBank 910SH</device_name>
+      <device_id>812T</device_id>
+      <device_name>SoftBank 812T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>540</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>480</wp_width>
-      <wp_heigh>640</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!-- Sale in 2006.11 911SH -->
-    <!-- 
-      SoftBank/1.0/911SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      SoftBank/1.0/706P/PJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>911SH</device_id>
-      <device_name>SoftBank 911SH</device_name>
+      <device_id>706P</device_id>
+      <device_name>SoftBank 706P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>350</heigh>
+      <width>236</width>
+      <heigh>258</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!-- Sale in 2006.12 706N -->
-    <!-- 
-      SoftBank/1.0/706N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+    <!--
+      SoftBank/1.0/813T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>706N</device_id>
-      <device_name>SoftBank 706N</device_name>
+      <device_id>813T</device_id>
+      <device_name>SoftBank 813T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>233</width>
-      <heigh>269</heigh>
+      <width>234</width>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2006.12 705N -->
+
     <!-- 
-      SoftBank/1.0/705N/NJ001[/Serial] Browser/UP.Browser/7.0.2.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
     -->
     <device>
-      <device_id>705N</device_id>
-      <device_name>SoftBank 705N</device_name>
+      <device_id>822SH</device_id>
+      <device_name>SoftBank 822SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>233</width>
-      <heigh>269</heigh>
+      <width>234</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>65536</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.1 708SC -->
     <!-- 
-      SoftBank/1.0/708SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>708SC</device_id>
-      <device_name>SoftBank 708SC</device_name>
+      <device_id>920T</device_id>
+      <device_name>SoftBank 920T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>310</width>
-      <heigh>186</heigh>
+      <width>234</width>
+      <heigh>339</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
 
-      <wp_width>320</wp_width>
-      <wp_heigh>240</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.4 810P -->
     <!-- 
-      SoftBank/1.0/810P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>810P</device_id>
-      <device_name>SoftBank 810P</device_name>
+      <device_id>920SC</device_id>
+      <device_name>SoftBank 920SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>236</width>
-      <heigh>258</heigh>
+      <width>230</width>
+      <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
 
       <wp_width>240</wp_width>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.4 812SH -->
+
     <!-- 
-      SoftBank/1.0/812SH/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>812SH</device_id>
-      <device_name>SoftBank 812SH</device_name>
+      <device_id>822P</device_id>
+      <device_name>SoftBank 822P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>270</heigh>
+      <width>240</width>
+      <heigh>262</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.4 813SH -->
     <!-- 
-      SoftBank/1.0/813SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>813SH</device_id>
-      <device_name>SoftBank 813SH</device_name>
+      <device_id>DM001SH</device_id>
+      <device_name>SoftBank DM001SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>234</width>
-      <heigh>270</heigh>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!-- Sale in 2007.4 813SH for Biz -->
     <!-- 
-      SoftBank/1.0/813SHe/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>813SHe</device_id>
-      <device_name>SoftBank 813SH for Biz</device_name>
+      <device_id>820T</device_id>
+      <device_name>SoftBank 820T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>270</heigh>
+      <width>240</width>
+      <heigh>320</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.4 912SH -->
     <!-- 
-      SoftBank/1.0/912SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>912SH</device_id>
-      <device_name>SoftBank 912SH</device_name>
-      <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>700</heigh>
+      <device_id>820SC</device_id>
+      <device_name>SoftBank 820SC</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <width>230</width>
+      <heigh>264</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>480</wp_width>
-      <wp_heigh>800</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.4 911T -->
+
     <!-- 
-      SoftBank/1.0/911T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>911T</device_id>
-      <device_name>SoftBank 911T</device_name>
+      <device_id>920P</device_id>
+      <device_name>SoftBank 920P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>339</heigh>
+      <width>471</width>
+      <heigh>700</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>480</wp_width>
-      <wp_heigh>800</wp_heigh>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.5 812SHs -->
+
     <!-- 
-      SoftBank/1.0/812SHs/SHJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>812Hs</device_id>
-      <device_name>SoftBank 812SHs</device_name>
+      <device_id>822T</device_id>
+      <device_name>SoftBank 822T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>234</width>
-      <heigh>270</heigh>
+      <heigh>259</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.5 816SH -->
     <!-- 
-       SoftBank/1.0/816SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>816SH</device_id>
-      <device_name>SoftBank 816SH</device_name>
+      <device_id>921SH</device_id>
+      <device_name>SoftBank 921SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <width>468</width>
+      <heigh>754</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.5 815SH -->
     <!-- 
-      SoftBank/1.0/815SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>815SH</device_id>
-      <device_name>SoftBank 815SH</device_name>
+      <device_id>823SH</device_id>
+      <device_name>SoftBank 823SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <width>234</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.5 814SH -->
     <!-- 
-      SoftBank/1.0/814SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>814SH</device_id>
-      <device_name>SoftBank 814SH</device_name>
+      <device_id>821T</device_id>
+      <device_name>SoftBank 821T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>540</heigh>
+      <width>234</width>
+      <heigh>243</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>480</wp_width>
-      <wp_heigh>640</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.5 912T -->
     <!-- 
-      SoftBank/1.0/912T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>912T</device_id>
-      <device_name>SoftBank 912T</device_name>
+      <device_id>921T</device_id>
+      <device_name>SoftBank 921T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>234</width>
       <heigh>339</heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.5 815T -->
+
     <!-- 
-      SoftBank/1.0/815T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>815T</device_id>
-      <device_name>SoftBank 815T</device_name>
+      <device_id>922SH</device_id>
+      <device_name>SoftBank 922SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <width>842</width>
+      <heigh>384</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>854</wp_width>
+      <wp_heigh>480</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!-- Sale in 2007.5 814T -->
-    <!-- 
-      SoftBank/1.0/814T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+
+    <!--
+      SoftBank/1.0/920SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    //-->
     <device>
-      <device_id>814T</device_id>
-      <device_name>SoftBank 814T</device_name>
+      <device_id>920SH</device_id>
+      <device_name>SoftBank 920SH YK</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <width>468</width>
+      <heigh>454</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.6 805SC -->
-    <!-- 
-      SoftBank/1.0/805SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      SoftBank/1.0/821SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>805SC</device_id>
-      <device_name>SoftBank 805SC</device_name>
+      <device_id>821SC</device_id>
+      <device_name>SoftBank 821SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <width>234</width>
+      <heigh>267</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.8 913SH/913SHG -->
-    <!-- 
-      SoftBank/1.0/913SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      SoftBank/1.0/DM002SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>913SH</device_id>
-      <device_name>SoftBank 913SH</device_name>
+      <device_id>DM002SH</device_id>
+      <device_name>SoftBank DM002SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>234</width>
       <heigh>350</heigh>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.9 820SH -->
-    <!-- 
-      SoftBank/1.0/820SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      823P
+      SoftBank/1.0/823P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>820SH</device_id>
-      <device_name>SoftBank 820SH</device_name>
+      <device_id>823P</device_id>
+      <device_name>SoftBank 823P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <width>234</width>
-      <heigh>350</heigh>
+      <heigh>355</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.9 821SH -->
-    <!-- 
-      SoftBank/1.0/821SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      825SH
+      SoftBank/1.0/825SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>821SH</device_id>
-      <device_name>SoftBank 821SH</device_name>
+      <device_id>825SH</device_id>
+      <device_name>SoftBank 825SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
+      <width>240</width>
       <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.9 820P -->
-    <!-- 
-      SoftBank/1.0/820P/PJP10[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      821N
+      SoftBank/1.0/821N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>820P</device_id>
-      <device_name>SoftBank 820P</device_name>
+      <device_id>821N</device_id>
+      <device_name>SoftBank 821N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>342</heigh>
+      <width>240</width>
+      <heigh>325</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>242</wp_width>
+      <wp_heigh>431</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.9 920SH -->
-    <!-- 
-      SoftBank/1.0/920SH/SHJ001[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      820N
+      SoftBank/1.0/820N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>920SH</device_id>
-      <device_name>SoftBank 920SH</device_name>
+      <device_id>820N</device_id>
+      <device_name>SoftBank 820N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>700</heigh>
+      <width>240</width>
+      <heigh>325</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-
-      <wp_width>480</wp_width>
-      <wp_heigh>854</wp_heigh>
+      <wp_width>242</wp_width>
+      <wp_heigh>431</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.10 821P -->
-    <!-- 
-      SoftBank/1.0/821P/PJP10[ /Serial ] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      923SH
+      SoftBank/1.0/923SH/SHJ001 Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>821P</device_id>
-      <device_name>SoftBank 821P</device_name>
+      <device_id>923SH</device_id>
+      <device_name>SoftBank 923SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>342</heigh>
+      <width>480</width>
+      <heigh>754</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <color>16777216</color>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!-- Sale in 2007.12 705P/705Px -->
-    <!-- 
-      SoftBank/1.0/705P/PJP10[/Serial] Browser/Teleca-Browser/3.1 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    <!--
+      824SH
+      SoftBank/1.0/824SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>705P</device_id>
-      <device_name>SoftBank 705P/705Px</device_name>
+      <device_id>824SH</device_id>
+      <device_name>SoftBank 824SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>236</width>
-      <heigh>258</heigh>
+      <width>240</width>
+      <heigh>350</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/910T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      824P
+      SoftBank/1.0/824P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>910T</device_id>
-      <device_name>SoftBank 910T</device_name>
+      <device_id>824P</device_id>
+      <device_name>SoftBank 824P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <width>232</width>
+      <heigh>352</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <color>262144</color>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/810SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      921P
+      SoftBank/1.0/921P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>810SH</device_id>
-      <device_name>SoftBank 810SH</device_name>
+      <device_id>921P</device_id>
+      <device_name>SoftBank 921P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>540</heigh>
+      <width>471</width>
+      <heigh>700</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
-      <wp_heigh>640</wp_heigh>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/811SH/SHJ001[/Serial] Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      823T
+      SoftBank/1.0/823T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>811SH</device_id>
-      <device_name>SoftBank 811SH</device_name>
+      <device_id>823T</device_id>
+      <device_name>SoftBank 823T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>540</heigh>
+      <width>235</width>
+      <heigh>341</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp4>false</bmp4>
       <color>262144</color>
       <emoji_type></emoji_type>
-      <wp_width>480</wp_width>
-      <wp_heigh>640</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/705SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      824T
+      SoftBank/1.0/824T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>705SC</device_id>
-      <device_name>SoftBank 705SC</device_name>
+      <device_id>824T</device_id>
+      <device_name>SoftBank 824T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <width>235</width>
+      <heigh>341</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/706SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      830SH
+      SoftBank/1.0/830SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>706SC</device_id>
-      <device_name>SoftBank 706SC</device_name>
+      <device_id>830SH</device_id>
+      <device_name>SoftBank 830SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <width>240</width>
+      <heigh>270</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/810T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      830SHs
+      SoftBank/1.0/830SHs/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>810T</device_id>
-      <device_name>SoftBank 810T</device_name>
+      <device_id>830SHs</device_id>
+      <device_name>SoftBank 830SHs</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <width>240</width>
+      <heigh>270</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/811T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      830P
+      SoftBank/1.0/830P/PJP10[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>811T</device_id>
-      <device_name>SoftBank 811T</device_name>
+      <device_id>830P</device_id>
+      <device_name>SoftBank 830P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <width>240</width>
+      <heigh>375</heigh>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <color>262144</color>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
     <!--
+      930SH
+      SoftBank/1.0/930SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>707SC</device_id>
-      <device_name>SoftBank 707SC</device_name>
+      <device_id>930SH</device_id>
+      <device_name>SoftBank 930SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <color>16777216</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
     <!--
+      830CA
+      SoftBank/1.0/830CA/CAJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>709SC</device_id>
-      <device_name>SoftBank 709SC</device_name>
+      <device_id>830CA</device_id>
+      <device_name>SoftBank 830CA</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+
     <!--
-      SoftBank/1.0/705NK/NKJ001[/Serial] Profile/MIDP-2.0 Configuration/CLDC-1.1
+      931SH
+      SoftBank/1.0/931SH/SHJ001[/serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>705NK</device_id>
-      <device_name>SoftBank 705NK</device_name>
+      <device_id>931SH</device_id>
+      <device_name>SoftBank 931SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>267</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>824</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>1024</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+
     <!--
-      SoftBank/1.0/812T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      930SC
+      SoftBank/1.0/930SC/SCJ001[/serial] Browser/NetFront/3.4
     -->
     <device>
-      <device_id>812T</device_id>
-      <device_name>SoftBank 812T</device_name>
+      <device_id>930SC</device_id>
+      <device_name>SoftBank 930SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>470</width>
+      <heigh>512</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+
     <!--
-      SoftBank/1.0/706P/PJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+      DM003SH
+      SoftBank/1.0/DM003SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>706P</device_id>
-      <device_name>SoftBank 706P</device_name>
+      <device_id>DM003SH</device_id>
+      <device_name>SoftBank DM003SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>236</width>
-      <heigh>258</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
     <!--
-      SoftBank/1.0/813T/TJ001[/Serial] Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0
+      830T
+      SoftBank/1.0/830T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>813T</device_id>
-      <device_name>SoftBank 813T</device_name>
+      <device_id>830T</device_id>
+      <device_name>SoftBank 830T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>235</width>
+      <heigh>341</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+
+
     <!--
+      831T
+      SoftBank/1.0/831T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>822SH</device_id>
-      <device_name>SoftBank 822SH</device_name>
+      <device_id>831T</device_id>
+      <device_name>SoftBank 831T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>235</width>
+      <heigh>341</heigh>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
       <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+
     <!--
+      930P
+      SoftBank/1.0/930P/PJP10[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
     -->
     <device>
-      <device_id>920T</device_id>
-      <device_name>SoftBank 920T</device_name>
+      <device_id>930P</device_id>
+      <device_name>SoftBank 930P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>339</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>471</width>
+      <heigh>700</heigh>
       <emoji_type></emoji_type>
-
       <wp_width>480</wp_width>
-      <wp_heigh>800</wp_heigh>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
-    <!--
-    -->
+       <!-- OSAKANA TARO add start -->
+       <!--
+               831SH
+               SoftBank/1.0/831SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/831SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (831SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>920SC</device_id>
-      <device_name>SoftBank 920SC</device_name>
+      <device_id>831SH</device_id>
+      <device_name>SoftBank 831SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
-
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+       <!--
+               932SH
+               SoftBank/1.0/932SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/932SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/932SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/932SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (932SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
+    <device>
+      <device_id>932SH</device_id>
+      <device_name>SoftBank 932SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>480</width>
+      <heigh>754</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               830N
+               SoftBank/1.0/830N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/830N/NJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/830N/NJ001 Widgets/WGTClient/1.0 
+               SoftBank/1.0/830N/NJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (830N;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>822P</device_id>
-      <device_name>SoftBank 822P</device_name>
+      <device_id>830N</device_id>
+      <device_name>SoftBank 830N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>262</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>650</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!--
-    -->
-    <device>
-      <device_id>DM001SH</device_id>
-      <device_name>SoftBank DM001SH</device_name>
+       <!--
+               830SH for Biz
+               SoftBank/1.0/830SHe/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/830SHe/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/830SHe/SHJ001[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/5.0 (830SHe;SoftBank[;Serial]) NetFront/3.4 
+       -->
+       <device>
+      <device_id>830SHe</device_id>
+      <device_name>SoftBank 830SHe</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>270</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!--
-    -->
+       <!--
+               930CA
+               SoftBank/1.0/930CA/CAJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/930CA/CAJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/930CA/CAJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (930CA;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>820T</device_id>
-      <device_name>SoftBank 820T</device_name>
+      <device_id>930CA</device_id>
+      <device_name>SoftBank 930CA</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>320</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>700</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-    <!--
-    -->
+       <!--
+               831P
+               SoftBank/1.0/831P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/831P/PJP10[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/4.08 (831P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>820SC</device_id>
-      <device_name>SoftBank 820SC</device_name>
+      <device_id>831P</device_id>
+      <device_name>SoftBank 831P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>230</width>
-      <heigh>264</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               731SC
+               SoftBank/1.0/731SC/SCJ001[/Serial] Browser/NetFront/3.3 
+               × 
+               × 
+               × 
+               Mozilla/4.08 (731SC;SoftBank[;Serial]) NetFront/3.3 
+       -->
     <device>
-      <device_id>920P</device_id>
-      <device_name>SoftBank 920P</device_name>
+      <device_id>731SC</device_id>
+      <device_name>SoftBank 731SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>471</width>
-      <heigh>700</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>230</width>
+      <heigh>264</heigh>
       <emoji_type></emoji_type>
-      <wp_width>480</wp_width>
-      <wp_heigh>854</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               830SH Preminum
+               SoftBank/1.0/830SHp/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/830SHp/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/830SHp/SHJ001[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/5.0 (830SHp;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>822T</device_id>
-      <device_name>SoftBank 822T</device_name>
+      <device_id>830SHp</device_id>
+      <device_name>SoftBank 830SHp</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>259</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>270</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
-    <device>
-      <device_id>921SH</device_id>
-      <device_name>SoftBank 921SH</device_name>
+       <!--
+               831SH KT→831SHと同じ
+               SoftBank/1.0/831SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/831SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (831SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
+       <!--
+               831SHs
+               SoftBank/1.0/831SHs/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SHs/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831SHs/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/831SHs/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (831SHs;SoftBank[;Serial]) NetFront/3.5 
+       -->
+    <device>
+      <device_id>831SHs</device_id>
+      <device_name>SoftBank 831SHs</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>754</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
-      <wp_width>480</wp_width>
-      <wp_heigh>854</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               832P
+               SoftBank/1.0/832P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/832P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/832P/PJP10[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (832P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>823SH</device_id>
-      <device_name>SoftBank 823SH</device_name>
+      <device_id>832P</device_id>
+      <device_name>SoftBank 832P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>231</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               933SH
+               SoftBank/1.0/933SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/933SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/933SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/933SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (933SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>821T</device_id>
-      <device_name>SoftBank 821T</device_name>
+      <device_id>933SH</device_id>
+      <device_name>SoftBank 933SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>243</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>738</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               934SH
+               SoftBank/1.0/934SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/934SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/934SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/934SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (934SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>921T</device_id>
-      <device_name>SoftBank 921T</device_name>
+      <device_id>934SH</device_id>
+      <device_name>SoftBank 934SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>339</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
-
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-    -->
+       <!--
+               930N
+               SoftBank/1.0/930N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/930N/NJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/930N/NJ001 Widgets/WGTClient/1.0 
+               SoftBank/1.0/930N/NJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (930N;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>922SH</device_id>
-      <device_name>SoftBank 922SH</device_name>
+      <device_id>930N</device_id>
+      <device_name>SoftBank 930N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>842</width>
-      <heigh>384</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>650</heigh>
       <emoji_type></emoji_type>
-      <wp_width>854</wp_width>
-      <wp_heigh>480</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      SoftBank/1.0/920SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    //-->
+       <!--
+               931SC
+               SoftBank/1.0/931SC/SCJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/931SC/SCJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/931SC/SCJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/4.08 (931SC;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>920SH</device_id>
-      <device_name>SoftBank 920SH YK</device_name>
+      <device_id>931SC</device_id>
+      <device_name>SoftBank 931SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>468</width>
-      <heigh>454</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>471</width>
+      <heigh>512</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
-      <wp_heigh>854</wp_heigh>
+      <wp_heigh>800</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      SoftBank/1.0/821SC/SCJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               832T
+               SoftBank/1.0/832T/TJ001[/Serial] Browser/NetFront/3.3 
+               × 
+               × 
+               SoftBank/1.0/832T/TJ001[/Serial] Flash/Flash-Lite/2.0 
+               × 
+       -->
     <device>
-      <device_id>821SC</device_id>
-      <device_name>SoftBank 821SC</device_name>
+      <device_id>832T</device_id>
+      <device_name>SoftBank 832T</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>267</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>234</width>
+      <heigh>243</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
       <wp_heigh>320</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      SoftBank/1.0/DM002SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               931P
+               SoftBank/1.0/931P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/931P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/931P/PJP10 Widgets/Widgets/1.0 
+               SoftBank/1.0/931P/PJP10[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (931P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>DM002SH</device_id>
-      <device_name>SoftBank DM002SH</device_name>
+      <device_id>931P</device_id>
+      <device_name>SoftBank 931P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>471</width>
+      <heigh>700</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      823P
-      SoftBank/1.0/823P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               935SH
+               SoftBank/1.0/935SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/935SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/935SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/935SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (935SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>823P</device_id>
-      <device_name>SoftBank 823P</device_name>
+      <device_id>935SH</device_id>
+      <device_name>SoftBank 935SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>234</width>
-      <heigh>355</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>427</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      825SH
-      SoftBank/1.0/825SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               832SH
+               SoftBank/1.0/832SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/832SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/832SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/832SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (832SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>825SH</device_id>
-      <device_name>SoftBank 825SH</device_name>
+      <device_id>832SH</device_id>
+      <device_name>SoftBank 832SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
       <wp_heigh>400</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      821N
-      SoftBank/1.0/821N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               936SH
+               SoftBank/1.0/936SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/936SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/936SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/936SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (936SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>821N</device_id>
-      <device_name>SoftBank 821N</device_name>
+      <device_id>936SH</device_id>
+      <device_name>SoftBank 936SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>325</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
-      <wp_width>242</wp_width>
-      <wp_heigh>431</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      820N
-      SoftBank/1.0/820N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               830SC
+               SoftBank/1.0/830SC/SCJ001[/Serial] Browser/NetFront/3.3 
+               × 
+               × 
+               × 
+               Mozilla/4.08 (830SC;SoftBank[;Serial]) NetFront/3.3 
+       -->
     <device>
-      <device_id>820N</device_id>
-      <device_name>SoftBank 820N</device_name>
+      <device_id>830SC</device_id>
+      <device_name>SoftBank 830SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>325</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>232</width>
+      <heigh>264</heigh>
       <emoji_type></emoji_type>
-      <wp_width>242</wp_width>
-      <wp_heigh>431</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      923SH
-      SoftBank/1.0/923SH/SHJ001 Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               831N
+               SoftBank/1.0/831N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/831N/NJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/831N/NJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (831N;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>923SH</device_id>
-      <device_name>SoftBank 923SH</device_name>
+      <device_id>831N</device_id>
+      <device_name>SoftBank 831N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>480</width>
-      <heigh>754</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>16777216</color>
+      <width>240</width>
+      <heigh>325</heigh>
       <emoji_type></emoji_type>
-      <wp_width>480</wp_width>
-      <wp_heigh>854</wp_heigh>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      824SH
-      SoftBank/1.0/824SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               740SC
+               SoftBank/1.0/740SC/SCJ001[/Serial] Browser/NetFront/3.3 
+               × 
+               × 
+               × 
+               Mozilla/4.08 (740SC;SoftBank[;Serial]) NetFront/3.3 
+       -->
     <device>
-      <device_id>824SH</device_id>
-      <device_name>SoftBank 824SH</device_name>
+      <device_id>740SC</device_id>
+      <device_name>SoftBank 740SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>350</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>232</width>
+      <heigh>264</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>320</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      824P
-      SoftBank/1.0/824P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               832SHs
+               SoftBank/1.0/832SHs/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/832SHs/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/832SHs/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/832SHs/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (832SHs;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>824P</device_id>
-      <device_name>SoftBank 824P</device_name>
+      <device_id>832SHs</device_id>
+      <device_name>SoftBank 832SHs</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>232</width>
-      <heigh>352</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>427</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      921P
-      SoftBank/1.0/921P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               940SH
+               SoftBank/1.0/940SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/940SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (940SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>921P</device_id>
-      <device_name>SoftBank 921P</device_name>
+      <device_id>940SH</device_id>
+      <device_name>SoftBank 940SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>471</width>
-      <heigh>700</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>738</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
       <wp_heigh>854</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      823T
-      SoftBank/1.0/823T/TJ001[/Serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               931N
+               SoftBank/1.0/931N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/931N/NJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/931N/NJ001 Widgets/WGTClient/1.0 
+               SoftBank/1.0/931N/NJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (931N;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>823T</device_id>
-      <device_name>SoftBank 823T</device_name>
+      <device_id>931N</device_id>
+      <device_name>SoftBank 931N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>235</width>
-      <heigh>341</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>640</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      824T
-      SoftBank/1.0/824T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               S940SC
+               oftBank/1.0/940SC/SCJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940SC/SCJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940SC/SCJ001 Widgets/NetFront/1.0 
+               SoftBank/1.0/940SC/SCJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (940SC;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>824T</device_id>
-      <device_name>SoftBank 824T</device_name>
+      <device_id>940SC</device_id>
+      <device_name>SoftBank 940SC</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>235</width>
-      <heigh>341</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>512</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      830SH
-      SoftBank/1.0/830SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               941SH
+               SoftBank/1.0/941SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/941SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/941SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/941SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (941SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>830SH</device_id>
-      <device_name>SoftBank 830SH</device_name>
+      <device_id>941SH</device_id>
+      <device_name>SoftBank 941SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>824</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>1024</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      830SHs
-      SoftBank/1.0/830SHs/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               840P
+               SoftBank/1.0/840P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/840P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/840P/PJP10[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/4.08 (840P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>830SHs</device_id>
-      <device_name>SoftBank 830SHs</device_name>
+      <device_id>840P</device_id>
+      <device_name>SoftBank 840P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>270</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>236</width>
+      <heigh>369</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>320</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      830P
-      SoftBank/1.0/830P/PJP10[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               940N
+               SoftBank/1.0/940N/NJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940N/NJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940N/NJ001 Widgets/WGTClient/1.0 
+               SoftBank/1.0/940N/NJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (940N;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>830P</device_id>
-      <device_name>SoftBank 830P</device_name>
+      <device_id>940N</device_id>
+      <device_name>SoftBank 940N</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <width>240</width>
-      <heigh>375</heigh>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <color>262144</color>
+      <width>480</width>
+      <heigh>650</heigh>
       <emoji_type></emoji_type>
-      <wp_width>240</wp_width>
-      <wp_heigh>427</wp_heigh>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      930SH
-      SoftBank/1.0/930SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               940P
+               SoftBank/1.0/940P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/940P/PJP10 Widgets/Widgets/1.0 
+               SoftBank/1.0/940P/PJP10[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (940P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>930SH</device_id>
-      <device_name>SoftBank 930SH</device_name>
+      <device_id>940P</device_id>
+      <device_name>SoftBank 940P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
-      <color>16777216</color>
+      <color>262144</color>
       <gif>true</gif>
       <jpeg>true</jpeg>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>480</width>
-      <heigh>754</heigh>
+      <width>471</width>
+      <heigh>700</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
       <wp_heigh>854</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      830CA
-      SoftBank/1.0/830CA/CAJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               840SH
+               SoftBank/1.0/840SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/840SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/840SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (840SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>830CA</device_id>
-      <device_name>SoftBank 830CA</device_name>
+      <device_id>840SH</device_id>
+      <device_name>SoftBank 840SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>427</wp_heigh>
+      <wp_heigh>400</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-
-    <!--
-      931SH
-      SoftBank/1.0/931SH/SHJ001[/serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               941P
+               SoftBank/1.0/941P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/941P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/941P/PJP10 Widgets/Widgets/1.0 
+               SoftBank/1.0/941P/PJP10[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/4.08 (941P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>931SH</device_id>
-      <device_name>SoftBank 931SH</device_name>
+      <device_id>941P</device_id>
+      <device_name>SoftBank 941P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>480</width>
-      <heigh>824</heigh>
+      <width>471</width>
+      <heigh>700</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
-      <wp_heigh>1024</wp_heigh>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-
-    <!--
-      930SC
-      SoftBank/1.0/930SC/SCJ001[/serial] Browser/NetFront/3.4
-    -->
+       <!--
+               942SH
+               SoftBank/1.0/942SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/942SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/942SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/942SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (942SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>930SC</device_id>
-      <device_name>SoftBank 930SC</device_name>
+      <device_id>942SH</device_id>
+      <device_name>SoftBank 942SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>470</width>
-      <heigh>512</heigh>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
-      <wp_heigh>800</wp_heigh>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-
-    <!--
-      DM003SH
-      SoftBank/1.0/DM003SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               840P for Biz
+               SoftBank/1.0/840Pe/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/840Pe/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/840Pe/PJP10[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/4.08 (840Pe;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>DM003SH</device_id>
-      <device_name>SoftBank DM003SH</device_name>
+      <device_id>840Pe</device_id>
+      <device_name>SoftBank 840Pe</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>240</width>
-      <heigh>350</heigh>
+      <width>236</width>
+      <heigh>369</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>427</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-    <!--
-      830T
-      SoftBank/1.0/830T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               841P
+               SoftBank/1.0/841P/PJP10[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/841P/PJP10[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               × 
+               SoftBank/1.0/841P/PJP10[/Serial] Flash/Flash-Lite/2.0 
+               Mozilla/4.08 (841P;SoftBank[;Serial]) NetFront/3.4 
+       -->
     <device>
-      <device_id>830T</device_id>
-      <device_name>SoftBank 830T</device_name>
+      <device_id>841P</device_id>
+      <device_name>SoftBank 941P</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>235</width>
-      <heigh>341</heigh>
+      <width>236</width>
+      <heigh>369</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
-      <wp_heigh>400</wp_heigh>
+      <wp_heigh>427</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+       <!--
+               943SH
+               SoftBank/1.0/943SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/943SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/943SH/SHJ001 Widgets/Widgets/2.0 
+               SoftBank/1.0/943SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (943SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
+    <device>
+      <device_id>943SH</device_id>
+      <device_name>SoftBank 943SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>480</width>
+      <heigh>754</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
       <cache>307200</cache>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+       <!--
+               942SH KT → 942SHと同じ
+               SoftBank/1.0/942SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/942SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/942SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/942SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (942SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
 
-
-    <!--
-      831T
-      SoftBank/1.0/831T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!-- Disney Mobile -->
+       <!--
+               SoftBank/1.0/DM004SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/DM004SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/DM004SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/DM004SH/SHJ001[/Serial] Flash/Flash-Lite/3.0 
+               Mozilla/5.0 (DM004SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>831T</device_id>
-      <device_name>SoftBank 831T</device_name>
+      <device_id>DM004SH</device_id>
+      <device_name>SoftBank DM004SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>235</width>
-      <heigh>341</heigh>
+      <width>240</width>
+      <heigh>350</heigh>
       <emoji_type></emoji_type>
       <wp_width>240</wp_width>
       <wp_heigh>400</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
-
-
-    <!--
-      930P
-      SoftBank/1.0/930P/PJP10[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
-    -->
+       <!--
+               SoftBank/1.0/DM005SH/SHJ001[/Serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/DM005SH/SHJ001[/Serial] Java/Java/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 
+               SoftBank/1.0/DM005SH/SHJ001 Widgets/Widgets/1.0 
+               SoftBank/1.0/DM005SH/SHJ001[/Serial] Flash/Flash-Lite/3.1 
+               Mozilla/5.0 (DM005SH;SoftBank[;Serial]) NetFront/3.5 
+       -->
     <device>
-      <device_id>930P</device_id>
-      <device_name>SoftBank 930P</device_name>
+      <device_id>DM005SH</device_id>
+      <device_name>SoftBank DM005SH</device_name>
       <html_spec_type>JXHTML</html_spec_type>
       <color>262144</color>
       <gif>true</gif>
       <png>true</png>
       <bmp2>false</bmp2>
       <bmp4>false</bmp4>
-      <width>471</width>
-      <heigh>700</heigh>
+      <width>480</width>
+      <heigh>754</heigh>
       <emoji_type></emoji_type>
       <wp_width>480</wp_width>
       <wp_heigh>854</wp_heigh>
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+       <!-- OSAKANA TARO add end -->
 
     <!--
     -->
index 77e6adf..5869793 100644 (file)
 #define PACKAGE_NAME "mod_chxj"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_chxj 0.13.0-rc"
+#define PACKAGE_STRING "mod_chxj 0.13.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "mod_chxj"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.13.0-rc"
+#define PACKAGE_VERSION "0.13.0"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.13.0-rc"
+#define VERSION "0.13.0"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
index 389fbb8..4f09601 100644 (file)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -89,7 +89,7 @@ libmod_chxj_la_OBJECTS = $(am_libmod_chxj_la_OBJECTS)
 libmod_chxj_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmod_chxj_la_CFLAGS) \
        $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
 DDEFS = @DDEFS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -155,6 +156,7 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OPENSSL_PATH = @OPENSSL_PATH@
 PACKAGE = @PACKAGE@
@@ -168,6 +170,7 @@ PCRE_1_CONFIG = @PCRE_1_CONFIG@
 PCRE_CONFIG = @PCRE_CONFIG@
 QDEFS = @QDEFS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -320,8 +323,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
            f=$(am__strip_dir) \
-           echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-           $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+           echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+           $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
          else :; fi; \
        done
 
@@ -329,8 +332,8 @@ uninstall-libLTLIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
          p=$(am__strip_dir) \
-         echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-         $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
        done
 
 clean-libLTLIBRARIES:
@@ -751,8 +754,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        mkid -fID $$unique
 tags: TAGS
 
@@ -764,8 +767,8 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
          test -n "$$unique" || unique=$$empty_fix; \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -775,13 +778,12 @@ ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
                $(TAGS_FILES) $(LISP)
        tags=; \
-       here=`pwd`; \
        list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
        unique=`for i in $$list; do \
            if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
          done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
        test -z "$(CTAGS_ARGS)$$tags$$unique" \
          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
             $$tags $$unique
index be418c1..2f9a1c8 100644 (file)
@@ -1619,6 +1619,14 @@ s_send_cache_file(device_table *spec, query_string_param_t *query_string, reques
   DBG(r, "REQ[%X] offset:[%ld]", TO_ADDR(r), query_string->offset);
   DBG(r, "REQ[%X] count:[%ld]",  TO_ADDR(r), query_string->count);
 
+  /* for mod_cache */
+  {
+    apr_table_setn(r->headers_out, "Vary", "User-Agent");
+    apr_table_setn(r->err_headers_out, "Vary", "User-Agent");
+    ap_update_mtime(r, st.mtime);
+    ap_set_last_modified(r);
+  }
+
   if (query_string->mode != IMG_CONV_MODE_EZGET && query_string->name == NULL) {
     contentLength = apr_psprintf(r->pool, "%d", (int)st.size);
     apr_table_setn(r->headers_out, "Content-Length", (const char*)contentLength);
@@ -1751,6 +1759,14 @@ s_send_original_file(request_rec *r, const char *originalfile)
   if (rv != APR_SUCCESS)
     return HTTP_NOT_FOUND;
 
+  /* for mod_cache */
+  {
+    apr_table_setn(r->headers_out, "Vary", "User-Agent");
+    apr_table_setn(r->err_headers_out, "Vary", "User-Agent");
+    ap_update_mtime(r, st.mtime);
+    ap_set_last_modified(r);
+  }
+
   rv = apr_file_open(&fout, originalfile, 
     APR_READ | APR_BINARY, APR_OS_DEFAULT, r->pool);
   if (rv != APR_SUCCESS) {
index b560345..3dda3b0 100755 (executable)
@@ -3770,112 +3770,112 @@ s_ixhtml10_start_img_tag(void *pdoc, Node *node)
   }
   
   if(!css_display){
-  
-    W_L("<img");
-    if (attr_src) {
-      W_L(" src=\"");
-      W_V(attr_src);
-      DBG(r,"REQ[%X] mode is %d -> %s",(unsigned int)(apr_size_t)r, ixhtml10->conf->image_rewrite_mode, attr_src);
-      W_L("\"");
+
+  W_L("<img");
+  if (attr_src) {
+    W_L(" src=\"");
+    W_V(attr_src);
+    DBG(r,"mode is %d -> %s",ixhtml10->conf->image_rewrite_mode, attr_src);
+    W_L("\"");
+  }
+  if (attr_align || attr_hspace || attr_vspace || css_float || css_margin_left || css_margin_right || css_margin_top || css_margin_bottom || css_valign ) {
+    W_L(" style=\"");
+    if (attr_align) {
+      if (STRCASEEQ('t','T',"top", attr_align)) {
+        css_valign = NULL;
+        W_L("vertical-align:top;");
+      }
+      else if (STRCASEEQ('m','M',"middle", attr_align) || STRCASEEQ('c','C',"center",attr_align)) {
+        css_valign = NULL;
+        W_L("vertical-align:middle;");
+      }
+      else if (STRCASEEQ('b','B',"bottom", attr_align)) {
+        css_valign = NULL;
+        W_L("vertical-align:bottom;");
+      }
+      else if (STRCASEEQ('l','L',"left", attr_align)) {
+        css_float = NULL;
+        W_L("float:left;");
+      }
+      else if (STRCASEEQ('r','R',"right", attr_align)) {
+        css_float = NULL;
+        W_L("float:right;");
+      }
+   }
+   
+   
+    if(css_float){
+      W_L("float:");
+      W_V(css_float);
+      W_L(";");
     }
-    if (attr_align || attr_hspace || attr_vspace || css_float || css_margin_left || css_margin_right || css_margin_top || css_margin_bottom || css_valign ) {
-      W_L(" style=\"");
-      if (attr_align) {
-        if (STRCASEEQ('t','T',"top", attr_align)) {
-          css_valign = NULL;
-          W_L("vertical-align:top;");
-        }
-        else if (STRCASEEQ('m','M',"middle", attr_align) || STRCASEEQ('c','C',"center",attr_align)) {
-          css_valign = NULL;
-          W_L("vertical-align:middle;");
-        }
-        else if (STRCASEEQ('b','B',"bottom", attr_align)) {
-          css_valign = NULL;
-          W_L("vertical-align:bottom;");
-        }
-        else if (STRCASEEQ('l','L',"left", attr_align)) {
-          css_float = NULL;
-          W_L("float:left;");
-        }
-        else if (STRCASEEQ('r','R',"right", attr_align)) {
-          css_float = NULL;
-          W_L("float:right;");
-        }
-     }
-     
-     
-      if(css_float){
-        W_L("float:");
-        W_V(css_float);
-        W_L(";");
-      }
-      if(css_valign){
-        W_L("vertical-align:");
-        W_V(css_valign);
-        W_L(";");
-      }
-      
-      if (attr_hspace) {
+    if(css_valign){
+      W_L("vertical-align:");
+      W_V(css_valign);
+      W_L(";");
+    }
+    
+    if (attr_hspace) {
+      W_L("margin-left:");
+      W_V(attr_hspace);
+      W_L(";");
+      W_L("margin-right:");
+      W_V(attr_hspace);
+      W_L(";");
+    }
+    else{
+      if(css_margin_left){
         W_L("margin-left:");
-        W_V(attr_hspace);
+        W_V(css_margin_left);
         W_L(";");
+      }
+      if(css_margin_right){
         W_L("margin-right:");
-        W_V(attr_hspace);
+        W_V(css_margin_right);
         W_L(";");
       }
-      else{
-        if(css_margin_left){
-          W_L("margin-left:");
-          W_V(css_margin_left);
-          W_L(";");
-        }
-        if(css_margin_right){
-          W_L("margin-right:");
-          W_V(css_margin_right);
-          W_L(";");
-        }
-      }
-      if (attr_vspace) {
+    }
+    if (attr_vspace) {
+      W_L("margin-top:");
+      W_V(attr_vspace);
+      W_L(";");
+      W_L("margin-bottom:");
+      W_V(attr_vspace);
+      W_L(";");
+    }
+    else{
+      if(css_margin_top){
         W_L("margin-top:");
-        W_V(attr_vspace);
+        W_V(css_margin_top);
         W_L(";");
+      }
+      if(css_margin_bottom){
         W_L("margin-bottom:");
-        W_V(attr_vspace);
+        W_V(css_margin_bottom);
         W_L(";");
       }
-      else{
-        if(css_margin_top){
-          W_L("margin-top:");
-          W_V(css_margin_top);
-          W_L(";");
-        }
-        if(css_margin_bottom){
-          W_L("margin-bottom:");
-          W_V(css_margin_bottom);
-          W_L(";");
-        }
-      }
-      W_L("\"");
-    }
-    if (attr_width) {
-      W_L(" width=\"");
-      W_V(attr_width);
-      W_L("\"");
-    }
-    if (attr_height) {
-      W_L(" height=\"");
-      W_V(attr_height);
-      W_L("\"");
     }
-    if (attr_alt) {
-      W_L(" alt=\"");
-      W_V(attr_alt);
-      W_L("\"");
-    }
-    else {
-      W_L(" alt=\"\"");
-    }
-    W_L(" />");
+    W_L("\"");
+  }
+  if (attr_width) {
+    W_L(" width=\"");
+    W_V(attr_width);
+    W_L("\"");
+  }
+  if (attr_height) {
+    W_L(" height=\"");
+    W_V(attr_height);
+    W_L("\"");
+  }
+  if (attr_alt) {
+    W_L(" alt=\"");
+    W_V(attr_alt);
+    W_L("\"");
+  }
+  else {
+    W_L(" alt=\"\"");
+  }
+  W_L(" />");
   }
   return ixhtml10->out;
 }
@@ -5074,8 +5074,6 @@ s_ixhtml10_start_dd_tag(void *pdoc, Node *node)
   char      *attr_style = NULL;
   char      *attr_color = NULL;
   char      *attr_size  = NULL;
-  char      *css_clear  = NULL;
-
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -5088,9 +5086,8 @@ s_ixhtml10_start_dd_tag(void *pdoc, Node *node)
   if (IS_CSS_ON(ixhtml10->entryp)) {
     css_prop_list_t *style = s_ixhtml10_nopush_and_get_now_style(pdoc, node, attr_style);
     if (style) {
-      css_property_t *color_prop = chxj_css_get_property_value(doc, style, "color");
-      css_property_t *size_prop  = chxj_css_get_property_value(doc, style, "font-size");
-      css_property_t *clear_prop = chxj_css_get_property_value(doc, style, "clear");
+      css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
+      css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -5122,18 +5119,6 @@ s_ixhtml10_start_dd_tag(void *pdoc, Node *node)
           }
         }
       }
-
-      for (cur = clear_prop->next; cur != clear_prop; cur = cur->next) {
-        if (STRCASEEQ('b','B',"both", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "both");
-        }
-        else if (STRCASEEQ('r','R',"right", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "right");
-        }
-        else if (STRCASEEQ('l','L',"left", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "left");
-        }
-      }
     }
   }
   W_L("<dd");
@@ -5150,11 +5135,6 @@ s_ixhtml10_start_dd_tag(void *pdoc, Node *node)
       W_V(attr_size);
       W_L(";");
     }
-    if (css_clear) {
-      W_L("clear:");
-      W_V(css_clear);
-      W_L(";");
-    }
     W_L("\"");
   }
   W_L(">");
@@ -5897,8 +5877,6 @@ s_ixhtml10_start_menu_tag(void *pdoc, Node *node)
   char      *attr_color = NULL;
   char      *attr_type  = NULL;
   char      *attr_size  = NULL;
-  char      *css_clear  = NULL;
-
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -5919,7 +5897,6 @@ s_ixhtml10_start_menu_tag(void *pdoc, Node *node)
       css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
       css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
       css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type");
-      css_property_t *clear_prop           = chxj_css_get_property_value(doc, style, "clear");
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -5956,17 +5933,6 @@ s_ixhtml10_start_menu_tag(void *pdoc, Node *node)
           }
         }
       }
-      for (cur = clear_prop->next; cur != clear_prop; cur = cur->next) {
-        if (STRCASEEQ('b','B',"both", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "both");
-        }
-        else if (STRCASEEQ('r','R',"right", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "right");
-        }
-        else if (STRCASEEQ('l','L',"left", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "left");
-        }
-      }
     }
   }
   W_L("<ul");
@@ -5988,11 +5954,6 @@ s_ixhtml10_start_menu_tag(void *pdoc, Node *node)
       W_V(attr_size);
       W_L(";");
     }
-    if (css_clear) {
-      W_L("clear:");
-      W_V(css_clear);
-      W_L(";");
-    }
     W_L("\"");
   }
   W_L(">");
@@ -6093,7 +6054,6 @@ s_ixhtml10_start_blink_tag(void *pdoc, Node *node)
   char      *attr_style = NULL;
   char      *attr_color = NULL;
   char      *attr_size  = NULL;
-  
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -6108,7 +6068,6 @@ s_ixhtml10_start_blink_tag(void *pdoc, Node *node)
     if (style) {
       css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
       css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
-      
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -6815,6 +6774,7 @@ s_ixhtml10_start_object_tag(void *pdoc, Node *node)
   ixhtml10_t *ixhtml10 = GET_IXHTML10(pdoc);
   Doc       *doc = ixhtml10->doc;
   Attr *attr;
+  char *attr_style         = NULL;
   char *attr_id            = NULL;
   char *attr_width         = NULL;
   char *attr_height        = NULL;
@@ -6917,6 +6877,7 @@ s_ixhtml10_start_param_tag(void *pdoc, Node *node)
   ixhtml10_t *ixhtml10 = GET_IXHTML10(pdoc);
   Doc       *doc = ixhtml10->doc;
   Attr *attr;
+  char *attr_style         = NULL;
   char *attr_name          = NULL;
   char *attr_value         = NULL;
   char *attr_valuetype     = NULL;
index cf94330..93e267f 100755 (executable)
@@ -3643,6 +3643,7 @@ s_jxhtml_start_img_tag(void *pdoc, Node *node)
   char        *attr_src    = NULL;
   char        *attr_height = NULL;
   char        *attr_width  = NULL;
+  char        *attr_align  = NULL;
   char        *attr_alt    = NULL;
   char        *attr_style  = NULL;
   char        *attr_hspace = NULL;
@@ -5070,8 +5071,6 @@ s_jxhtml_start_dd_tag(void *pdoc, Node *node)
   char      *attr_style = NULL;
   char      *attr_color = NULL;
   char      *attr_size  = NULL;
-  char      *css_clear  = NULL;
-
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -5086,7 +5085,6 @@ s_jxhtml_start_dd_tag(void *pdoc, Node *node)
     if (style) {
       css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
       css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
-      css_property_t *clear_prop           = chxj_css_get_property_value(doc, style, "clear");
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -5118,9 +5116,6 @@ s_jxhtml_start_dd_tag(void *pdoc, Node *node)
           }
         }
       }
-      for (cur = clear_prop->next; cur != clear_prop; cur = cur->next) {
-        css_clear = apr_pstrdup(doc->pool, cur->value);
-      }
     }
   }
   W_L("<dd");
@@ -5137,11 +5132,6 @@ s_jxhtml_start_dd_tag(void *pdoc, Node *node)
       W_V(attr_size);
       W_L(";");
     }
-    if (css_clear){
-      W_L("clear:");
-      W_V(css_clear);
-      W_L(";");
-    }
     W_L("\"");
   }
   W_L(">");
@@ -5882,8 +5872,6 @@ s_jxhtml_start_menu_tag(void *pdoc, Node *node)
   char      *attr_color = NULL;
   char      *attr_type  = NULL;
   char      *attr_size  = NULL;
-  char      *css_clear  = NULL;
-
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -5904,7 +5892,6 @@ s_jxhtml_start_menu_tag(void *pdoc, Node *node)
       css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
       css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
       css_property_t *list_style_type_prop = chxj_css_get_property_value(doc, style, "list-style-type");
-      css_property_t *clear_prop           = chxj_css_get_property_value(doc, style, "clear");
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -5941,17 +5928,6 @@ s_jxhtml_start_menu_tag(void *pdoc, Node *node)
           }
         }
       }
-      for (cur = clear_prop->next; cur != clear_prop; cur = cur->next) {
-        if (STRCASEEQ('b','B',"both", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "both");
-        }
-        else if (STRCASEEQ('r','R',"right", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "right");
-        }
-        else if (STRCASEEQ('l','L',"left", cur->value)) {
-          css_clear = apr_pstrdup(doc->pool, "left");
-        }
-      }
     }
   }
   W_L("<menu");
@@ -5973,11 +5949,6 @@ s_jxhtml_start_menu_tag(void *pdoc, Node *node)
       W_V(attr_size);
       W_L(";");
     }
-    if (css_clear){
-      W_L("clear:");
-      W_V(css_clear);
-      W_L(";");
-    }
     W_L("\"");
   }
   W_L(">");
@@ -6078,7 +6049,6 @@ s_jxhtml_start_blink_tag(void *pdoc, Node *node)
   char      *attr_style = NULL;
   char      *attr_color = NULL;
   char      *attr_size  = NULL;
-  
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
@@ -6093,7 +6063,6 @@ s_jxhtml_start_blink_tag(void *pdoc, Node *node)
     if (style) {
       css_property_t *color_prop           = chxj_css_get_property_value(doc, style, "color");
       css_property_t *size_prop            = chxj_css_get_property_value(doc, style, "font-size");
-      
       css_property_t *cur;
       for (cur = color_prop->next; cur != color_prop; cur = cur->next) {
         if (cur->value && *cur->value) {
@@ -6824,6 +6793,7 @@ s_jxhtml_start_param_tag(void *pdoc, Node *node)
   Doc *doc = jxhtml->doc;
 
   Attr *attr;
+  char *attr_style         = NULL;
   char *attr_name          = NULL;
   char *attr_value         = NULL;
   char *attr_valuetype     = NULL;
index ae96da0..ff94a08 100755 (executable)
@@ -305,10 +305,7 @@ chxj_headers_fixup(request_rec *r)
     }
   }
   else{
-    if (! r->content_type) {
-      DBG(r, "REQ[%X] r->content_type is NULL. (Probably access From PC?)", (unsigned int)(apr_size_t)r);
-    }
-    else if(strncmp(r->content_type,"image/",6) == 0){
+    if(strncmp(r->content_type,"image/",6) == 0){
       if (dconf->image_rewrite == CHXJ_IMG_REWRITE_ON && !apr_table_get(r->headers_in, CHXJ_IMG_X_HTTP_IMAGE_FILENAME)){
         if(dconf->image_rewrite_mode == CHXJ_IMG_REWRITE_MODE_ALL){
           // all image
index 326cebd..3d52b3e 100644 (file)
@@ -1,4 +1,4 @@
-%define version 0.13.0-rc
+%define version 0.13.0
 
 Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD.
 Name:  mod_chxj