diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..f268793 --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,683 @@ +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +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'.])]) + +# Copyright (C) 2002, 2003, 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. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +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.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 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. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 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 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 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 16 + +# 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. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# 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 + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005, 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. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 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 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 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 5 + +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 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 6 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 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. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 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 4 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 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 5 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 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. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 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 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 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 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/ax_gcc_visibiliity.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) diff --git a/autogen b/autogen deleted file mode 100755 index 949f269..0000000 --- a/autogen +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# $Id$ - -export LIBTOOL=/usr/bin/libtool -export AUTOMAKE=/usr/bin/automake -export ACLOCAL=/usr/bin/aclocal -rm -f configure tools/* -autoreconf --install -rm -rf autom4te* aclocal.m4 - -exit 0 diff --git a/chardet-config.h b/chardet-config.h new file mode 100644 index 0000000..a0a4cc0 --- /dev/null +++ b/chardet-config.h @@ -0,0 +1,98 @@ +/* chardet-config.h. Generated from chardet-config.h.in by configure. */ +/* chardet-config.h.in. Generated from configure.ac by autoheader. */ +/* $Id$ */ +#ifndef CHARDEC_CONFIG_H +#define CHARDEC_CONFIG_H + + +/* config.h: a general config file */ + + + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "libchardet" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://oops.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libchardet" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libchardet 1.0.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libchardet" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.0.3" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "1.0.3" + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +#endif /* CHARDEC_CONFIG_H */ diff --git a/configure b/configure index 62353bd..f510a02 100755 --- a/configure +++ b/configure @@ -17328,7 +17328,7 @@ $debug || if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr='' ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then ac_cs_awk_cr='\\r' diff --git a/libchardet.spec b/libchardet.spec new file mode 100644 index 0000000..7d03125 --- /dev/null +++ b/libchardet.spec @@ -0,0 +1,71 @@ +%define revisions "$Id$" +%define _unpackaged_files_terminate_build 0 + +Summary: Mozilla Universal Chardet library +Summary(ko): 모질라 유니버샬 캐릭터셋 디텍트 라이브러리 +Name: libchardet +Version: 1.0.3 +Release: 1 +Epoch: 1 +License: MPL +Group: System Environment/Libraries +Source0: http://mirror.oops.org/pub/oops/%{name}/%{name}-%{version}.tar.bz2 +URL: http://oops.org +BuildRequires: libstdc++-devel +Requires: libstdc++ + +Buildroot: /var/tmp/%{name}-%{version}-root + +%description +libchardet provides an interface to Mozilla's universal charset detector, +which detects the charset used to encode data. + +%package devel +Summary: Header and object files for development using libchardet +Summary(ko): libchardet 를 이용하여 개발하기 위한 header 파일과 목적 파일들 +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release}, libstdc++-devel + +%description devel +The libchardet-devel package contains the header and object files necessary +for developing programs which use the libchardet libraries. + +%prep +[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot} +%setup -q + +%build +%configure + +%{__make} %{?_smp_mflags} + +%install +%{__make} DESTDIR=%{buildroot} install + +%clean +%{__rm} -rf %{buildroot} + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(0755,root,root) +%{_libdir}/%{name}.so.* + +%files devel +%defattr(0644,root,root,0755) +%attr(0755,root,root) %{_bindir}/chardet-config +%{_libdir}/*.so +%{_libdir}/*.a +%{_libdir}/*.la +%{_libdir}/pkgconfig/chardet.pc +%{_includedir}/chardet/*.h +%{_mandir}/man3/* +%{_mandir}/ko/man3/* + +%changelog +* Mon Feb 10 2014 JoungKyun.Kim 1:1.0.3-1 +- packaged 1.0.3 diff --git a/patch/original-encode-detect-1.01.patch b/patch/original-encode-detect-1.01.patch deleted file mode 100644 index a97e14d..0000000 --- a/patch/original-encode-detect-1.01.patch +++ /dev/null @@ -1,502 +0,0 @@ - -Oridignal Encode-Detect code 1.01 diff -$Id$ - -diff -urNp Encode-Detect-1.01/src/Makefile.in libchardet-1.0.0/src/Makefile.in ---- Encode-Detect-1.01/src/Makefile.in 1970-01-01 09:00:00.000000000 +0900 -+++ libchardet-1.0.0/src/Makefile.in 2009-02-21 04:34:01.000000000 +0900 -@@ -0,0 +1,110 @@ -+# $Id$ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+builddir = @builddir@ -+top_builddir = .. -+ -+build = @build@ -+build_cpu = @build_cpu@ -+build_vendor = @build_vendor@ -+build_os = @build_os@ -+host = @host@ -+host_cpu = @host_cpu@ -+host_vendor = @host_vendor@ -+ -+PROG = @PACKAGE_NAME@ -+VERSION = @PACKAGE_VERSION@ -+CC = @CC@ -Wall -+CXX = @CXX@ -Wall -+CFLAGS = @CFLAGS@ -+CPPFLAGS = -I. -I.. -I../include @CPPFLAGS@ -+LIBS = @LIBS@ -lstdc++ -+LDFLAGS = @LDFLAGS@ $(LIBS) -+DEFS = @DEFS@ $(CPPFLAGS) -+ -+SONAME_MAJOR = @SONAME_MAJOR@ -+SONAME_MINOR = @SONAME_MINOR@ -+SONAME_REVISION = @SONAME_REVISION@ -+SONAME_INFO = @SONAME_INFO@ -+SONAME_VERSION = @SONAME_VERSION@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+includedir = @includedir@ -+libdir = @libdir@ -+bindir = @bindir@ -+mandir = @mandir@ -+DESTDIR = -+ -+LIBTOOL = @LIBTOOL@ -+INSTALL = @INSTALL@ -+RM = @RM@ -f -+MAKE = @MAKE@ -+MKDIR = @MKDIR@ -p -+STRIP = @STRIP@ -+PERL = @PERL@ -+ -+CC_OPT = $(CC) $(CFLAGS) $(DEFS) -+LINK = $(LIBTOOL) --mode=link $(CC_OPT) -rpath $(libdir) -version-info $(SONAME_INFO) -+COMPILE = $(LIBTOOL) --mode=compile $(CC_OPT) $(DEFS) -prefer-pic -+P_LIBTOOL = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@ -m755 -+D_LIBTOOL = $(LIBTOOL) --mode=install @INSTALL_DATA@ -+L_LIBTOOL = $(LIBTOOL) --mode=install $(INSTALL) -+ -+UC_SRCS = CharDistribution.cpp JpCntx.cpp LangBulgarianModel.cpp \ -+ LangCyrillicModel.cpp LangGreekModel.cpp LangHebrewModel.cpp \ -+ LangHungarianModel.cpp LangThaiModel.cpp nsBig5Prober.cpp \ -+ nsCharSetProber.cpp nsEUCJPProber.cpp nsEUCKRProber.cpp \ -+ nsEUCTWProber.cpp nsEscCharsetProber.cpp nsEscSM.cpp \ -+ nsGB2312Prober.cpp nsHebrewProber.cpp nsLatin1Prober.cpp \ -+ nsMBCSGroupProber.cpp nsMBCSSM.cpp nsSBCSGroupProber.cpp \ -+ nsSBCharSetProber.cpp nsSJISProber.cpp nsUTF8Prober.cpp \ -+ nsUniversalDetector.cpp chardet.cpp -+ -+#UC_HEADERS = CharDistribution.h JpCntx.h nsBig5Prober.h \ -+# nsCharSetProber.h nsCodingStateMachine.h nsEUCJPProber.h \ -+# nsEUCKRProber.h nsEUCTWProber.h nsEscCharsetProber.h \ -+# nsGB2312Prober.h nsHebrewProber.h nsLatin1Prober.h \ -+# nsMBCSGroupProber.h nsPkgInt.h nsSBCSGroupProber.h \ -+# nsSBCharSetProber.h nsSJISProber.h nsUTF8Prober.h \ -+# nsUniversalDetector.h ../include/nscore.h ../include/prmem.h -+UC_HEADERS = nsUniversalDetector.h ../include/nscore.h chardet.h -+ -+UC_OBJS = $(UC_SRCS:.cpp=.lo) -+ -+%.lo: %.cpp -+ $(COMPILE) -o $@ -c $< -+ -+all: libs chardet-config -+ -+libs: $(UC_OBJS) -+ $(LINK) -o lib$(PROG).la $(UC_OBJS) $(LDFLAGS) -+ -+chardet-config: -+ $(INSTALL) -m755 $(top_srcdir)/$(PROG)-config.in $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@prefix\@!$(prefix)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@exec_prefix\@!$(exec_prefix)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@VERSION\@!$(VERSION)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@includedir\@!$(includedir)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@libdir\@!$(libdir)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@CFLAGS\@!$(CFLAGS)!g" $(PROG)-config ; \ -+ $(PERL) -pi -e "s!\@prog\@!$(PROG)!g" $(PROG)-config ; -+ -+install: install-header -+ $(MKDIR) $(DESTDIR)$(bindir) -+ $(MKDIR) $(DESTDIR)$(libdir) -+ $(P_LIBTOOL) $(PROG)-config $(DESTDIR)$(bindir)/$(PROG)-config -+ $(L_LIBTOOL) lib$(PROG).la $(DESTDIR)$(libdir)/lib$(PROG).la -+ $(LIBTOOL) --finish $(libdir) -+ -+install-header: -+ $(MKDIR) $(DESTDIR)$(includedir)/$(PROG) -+ for i in $(UC_HEADERS); do \ -+ $(D_LIBTOOL) $$i $(DESTDIR)$(includedir)/$(PROG)/ ; \ -+ done -+ $(D_LIBTOOL) $(top_srcdir)/$(PROG)-config.h $(DESTDIR)$(includedir)/$(PROG)/ -+ -+clean: -+ -$(RM) -r *.o *.lo* *.la* .libs -+ -diff -urNp Encode-Detect-1.01/src/chardet.cpp libchardet-1.0.0/src/chardet.cpp ---- Encode-Detect-1.01/src/chardet.cpp 1970-01-01 09:00:00.000000000 +0900 -+++ libchardet-1.0.0/src/chardet.cpp 2009-02-22 04:52:22.000000000 +0900 -@@ -0,0 +1,153 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * Mozilla's universal charset detector C/C++ Wrapping API -+ * Writer(s) : -+ * Detect class by John Gardiner Myers -+ * C wrapping API by JoungKyun.Kim -+ * -+ * $Id$ -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#include -+#include -+#include -+ -+class Detector: public nsUniversalDetector { -+ public: -+ Detector () {}; -+ virtual ~Detector () {} -+ const char *getCharsetName () { return mDetectedCharset; } -+ float getConfidence () { return mDetectedConfidence; } -+ virtual void Reset () { this->nsUniversalDetector::Reset (); } -+ protected: -+ virtual void Report (const char* aCharset) { mDetectedCharset = aCharset; } -+}; -+ -+typedef struct Detect_t { -+ Detector *detect; -+} Detect; -+ -+#include -+ -+DetectObj * detect_obj_init (void) { -+ DetectObj * obj; -+ -+ if ( (obj = (DetectObj *) PR_Malloc (sizeof (DetectObj))) == NULL ) -+ return NULL; -+ -+ obj->encoding = NULL; -+ obj->confidence = 0.0; -+ -+ return obj; -+} -+ -+void detect_obj_free (DetectObj ** obj) { -+ if ( *obj != NULL ) { -+ PR_FREEIF ((*obj)->encoding); -+ PR_FREEIF (*obj); -+ } -+} -+ -+Detect * detect_init (void) { -+ Detect *det = NULL; -+ -+ det = (Detect *) PR_Malloc (sizeof (Detect)); -+ -+ if ( det == NULL ) -+ return NULL; -+ -+ det->detect = new Detector; -+ return det; -+} -+ -+void detect_reset (Detect **det) { -+ (*det)->detect->Reset (); -+} -+ -+void detect_dataend (Detect **det) { -+ (*det)->detect->DataEnd (); -+} -+ -+short detect_handledata (Detect ** det, const char * buf, DetectObj ** obj) { -+ const char * ret; -+ -+ if ( (*det)->detect->HandleData (buf, strlen (buf)) == NS_ERROR_OUT_OF_MEMORY ) -+ return CHARDET_OUT_OF_MEMORY; -+ (*det)->detect->DataEnd (); -+ -+ ret = (*det)->detect->getCharsetName (); -+ -+ if ( ! ret ) -+ return CHARDET_NO_RESULT; -+ else if ( *obj == NULL ) -+ return CHARDET_NULL_OBJECT; -+ -+ (*obj)->encoding = (char *) strdup (ret); -+ (*obj)->confidence = (*det)->detect->getConfidence (); -+ -+ return CHARDET_SUCCESS; -+} -+ -+void detect_destroy (Detect **det) { -+ delete (*det)->detect; -+ PR_FREEIF (*det); -+} -+ -+short detect (const char *buf, DetectObj ** obj) { -+ Detector * det; -+ const char * ret; -+ -+ det = new Detector; -+ det->Reset (); -+ if ( det->HandleData (buf, strlen (buf)) == NS_ERROR_OUT_OF_MEMORY ) { -+ delete det; -+ return CHARDET_OUT_OF_MEMORY; -+ } -+ det->DataEnd (); -+ -+ ret = det->getCharsetName (); -+ delete det; -+ -+ if ( ! ret ) -+ return CHARDET_NO_RESULT; -+ else if ( *obj == NULL ) -+ return CHARDET_NULL_OBJECT; -+ -+ (*obj)->encoding = (char *) strdup (ret); -+ (*obj)->confidence = det->getConfidence (); -+ -+ return CHARDET_SUCCESS; -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -diff -urNp Encode-Detect-1.01/src/chardet.h libchardet-1.0.0/src/chardet.h ---- Encode-Detect-1.01/src/chardet.h 1970-01-01 09:00:00.000000000 +0900 -+++ libchardet-1.0.0/src/chardet.h 2009-02-22 05:02:21.000000000 +0900 -@@ -0,0 +1,80 @@ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Mozilla Public License Version -+ * 1.1 (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * Mozilla's universal charset detector C/C++ Wrapping API -+ * Writer(s) : -+ * Detect class by John Gardiner Myers -+ * C wrapping API by JoungKyun.Kim -+ * -+ * $Id$ -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the MPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the MPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ -+#include -+#include -+ -+#define CHARDET_OUT_OF_MEMORY -128 -+#define CHARDET_MEM_ALLOCATED_FAIL -127 -+ -+#define CHARDET_SUCCESS 0 -+#define CHARDET_NO_RESULT 1 -+#define CHARDET_NULL_OBJECT 2 -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ typedef struct Detect_t Detect; -+ -+ typedef struct DetectObject { -+ char * encoding; -+ float confidence; -+ } DetectObj; -+ -+ DetectObj * detect_obj_init (void); -+ void detect_obj_free (DetectObj **); -+ -+ Detect * detect_init (void); -+ void detect_reset (Detect **); -+ void detect_dataend (Detect **); -+ short detect_handledata (Detect **, const char *, DetectObj **); -+ void detect_destroy (Detect **); -+ short detect (const char *, DetectObj **); -+#ifdef __cplusplus -+}; -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -diff -urNp Encode-Detect-1.01/src/nsUniversalDetector.cpp libchardet-1.0.0/src/nsUniversalDetector.cpp ---- Encode-Detect-1.01/src/nsUniversalDetector.cpp 2008-05-28 05:35:11.000000000 +0900 -+++ libchardet-1.0.0/src/nsUniversalDetector.cpp 2009-02-22 03:23:47.000000000 +0900 -@@ -21,6 +21,10 @@ - * - * Contributor(s): - * Shy Shalom -+ * JoungKyun.Kim -+ * - Add mDetectedConfidence -+ * -+ * $Id$ - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -54,6 +58,7 @@ nsUniversalDetector::nsUniversalDetector - - mStart = PR_TRUE; - mDetectedCharset = nsnull; -+ mDetectedConfidence = 0.0; - mGotData = PR_FALSE; - mInputState = ePureAscii; - mLastChar = '\0'; -@@ -81,6 +86,7 @@ nsUniversalDetector::Reset() - - mStart = PR_TRUE; - mDetectedCharset = nsnull; -+ mDetectedConfidence = 0.0; - mGotData = PR_FALSE; - mInputState = ePureAscii; - mLastChar = '\0'; -@@ -114,33 +120,44 @@ nsresult nsUniversalDetector::HandleData - switch (aBuf[0]) - { - case '\xEF': -- if (('\xBB' == aBuf[1]) && ('\xBF' == aBuf[2])) -+ if (('\xBB' == aBuf[1]) && ('\xBF' == aBuf[2])) { - // EF BB BF UTF-8 encoded BOM - mDetectedCharset = "UTF-8"; -+ mDetectedConfidence = 1.0; -+ } - break; - case '\xFE': -- if (('\xFF' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) -+ if (('\xFF' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) { - // FE FF 00 00 UCS-4, unusual octet order BOM (3412) - mDetectedCharset = "X-ISO-10646-UCS-4-3412"; -- else if ('\xFF' == aBuf[1]) -+ mDetectedConfidence = 1.0; -+ } else if ('\xFF' == aBuf[1]) { - // FE FF UTF-16, big endian BOM - mDetectedCharset = "UTF-16BE"; -+ mDetectedConfidence = 1.0; -+ } - break; - case '\x00': -- if (('\x00' == aBuf[1]) && ('\xFE' == aBuf[2]) && ('\xFF' == aBuf[3])) -+ if (('\x00' == aBuf[1]) && ('\xFE' == aBuf[2]) && ('\xFF' == aBuf[3])) { - // 00 00 FE FF UTF-32, big-endian BOM - mDetectedCharset = "UTF-32BE"; -- else if (('\x00' == aBuf[1]) && ('\xFF' == aBuf[2]) && ('\xFE' == aBuf[3])) -+ mDetectedConfidence = 1.0; -+ } else if (('\x00' == aBuf[1]) && ('\xFF' == aBuf[2]) && ('\xFE' == aBuf[3])) { - // 00 00 FF FE UCS-4, unusual octet order BOM (2143) - mDetectedCharset = "X-ISO-10646-UCS-4-2143"; -+ mDetectedConfidence = 1.0; -+ } - break; - case '\xFF': -- if (('\xFE' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) -+ if (('\xFE' == aBuf[1]) && ('\x00' == aBuf[2]) && ('\x00' == aBuf[3])) { - // FF FE 00 00 UTF-32, little-endian BOM - mDetectedCharset = "UTF-32LE"; -- else if ('\xFE' == aBuf[1]) -+ mDetectedConfidence = 1.0; -+ } else if ('\xFE' == aBuf[1]) { - // FF FE UTF-16, little endian BOM - mDetectedCharset = "UTF-16LE"; -+ mDetectedConfidence = 1.0; -+ } - break; - } // switch - -@@ -210,6 +227,7 @@ nsresult nsUniversalDetector::HandleData - { - mDone = PR_TRUE; - mDetectedCharset = mEscCharSetProber->GetCharSetName(); -+ mDetectedConfidence = mEscCharSetProber->GetConfidence(); - } - break; - case eHighbyte: -@@ -220,12 +238,16 @@ nsresult nsUniversalDetector::HandleData - { - mDone = PR_TRUE; - mDetectedCharset = mCharSetProbers[i]->GetCharSetName(); -+ mDetectedConfidence = mCharSetProbers[i]->GetConfidence(); - return NS_OK; - } - } - break; - - default: //pure ascii -+ mDone = PR_TRUE; -+ mDetectedCharset = "ASCII"; -+ mDetectedConfidence = 1.0; - ;//do nothing here - } - return NS_OK; -@@ -266,9 +288,12 @@ void nsUniversalDetector::DataEnd() - maxProber = i; - } - } -+ mDetectedConfidence = maxProberConfidence; - //do not report anything because we are not confident of it, that's in fact a negative answer -- if (maxProberConfidence > MINIMUM_THRESHOLD) -+ if (maxProberConfidence > MINIMUM_THRESHOLD) { - Report(mCharSetProbers[maxProber]->GetCharSetName()); -+ mDetectedConfidence = mCharSetProbers[maxProber]->GetConfidence(); -+ } - } - break; - case eEscAscii: -diff -urNp Encode-Detect-1.01/src/nsUniversalDetector.h libchardet-1.0.0/src/nsUniversalDetector.h ---- Encode-Detect-1.01/src/nsUniversalDetector.h 2008-05-28 05:35:11.000000000 +0900 -+++ libchardet-1.0.0/src/nsUniversalDetector.h 2009-02-22 03:23:46.000000000 +0900 -@@ -20,6 +20,10 @@ - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): -+ * JoungKyun.Kim -+ * - Add mDetectedConfidence -+ * -+ * $Id$ - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or -@@ -65,6 +69,7 @@ protected: - PRBool mGotData; - char mLastChar; - const char * mDetectedCharset; -+ float mDetectedConfidence; - PRInt32 mBestGuess; - - nsCharSetProber *mCharSetProbers[NUM_OF_CHARSET_PROBERS]; diff --git a/src/LangHebrewModel.cpp b/src/LangHebrewModel.cpp index 4a7f7bc..3617769 100644 --- a/src/LangHebrewModel.cpp +++ b/src/LangHebrewModel.cpp @@ -19,8 +19,8 @@ * Portions created by the Initial Developer are Copyright (C) 2005 * the Initial Developer. All Rights Reserved. * - * Contributor(s): - * Shoshannah Forbes + * Contributor(s): + * Shoshannah Forbes * Shy Shalom * * Alternatively, the contents of this file may be used under the terms of diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 4573036..0000000 --- a/test/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# -# $Id$ -# - -CC = gcc -CFLAGS = `chardet-config --cflags` -DEFS = `chardet-config --defs` -LIBS = `chardet-config --libs` -#LIBS = -L../src/.libs -Wl,-rpath=../src/.libs -lchardet -lstdc++ - -all: sample sample1 - -sample: - $(CC) $(DEFS) $(CFLAGS) sample.c $(LIBS) -o sample - -sample1: - $(CC) $(DEFS) $(CFLAGS) sample1.c $(LIBS) -o sample1 - -clean : - -rm -f sample sample1 diff --git a/test/sample.c b/test/sample.c deleted file mode 100644 index a047563..0000000 --- a/test/sample.c +++ /dev/null @@ -1,53 +0,0 @@ -/* - * sample code with libchardet - * author: JoungKyun.Kim - * $Id$ - */ - -#include -//#include "../src/chardet.h" - -int main (void) { - Detect * d; - DetectObj *obj; - int i; - - char *str[] = { - "ȳ", - "ȳϼ", - "ȳϼ ?", - "׷ Ǵ ɱ?", - " 󸶳 ؾ!", - "׷ ׷ ߾ ...", - "12345 abcde" - }; - - short arrayNum; - arrayNum = sizeof (str) / sizeof (str[0]); - - if ( (d = detect_init ()) == NULL ) { - fprintf (stderr, "chardet handle initialize failed\n"); - return CHARDET_MEM_ALLOCATED_FAIL; - } - - for ( i=0; iencoding, obj->confidence); - detect_obj_free (&obj); - } - - detect_destroy (&d); - - return 0; -} diff --git a/test/sample1.c b/test/sample1.c deleted file mode 100644 index a3c4638..0000000 --- a/test/sample1.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * sample code with libchardet - * author: JoungKyun.Kim - * $Id$ - */ -#include -//#include "../src/chardet.h" - -int main (void) { - DetectObj *obj; - int i; - - char *str[] = { - "ȳ", - "ȳϼ", - "ȳϼ ?", - "׷ Ǵ ɱ?", - " 󸶳 ؾ!", - "׷ ׷ ߾ ...", - "12345 abcde" - }; - - short arrayNum; - arrayNum = sizeof (str) / sizeof (str[0]); - - for ( i=0; iencoding, obj->confidence); - detect_obj_free (&obj); - } - - return 0; -} diff --git a/tools/install-sh b/tools/install-sh old mode 100644 new mode 100755 diff --git a/tools/ltmain.sh b/tools/ltmain.sh old mode 100644 new mode 100755