Attachment #1446 for bug #691

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 691
Collapse All | Expand All

Lines 4-9 Link Here

(-)configure.in.in (-1 / +1 lines)
4	AC_C_BIGENDIAN	4	AC_C_BIGENDIAN
5	AC_CHECK_KDEMAXPATHLEN	5	AC_CHECK_KDEMAXPATHLEN
6		6
7	AC_CHECK_SWORD(1.5.7, [$ac_use_static])	7	AC_CHECK_SWORD(1.5.8, [$ac_use_static])
8		8
9	AC_CONFIG_FILES([ src/data/kio_sword.css ])	9	AC_CONFIG_FILES([ src/data/kio_sword.css ])




		else
			setGlobalOption("Variants", "Primary Readings");
			
		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale());
	}
	
	/** Return an HTML hyperlinked list of all modules,

			return;
		
		// FIXME - why do I need this call to setLocale()?
		vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
		
		modtextdir = textDirection(module);
			

		
		if (!vk)
			return output;
		vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
			
		module->setSkipConsecutiveLinks(true);
		vk->AutoNormalize(1);

	
	QStringList Renderer::availableLocales()
	{
		list<SWBuf> locales = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
		list<SWBuf>::const_iterator it;
		list<SWBuf>::const_iterator it_end = locales.end();
		QStringList output;




required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
case $AUTOCONF_VERSION in
  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6*) : ;;
  "" )
    echo "*** AUTOCONF NOT FOUND!."
    echo "*** KDE requires autoconf $required_autoconf_version"


AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
case $AUTOHEADER_VERSION in
  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6*) : ;;
  "" )
    echo "*** AUTOHEADER NOT FOUND!."
    echo "*** KDE requires autoheader $required_autoconf_version"

    echo "*** KDE requires automake $required_automake_version"
    exit 1
    ;;
  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
    echo "*** $AUTOMAKE_STRING found."
    UNSERMAKE=no
    ;;

Lines 28-34 Link Here

(-)admin/localm4/sword.m4 (-1 / +1 lines)
28	dnl try to find Sword library files	28	dnl try to find Sword library files
29	AC_MSG_CHECKING([for Sword library files])	29	AC_MSG_CHECKING([for Sword library files])
30	AC_REQUIRE([AC_FIND_ZLIB])	30	AC_REQUIRE([AC_FIND_ZLIB])
31	ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"	31	ac_sword_library_dirs="$ac_sword_dir/lib $libdir $libdir/sword /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
32		32
33	if test "x$ac_static_sword" = "xYES"; then	33	if test "x$ac_static_sword" = "xYES"; then
34	SEARCH_LIBS="libsword.a";	34	SEARCH_LIBS="libsword.a";

Lines 3194-3203 Link Here

(-)admin/acinclude.m4.in (-2 lines)
3194	AC_SUBST([HAVE_GCC_VISIBILITY])	3194	AC_SUBST([HAVE_GCC_VISIBILITY])
3195		3195
3196	if test "$GXX" = "yes"; then	3196	if test "$GXX" = "yes"; then
3197	KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
3198	KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])	3197	KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
3199	KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])	3198	KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
3200	KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS= )
3201	ENABLE_PERMISSIVE_FLAG="-fpermissive"	3199	ENABLE_PERMISSIVE_FLAG="-fpermissive"
3202		3200
3203	if test "$kde_use_pch" = "yes"; then	3201	if test "$kde_use_pch" = "yes"; then

Return to bug 691

Lines 150-156 Link Here

(-)src/renderer.cpp (-4 / +4 lines)
150	else	150	else
151	setGlobalOption("Variants", "Primary Readings");	151	setGlobalOption("Variants", "Primary Readings");
152		152
153	LocaleMgr::systemLocaleMgr.setDefaultLocaleName(options.locale());	153	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(options.locale());
154	}	154	}
155		155
156	/** Return an HTML hyperlinked list of all modules,	156	/** Return an HTML hyperlinked list of all modules,
Lines 471-477 Link Here
471	return;	471	return;
472		472
473	// FIXME - why do I need this call to setLocale()?	473	// FIXME - why do I need this call to setLocale()?
474	vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());	474	vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
475		475
476	modtextdir = textDirection(module);	476	modtextdir = textDirection(module);
477		477
Lines 835-841 Link Here
835		835
836	if (!vk)	836	if (!vk)
837	return output;	837	return output;
838	vk->setLocale(LocaleMgr::systemLocaleMgr.getDefaultLocaleName());	838	vk->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
839		839
840	module->setSkipConsecutiveLinks(true);	840	module->setSkipConsecutiveLinks(true);
841	vk->AutoNormalize(1);	841	vk->AutoNormalize(1);
Lines 1015-1021 Link Here
1015		1015
1016	QStringList Renderer::availableLocales()	1016	QStringList Renderer::availableLocales()
1017	{	1017	{
1018	list<SWBuf> locales = LocaleMgr::systemLocaleMgr.getAvailableLocales();	1018	list<SWBuf> locales = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
1019	list<SWBuf>::const_iterator it;	1019	list<SWBuf>::const_iterator it;
1020	list<SWBuf>::const_iterator it_end = locales.end();	1020	list<SWBuf>::const_iterator it_end = locales.end();
1021	QStringList output;	1021	QStringList output;

Lines 32-38 Link Here

(-)admin/cvs.sh (-3 / +3 lines)
32	required_autoconf_version="2.53 or newer"	32	required_autoconf_version="2.53 or newer"
33	AUTOCONF_VERSION=`$AUTOCONF --version \| head -n 1`	33	AUTOCONF_VERSION=`$AUTOCONF --version \| head -n 1`
34	case $AUTOCONF_VERSION in	34	case $AUTOCONF_VERSION in
35	Autoconf2.5 \| autoconf2.5 ) : ;;	35	Autoconf2.5 \| autoconf2.5 \| autoconf2.6) : ;;
36	"" )	36	"" )
37	echo "*** AUTOCONF NOT FOUND!."	37	echo "*** AUTOCONF NOT FOUND!."
38	echo "*** KDE requires autoconf $required_autoconf_version"	38	echo "*** KDE requires autoconf $required_autoconf_version"
Lines 47-53 Link Here
47		47
48	AUTOHEADER_VERSION=`$AUTOHEADER --version \| head -n 1`	48	AUTOHEADER_VERSION=`$AUTOHEADER --version \| head -n 1`
49	case $AUTOHEADER_VERSION in	49	case $AUTOHEADER_VERSION in
50	Autoconf2.5 \| autoheader2.5 ) : ;;	50	Autoconf2.5 \| autoheader2.5 \| autoheader2.6) : ;;
51	"" )	51	"" )
52	echo "*** AUTOHEADER NOT FOUND!."	52	echo "*** AUTOHEADER NOT FOUND!."
53	echo "*** KDE requires autoheader $required_autoconf_version"	53	echo "*** KDE requires autoheader $required_autoconf_version"
Lines 68-74 Link Here
68	echo "*** KDE requires automake $required_automake_version"	68	echo "*** KDE requires automake $required_automake_version"
69	exit 1	69	exit 1
70	;;	70	;;
71	automake1.6. \| automake1.7 \| automake1.8 \| automake1.9)	71	automake1.6. \| automake1.7 \| automake1.8 \| automake1.9 \| automake1.10 \| automake1.11 )
72	echo "*** $AUTOMAKE_STRING found."	72	echo "*** $AUTOMAKE_STRING found."
73	UNSERMAKE=no	73	UNSERMAKE=no
74	;;	74	;;