Attachment #1397 for bug #437

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 437
Collapse All | Expand All

Lines 68-74 Link Here

(-)knoda-0.8.3/admin/cvs.sh.trinity (-1 / +1 lines)
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.1[0-9] )
72	echo "*** $AUTOMAKE_STRING found."	72	echo "*** $AUTOMAKE_STRING found."
73	UNSERMAKE=no	73	UNSERMAKE=no
74	;;	74	;;




    if test "$kde_qtver" = "2"; then
      kde_moduledir='\${libdir}/kde2'
    else
      kde_moduledir='\${libdir}/trinity'
    fi
  fi
  if test -z "$kde_styledir"; then
    kde_styledir='\${libdir}/trinity/plugins/styles'
  fi
  if test -z "$kde_widgetdir"; then
    kde_widgetdir='\${libdir}/trinity/plugins/designer'
  fi
  if test -z "$xdg_appsdir"; then
    xdg_appsdir='\${datadir}/applications/kde'


AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
    if test -n "$KDEDIRS"; then
       kde_save_IFS=$IFS

        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])

        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
	    if test "$KDE_XSL_STYLESHEET" = "NO"; then


if test -z "$1"; then

kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)

So, check this please and use another prefix!])
fi

kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)


kde_widgetdir=NO
dnl this might be somewhere else
AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)

if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([

So, check this please and use another prefix!])
fi

if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi

if test -n "$kde_widgetdir"; then
    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi



Lines 142-148 Link Here

(-)knoda-0.8.3/hk_kdeclasses/Makefile.am.ORI (-1 / +1 lines)
142	knodamaindockwindowbase.cpp	142	knodamaindockwindowbase.cpp
143		143
144		144
145	libhk_kdeclasses_la_LIBADD = -lkatepartinterfaces -lkdeprint -lkmdi $(LIB_KPARTS) $(KDE_PLUGIN)	145	libhk_kdeclasses_la_LIBADD = -lkatepartinterfaces -lkdeprint -lkmdi $(LIB_KPARTS) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
146		146
147	# this is where the XML-GUI resource file goes	147	# this is where the XML-GUI resource file goes
148	rcdir = $(kde_datadir)/hk_kdeclasses	148	rcdir = $(kde_datadir)/hk_kdeclasses

Return to bug 437

Lines 479-492 Link Here

(-)knoda-0.8.3/admin/acinclude.m4.in.ORI (-10 / +10 lines)
479	if test "$kde_qtver" = "2"; then	479	if test "$kde_qtver" = "2"; then
480	kde_moduledir='\${libdir}/kde2'	480	kde_moduledir='\${libdir}/kde2'
481	else	481	else
482	kde_moduledir='\${libdir}/kde3'	482	kde_moduledir='\${libdir}/trinity'
483	fi	483	fi
484	fi	484	fi
485	if test -z "$kde_styledir"; then	485	if test -z "$kde_styledir"; then
486	kde_styledir='\${libdir}/kde3/plugins/styles'	486	kde_styledir='\${libdir}/trinity/plugins/styles'
487	fi	487	fi
488	if test -z "$kde_widgetdir"; then	488	if test -z "$kde_widgetdir"; then
489	kde_widgetdir='\${libdir}/kde3/plugins/designer'	489	kde_widgetdir='\${libdir}/trinity/plugins/designer'
490	fi	490	fi
491	if test -z "$xdg_appsdir"; then	491	if test -z "$xdg_appsdir"; then
492	xdg_appsdir='\${datadir}/applications/kde'	492	xdg_appsdir='\${datadir}/applications/kde'
Lines 546-552 Link Here
546		546
547	AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],	547	AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
548	[	548	[
549	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"	549	kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
550	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	550	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
551	if test -n "$KDEDIRS"; then	551	if test -n "$KDEDIRS"; then
552	kde_save_IFS=$IFS	552	kde_save_IFS=$IFS
Lines 612-618 Link Here
612	KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])	612	KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
613		613
614	if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then	614	if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
615	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"	615	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
616	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"	616	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
617	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)	617	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
618	if test "$KDE_XSL_STYLESHEET" = "NO"; then	618	if test "$KDE_XSL_STYLESHEET" = "NO"; then
Lines 1793-1799 Link Here
1793		1793
1794	if test -z "$1"; then	1794	if test -z "$1"; then
1795		1795
1796	kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"	1796	kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
1797	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"	1797	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1798	kde_incdirs="$ac_kde_includes $kde_incdirs"	1798	kde_incdirs="$ac_kde_includes $kde_incdirs"
1799	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)	1799	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
Lines 1805-1811 Link Here
1805	So, check this please and use another prefix!])	1805	So, check this please and use another prefix!])
1806	fi	1806	fi
1807		1807
1808	kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"	1808	kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1809	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"	1809	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1810	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"	1810	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1811	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)	1811	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
Lines 1813-1819 Link Here
1813		1813
1814	kde_widgetdir=NO	1814	kde_widgetdir=NO
1815	dnl this might be somewhere else	1815	dnl this might be somewhere else
1816	AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)	1816	AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1817		1817
1818	if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then	1818	if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1819	AC_MSG_ERROR([	1819	AC_MSG_ERROR([
Lines 1821-1834 Link Here
1821	So, check this please and use another prefix!])	1821	So, check this please and use another prefix!])
1822	fi	1822	fi
1823		1823
1824	if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then	1824	if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1825	AC_MSG_ERROR([	1825	AC_MSG_ERROR([
1826	I can't find the designer plugins. These are required and should have been installed	1826	I can't find the designer plugins. These are required and should have been installed
1827	by kdelibs])	1827	by kdelibs])
1828	fi	1828	fi
1829		1829
1830	if test -n "$kde_widgetdir"; then	1830	if test -n "$kde_widgetdir"; then
1831	kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"	1831	kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1832	fi	1832	fi
1833		1833
1834		1834