Attachment #120037 for bug #179285




if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
    AC_MSG_RESULT([external])
    SYSTEM_HUNSPELL=YES
    OLDHUNSPELL=YES
    AC_LANG(C++)
    AC_CHECK_HEADER(hunspell.hxx, [],
    [

        [AC_MSG_ERROR(hunspell headers not found.)], [])
       ], [])
    AC_CHECK_LIB(hunspell, main, [],
           [ OLDHUNSPELL=NO ], [])
    if test "$OLDHUNSPELL" = "NO"; then 
        PKG_CHECK_MODULES(HUNSPELL, [hunspell],
        [SYSTEM_HUNSPELL=YES] , [SYSTEM_HUNSPELL=NO])
        if test "$SYSTEM_HUNSPELL" = "YES"; then
            HUNSPELLLIB="$HUNSPELL_LIBS"
            AC_SUBST(HUNSPELLLIB)
        fi
    fi
else
    AC_MSG_RESULT([internal])
    SYSTEM_HUNSPELL=NO

Lines 1899-1904 Link Here

(-)config_office/set_soenv.in.org (+1 lines)
1899	ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );	1899	ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
1900	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );	1900	ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
1901	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );	1901	ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
		1902	ToFile( "HUNSPELLLIB", "@HUNSPELLLIB@", "e" );
1902	ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );	1903	ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
1903	ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );	1904	ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
1904	ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );	1905	ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );

Return to bug 179285

Lines 4411-4416 Link Here

(-)config_office/configure.in.org (-1 / +10 lines)
4411	if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then	4411	if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
4412	AC_MSG_RESULT([external])	4412	AC_MSG_RESULT([external])
4413	SYSTEM_HUNSPELL=YES	4413	SYSTEM_HUNSPELL=YES
		4414	OLDHUNSPELL=YES
4414	AC_LANG(C++)	4415	AC_LANG(C++)
4415	AC_CHECK_HEADER(hunspell.hxx, [],	4416	AC_CHECK_HEADER(hunspell.hxx, [],
4416	[	4417	[
Lines 4418-4424 Link Here
4418	[AC_MSG_ERROR(hunspell headers not found.)], [])	4419	[AC_MSG_ERROR(hunspell headers not found.)], [])
4419	], [])	4420	], [])
4420	AC_CHECK_LIB(hunspell, main, [],	4421	AC_CHECK_LIB(hunspell, main, [],
4421	[ AC_MSG_ERROR(hunspell library not found.) ], [])	4422	[ OLDHUNSPELL=NO ], [])
		4423	if test "$OLDHUNSPELL" = "NO"; then
		4424	PKG_CHECK_MODULES(HUNSPELL, [hunspell],
		4425	[SYSTEM_HUNSPELL=YES] , [SYSTEM_HUNSPELL=NO])
		4426	if test "$SYSTEM_HUNSPELL" = "YES"; then
		4427	HUNSPELLLIB="$HUNSPELL_LIBS"
		4428	AC_SUBST(HUNSPELLLIB)
		4429	fi
		4430	fi
4422	else	4431	else
4423	AC_MSG_RESULT([internal])	4432	AC_MSG_RESULT([internal])
4424	SYSTEM_HUNSPELL=NO	4433	SYSTEM_HUNSPELL=NO