Attachment #1379 for bug #512

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




    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'

    )
    AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")

        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 /usr/local/bin /opt/local/bin], [XMLLINT=""])

        if test -n "$MEINPROC" && test ! "$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="/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="/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 31-37 Link Here

(-)knmap-2.1/src/Makefile.am.trinity (-1 / +1 lines)
31	tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \	31	tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \
32	scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp	32	scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp
33	knmap_LDFLAGS = $(KDE_RPATH) $(all_libraries)	33	knmap_LDFLAGS = $(KDE_RPATH) $(all_libraries)
34	knmap_LDADD = $(LIB_KIO) $(LIB_KHTML)	34	knmap_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
35		35
36	# this is where the desktop file will go	36	# this is where the desktop file will go
37	shelldesktopdir = $(kde_appsdir)/Utilities	37	shelldesktopdir = $(kde_appsdir)/Utilities

Lines 23-28 Link Here

(-)knmap-2.1/src/scanmonitor.cpp.trinity (+1 lines)
23	#include <errno.h>	23	#include <errno.h>
24	#include <stdio.h>	24	#include <stdio.h>
25	#include <string.h>	25	#include <string.h>
		26	#include <unistd.h>
26	#include <sys/select.h>	27	#include <sys/select.h>
27	#include <sys/time.h>	28	#include <sys/time.h>
28		29




{
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 2.52, 2.53 or 2.54"

 
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 2.52 or 2.53 (part of autoconf)"

    echo "*** KDE requires automake 1.6.1 or newer"
    exit 1
    ;;
  automake*1.6.* | automake*1.7* | automake*1.8.* | automake*1.9* | automake*1.1[0-9]* ) : ;;
  "" )
    echo "*** AUTOMAKE NOT FOUND!."
    echo "*** KDE requires automake 1.6.1 or newer"

echo "*** Creating configure"
call_and_fix_autoconf

if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
  echo "*** Creating config.h template"
  $AUTOHEADER || exit 1
fi

Lines 41-47 Link Here

(-)knmap-2.1/admin/configure.in.min.ORI (-1 / +1 lines)
41	KDE_SET_PREFIX	41	KDE_SET_PREFIX
42		42
43	dnl generate the config header	43	dnl generate the config header
44	AM_CONFIG_HEADER(config.h) dnl at the distribution this done	44	AC_CONFIG_HEADER(config.h) dnl at the distribution this done
45		45
46	dnl Checks for programs.	46	dnl Checks for programs.
47	AC_CHECK_COMPILERS	47	AC_CHECK_COMPILERS

Return to bug 512

Lines 468-481 Link Here

(-)knmap-2.1/admin/acinclude.m4.in (-10 / +10 lines)
468	if test "$kde_qtver" = "2"; then	468	if test "$kde_qtver" = "2"; then
469	kde_moduledir='\${libdir}/kde2'	469	kde_moduledir='\${libdir}/kde2'
470	else	470	else
471	kde_moduledir='\${libdir}/kde3'	471	kde_moduledir='\${libdir}/trinity'
472	fi	472	fi
473	fi	473	fi
474	if test -z "$kde_styledir"; then	474	if test -z "$kde_styledir"; then
475	kde_styledir='\${libdir}/kde3/plugins/styles'	475	kde_styledir='\${libdir}/trinity/plugins/styles'
476	fi	476	fi
477	if test -z "$kde_widgetdir"; then	477	if test -z "$kde_widgetdir"; then
478	kde_widgetdir='\${libdir}/kde3/plugins/designer'	478	kde_widgetdir='\${libdir}/trinity/plugins/designer'
479	fi	479	fi
480	if test -z "$xdg_appsdir"; then	480	if test -z "$xdg_appsdir"; then
481	xdg_appsdir='\${datadir}/applications/kde'	481	xdg_appsdir='\${datadir}/applications/kde'
Lines 542-548 Link Here
542	)	542	)
543	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")	543	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
544		544
545	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"	545	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"
546	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	546	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
547	if test -n "$KDEDIRS"; then	547	if test -n "$KDEDIRS"; then
548	kde_save_IFS=$IFS	548	kde_save_IFS=$IFS
Lines 578-584 Link Here
578	KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])	578	KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
579		579
580	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then	580	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
581	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"	581	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
582	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"	582	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
583	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)	583	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
584	if test "$KDE_XSL_STYLESHEET" = "NO"; then	584	if test "$KDE_XSL_STYLESHEET" = "NO"; then
Lines 1738-1744 Link Here
1738		1738
1739	if test -z "$1"; then	1739	if test -z "$1"; then
1740		1740
1741	kde_incdirs="/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"	1741	kde_incdirs="/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"
1742	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"	1742	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
1743	kde_incdirs="$ac_kde_includes $kde_incdirs"	1743	kde_incdirs="$ac_kde_includes $kde_incdirs"
1744	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)	1744	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
Lines 1750-1756 Link Here
1750	So, check this please and use another prefix!])	1750	So, check this please and use another prefix!])
1751	fi	1751	fi
1752		1752
1753	kde_libdirs="/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}"	1753	kde_libdirs="/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}"
1754	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"	1754	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1755	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"	1755	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1756	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)	1756	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
Lines 1758-1764 Link Here
1758		1758
1759	kde_widgetdir=NO	1759	kde_widgetdir=NO
1760	dnl this might be somewhere else	1760	dnl this might be somewhere else
1761	AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)	1761	AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
1762		1762
1763	if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then	1763	if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
1764	AC_MSG_ERROR([	1764	AC_MSG_ERROR([
Lines 1766-1779 Link Here
1766	So, check this please and use another prefix!])	1766	So, check this please and use another prefix!])
1767	fi	1767	fi
1768		1768
1769	if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then	1769	if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
1770	AC_MSG_ERROR([	1770	AC_MSG_ERROR([
1771	I can't find the designer plugins. These are required and should have been installed	1771	I can't find the designer plugins. These are required and should have been installed
1772	by kdelibs])	1772	by kdelibs])
1773	fi	1773	fi
1774		1774
1775	if test -n "$kde_widgetdir"; then	1775	if test -n "$kde_widgetdir"; then
1776	kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"	1776	kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
1777	fi	1777	fi
1778		1778
1779		1779

Lines 29-35 Link Here

(-)knmap-2.1/admin/cvs.sh.trinity (-4 / +4 lines)
29	{	29	{
30	AUTOCONF_VERSION=`$AUTOCONF --version \| head -n 1`	30	AUTOCONF_VERSION=`$AUTOCONF --version \| head -n 1`
31	case $AUTOCONF_VERSION in	31	case $AUTOCONF_VERSION in
32	Autoconf2.5 \| autoconf2.5 ) : ;;	32	Autoconf2.5 \| autoconf2.5 \| autoconf2.6 ) : ;;
33	"" )	33	"" )
34	echo "*** AUTOCONF NOT FOUND!."	34	echo "*** AUTOCONF NOT FOUND!."
35	echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"	35	echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
Lines 44-50 Link Here
44		44
45	AUTOHEADER_VERSION=`$AUTOHEADER --version \| head -n 1`	45	AUTOHEADER_VERSION=`$AUTOHEADER --version \| head -n 1`
46	case $AUTOHEADER_VERSION in	46	case $AUTOHEADER_VERSION in
47	Autoconf2.5 \| autoheader2.5 ) : ;;	47	Autoconf2.5 \| autoheader2.5 \| autoheader2.6 ) : ;;
48	"" )	48	"" )
49	echo "*** AUTOHEADER NOT FOUND!."	49	echo "*** AUTOHEADER NOT FOUND!."
50	echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"	50	echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
Lines 64-70 Link Here
64	echo "*** KDE requires automake 1.6.1 or newer"	64	echo "*** KDE requires automake 1.6.1 or newer"
65	exit 1	65	exit 1
66	;;	66	;;
67	automake1.6. \| automake1.7 \| automake1.8. \| automake1.9 ) : ;;	67	automake1.6. \| automake1.7 \| automake1.8. \| automake1.9 \| automake1.1[0-9] ) : ;;
68	"" )	68	"" )
69	echo "*** AUTOMAKE NOT FOUND!."	69	echo "*** AUTOMAKE NOT FOUND!."
70	echo "*** KDE requires automake 1.6.1 or newer"	70	echo "*** KDE requires automake 1.6.1 or newer"
Lines 123-129 Link Here
123	echo "*** Creating configure"	123	echo "*** Creating configure"
124	call_and_fix_autoconf	124	call_and_fix_autoconf
125		125
126	if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then	126	if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
127	echo "*** Creating config.h template"	127	echo "*** Creating config.h template"
128	$AUTOHEADER \|\| exit 1	128	$AUTOHEADER \|\| exit 1
129	fi	129	fi