Attachment #375812 for bug #490292




# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.59)
AC_INIT([libguess], [1.2], [bugs+libguess@atheme.org])
AC_CONFIG_SRCDIR([src/libguess/guess.c])
AC_CONFIG_HEADER([src/libguess/autoconf.h])
AC_CONFIG_MACRO_DIR([m4])

AC_CANONICAL_HOST
AC_CANONICAL_TARGET

AC_CHECK_FUNCS([printf sprintf snprintf vsnprintf gettimeofday strndup strlcpy strlcat])
AC_FUNC_STAT

PKG_CHECK_MODULES([MOWGLI], [libmowgli-2 >= 2.0.0], [], [AC_MSG_ERROR([Install Mowgli from http://atheme.org/project/mowgli.])])

# Check for optional features.
EXAMPLES_BUILD=""




    mowgli_patricia_add(guess_impl_list, lang, impl);
}

void
libguess_init(void)
{
    mowgli_init();

    /* check if already initialized */
    if (guess_impl_list != NULL)
        return;

{
    guess_impl_f impl;

    libguess_init();

    impl = mowgli_patricia_retrieve(guess_impl_list, lang);
    if (impl != NULL)

Lines 82-85 typedef void (*libguess_result_f)(const Link Here

(-)libguess-1.1/src/libguess/libguess.h (+5 lines)
82		82
83	const char libguess_determine_encoding(const char buf, int buflen, const char *langset);	83	const char libguess_determine_encoding(const char buf, int buflen, const char *langset);
84		84
		85	/* In a multi-threaded application, libguess must be initialized before use in
		86	* order to prevent race conditions. In a single-threaded application, calling
		87	* libguess_init() explicitly is not necessary. */
		88	void libguess_init(void);
		89
85	#endif	90	#endif

Return to bug 490292

Lines 19-29 guess_impl_register(const char *lang, gu Link Here

(-)libguess-1.1/src/libguess/guess.c (-5 / +3 lines)
19	mowgli_patricia_add(guess_impl_list, lang, impl);	19	mowgli_patricia_add(guess_impl_list, lang, impl);
20	}	20	}
21		21
22	static void	22	void
23	guess_init(void)	23	libguess_init(void)
24	{	24	{
25	mowgli_init();
26
27	/* check if already initialized */	25	/* check if already initialized */
28	if (guess_impl_list != NULL)	26	if (guess_impl_list != NULL)
29	return;	27	return;
Lines 48-54 libguess_determine_encoding(const char * Link Here
48	{	46	{
49	guess_impl_f impl;	47	guess_impl_f impl;
50		48
51	guess_init();	49	libguess_init();
52		50
53	impl = mowgli_patricia_retrieve(guess_impl_list, lang);	51	impl = mowgli_patricia_retrieve(guess_impl_list, lang);
54	if (impl != NULL)	52	if (impl != NULL)

Lines 2-10 Link Here

(-)libguess-1.1/configure.ac (-2 / +3 lines)
2	# Process this file with autoconf to produce a configure script.	2	# Process this file with autoconf to produce a configure script.
3		3
4	AC_PREREQ(2.59)	4	AC_PREREQ(2.59)
5	AC_INIT([libguess], [1.1], [bugs+libguess@atheme.org])	5	AC_INIT([libguess], [1.2], [bugs+libguess@atheme.org])
6	AC_CONFIG_SRCDIR([src/libguess/guess.c])	6	AC_CONFIG_SRCDIR([src/libguess/guess.c])
7	AC_CONFIG_HEADER([src/libguess/autoconf.h])	7	AC_CONFIG_HEADER([src/libguess/autoconf.h])
		8	AC_CONFIG_MACRO_DIR([m4])
8		9
9	AC_CANONICAL_HOST	10	AC_CANONICAL_HOST
10	AC_CANONICAL_TARGET	11	AC_CANONICAL_TARGET
Lines 40-46 AC_CHECK_FUNCS([memset setlocale strcase Link Here
40	AC_CHECK_FUNCS([printf sprintf snprintf vsnprintf gettimeofday strndup strlcpy strlcat])	41	AC_CHECK_FUNCS([printf sprintf snprintf vsnprintf gettimeofday strndup strlcpy strlcat])
41	AC_FUNC_STAT	42	AC_FUNC_STAT
42		43
43	PKG_CHECK_MODULES([MOWGLI], [libmowgli >= 0.9.50], [], [AC_MSG_ERROR([Install Mowgli from http://atheme.org/project/mowgli.])])	44	PKG_CHECK_MODULES([MOWGLI], [libmowgli-2 >= 2.0.0], [], [AC_MSG_ERROR([Install Mowgli from http://atheme.org/project/mowgli.])])
44		45
45	# Check for optional features.	46	# Check for optional features.
46	EXAMPLES_BUILD=""	47	EXAMPLES_BUILD=""