Attachment #415 for bug #860

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

Lines 884-890 Link Here

(-)libtqt-perl/PerlTQt/TQt.pm (-1 / +1 lines)
884	# try to avoid KDE's buggy malloc	884	# try to avoid KDE's buggy malloc
885	# only works for --enable-fast-malloc,	885	# only works for --enable-fast-malloc,
886	# not when --enable-fast-malloc=full	886	# not when --enable-fast-malloc=full
887	$ENV{'KDE_MALLOC'} = 0;	887	$ENV{'TDE_MALLOC'} = 0;
888		888
889	TQt::_internal::init();	889	TQt::_internal::init();

Lines 93-102 Link Here

(-)libtqt-perl/Makefile.PL (-2 / +2 lines)
93		93
94	unshift(@ARGV, "--with-qt-dir=$res") if $res;	94	unshift(@ARGV, "--with-qt-dir=$res") if $res;
95		95
96	unless ($ENV{'KDEDIR'} or grep /--prefix/, @ARGV)	96	unless ($ENV{'TDEDIR'} or grep /--prefix/, @ARGV)
97	{	97	{
98	print "\n!!!!!!!!!!!! WARNING !!!!!!!!!!!!\n".	98	print "\n!!!!!!!!!!!! WARNING !!!!!!!!!!!!\n".
99	" Your KDEDIR environment variable is not set and you\n".	99	" Your TDEDIR environment variable is not set and you\n".
100	"did not use the '--prefix=' commandline option.\n";	100	"did not use the '--prefix=' commandline option.\n";
101	print "KDE-3 isn't required at all. However, if it's installed on your system,\n".	101	print "KDE-3 isn't required at all. However, if it's installed on your system,\n".
102	"it is much better to specify it's location since PerlTQt uses (or build, if\n".	102	"it is much better to specify it's location since PerlTQt uses (or build, if\n".




For more details about this problem, look at the end of config.log.])
fi

if eval `TDEDIR= ./conftest 2>&5`; then
  kde_result=done
else
  kde_result=problems
fi

TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes

KDE_SET_PATHS($kde_result)

    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/kde3/bin /usr/kde/bin /usr/local/kde/bin"
        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
        if test -n "$TDEDIRS"; then
           kde_save_IFS=$IFS
           IFS=:
           for dir in $TDEDIRS; do
                kde_default_bindirs="$dir/bin $kde_default_bindirs "
           done
           IFS=$kde_save_IFS

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

if test -z "$1"; then

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

fi

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}"
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"

AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS

AC_DEFUN(KDE_SET_PREFIX,
[
  unset CDPATH
  dnl make $TDEDIR the default for the installation
  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})

  if test "x$prefix" = "xNONE"; then
    prefix=$ac_default_prefix




For more details about this problem, look at the end of config.log.])
fi

if eval `TDEDIR= ./conftest 2>&5`; then
  kde_result=done
else
  kde_result=problems
fi

TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes

KDE_SET_PATHS($kde_result)

    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/kde3/bin /usr/kde/bin /usr/local/kde/bin"
        test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
        if test -n "$TDEDIRS"; then
           kde_save_IFS=$IFS
           IFS=:
           for dir in $TDEDIRS; do
                kde_default_bindirs="$dir/bin $kde_default_bindirs "
           done
           IFS=$kde_save_IFS

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

if test -z "$1"; then

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

fi

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}"
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"

AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS

AC_DEFUN(KDE_SET_PREFIX,
[
  unset CDPATH
  dnl make $TDEDIR the default for the installation
  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})

  if test "x$prefix" = "xNONE"; then
    prefix=$ac_default_prefix





dnl ------------------------------------------------------------------------
dnl Reimplementation of AC_BASE_PATH_KDE avoiding the need for
dnl a prefix pointing to TDEDIR.
dnl $(KDE_LDFLAGS) will be the kdeliblocation (if any)
dnl and $(kde_includes) will be the kdehdrlocation (if any)
dnl ------------------------------------------------------------------------

if test -z "$1"; then

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

fi

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}"
test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"

Lines 99-105 Link Here

(-)libtqt-perl/doc/fr/PerlQt.pod (-1 / +1 lines)
99	Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.	99	Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.
100		100
101	Le lieu d'installation privilégié de SMOKE et de PUIC est le système de	101	Le lieu d'installation privilégié de SMOKE et de PUIC est le système de
102	fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas	102	fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable TDEDIR n'est pas
103	définie), spécifier ce lieu avec l'option C<--prefix> de C<configure>'s. Ainsi :	103	définie), spécifier ce lieu avec l'option C<--prefix> de C<configure>'s. Ainsi :
104		104
105	perl Makefile.PL --prefix=/usr	105	perl Makefile.PL --prefix=/usr

Lines 152-158 Link Here

(-)libtqt-perl/doc/fr/index.html (-1 / +1 lines)
152	make install</pre>	152	make install</pre>
153	<p>Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.</p>	153	<p>Cela installera PerlTQt, Puic et les utilitaires pqtsh et pqtapi.</p>
154	<p>Le lieu d'installation privilégié de SMOKE et de PUIC est le système de	154	<p>Le lieu d'installation privilégié de SMOKE et de PUIC est le système de
155	fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable KDEDIR n'est pas	155	fichiers de KDE3. Si KDE3 n'est pas installé (ou que la variable TDEDIR n'est pas
156	définie), spécifier ce lieu avec l'option <code>--prefix</code> de <code>configure</code>'s. Ainsi :</p>	156	définie), spécifier ce lieu avec l'option <code>--prefix</code> de <code>configure</code>'s. Ainsi :</p>
157	<pre>	157	<pre>
158	perl Makefile.PL --prefix=/usr</pre>	158	perl Makefile.PL --prefix=/usr</pre>

Lines 64-70 Link Here

(-)libtqt-perl/smoke/qt/generate.pl.in (-1 / +1 lines)
64	'qwindowsxpstyle.h' => 1 # play on the safe side	64	'qwindowsxpstyle.h' => 1 # play on the safe side
65	);	65	);
66		66
67	# Some systems have a TQTDIR = KDEDIR = PREFIX	67	# Some systems have a TQTDIR = TDEDIR = PREFIX
68	# We need a complete list	68	# We need a complete list
69		69
70	my %includes;	70	my %includes;

Return to bug 860

Lines 377-389 Link Here

(-)libtqt-perl/acinclude.m4 (-11 / +11 lines)
377	For more details about this problem, look at the end of config.log.])	377	For more details about this problem, look at the end of config.log.])
378	fi	378	fi
379		379
380	if eval `KDEDIR= ./conftest 2>&5`; then	380	if eval `TDEDIR= ./conftest 2>&5`; then
381	kde_result=done	381	kde_result=done
382	else	382	else
383	kde_result=problems	383	kde_result=problems
384	fi	384	fi
385		385
386	KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log	386	TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
387	kde_have_all_paths=yes	387	kde_have_all_paths=yes
388		388
389	KDE_SET_PATHS($kde_result)	389	KDE_SET_PATHS($kde_result)
Lines 539-549 Link Here
539	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")	539	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
540		540
541	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"	541	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"
542	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	542	test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
543	if test -n "$KDEDIRS"; then	543	if test -n "$TDEDIRS"; then
544	kde_save_IFS=$IFS	544	kde_save_IFS=$IFS
545	IFS=:	545	IFS=:
546	for dir in $KDEDIRS; do	546	for dir in $TDEDIRS; do
547	kde_default_bindirs="$dir/bin $kde_default_bindirs "	547	kde_default_bindirs="$dir/bin $kde_default_bindirs "
548	done	548	done
549	IFS=$kde_save_IFS	549	IFS=$kde_save_IFS
Lines 560-566 Link Here
560		560
561	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then	561	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
562	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"	562	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
563	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"	563	test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
564	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)	564	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
565	if test "$KDE_XSL_STYLESHEET" = "NO"; then	565	if test "$KDE_XSL_STYLESHEET" = "NO"; then
566	KDE_XSL_STYLESHEET=""	566	KDE_XSL_STYLESHEET=""
Lines 1665-1671 Link Here
1665	if test -z "$1"; then	1665	if test -z "$1"; then
1666		1666
1667	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"	1667	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1668	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"	1668	test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1669	kde_incdirs="$ac_kde_includes $kde_incdirs"	1669	kde_incdirs="$ac_kde_includes $kde_incdirs"
1670	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)	1670	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1671	ac_kde_includes="$kde_incdir"	1671	ac_kde_includes="$kde_incdir"
Lines 1677-1683 Link Here
1677	fi	1677	fi
1678		1678
1679	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}"	1679	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}"
1680	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"	1680	test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
1681	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"	1681	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1682	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)	1682	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1683	ac_kde_libraries="$kde_libdir"	1683	ac_kde_libraries="$kde_libdir"
Lines 3043-3049 Link Here
3043	AC_ARG_PROGRAM	3043	AC_ARG_PROGRAM
3044	AM_INIT_AUTOMAKE($1, $2)	3044	AM_INIT_AUTOMAKE($1, $2)
3045	AM_DISABLE_LIBRARIES	3045	AM_DISABLE_LIBRARIES
3046	AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})	3046	AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3047	AC_CHECK_COMPILERS	3047	AC_CHECK_COMPILERS
3048	KDE_PROG_LIBTOOL	3048	KDE_PROG_LIBTOOL
3049	AM_KDE_WITH_NLS	3049	AM_KDE_WITH_NLS
Lines 4595-4602 Link Here
4595	AC_DEFUN(KDE_SET_PREFIX,	4595	AC_DEFUN(KDE_SET_PREFIX,
4596	[	4596	[
4597	unset CDPATH	4597	unset CDPATH
4598	dnl make $KDEDIR the default for the installation	4598	dnl make $TDEDIR the default for the installation
4599	AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})	4599	AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4600		4600
4601	if test "x$prefix" = "xNONE"; then	4601	if test "x$prefix" = "xNONE"; then
4602	prefix=$ac_default_prefix	4602	prefix=$ac_default_prefix

Lines 389-401 Link Here

(-)libtqt-perl/aclocal.m4 (-11 / +11 lines)
389	For more details about this problem, look at the end of config.log.])	389	For more details about this problem, look at the end of config.log.])
390	fi	390	fi
391		391
392	if eval `KDEDIR= ./conftest 2>&5`; then	392	if eval `TDEDIR= ./conftest 2>&5`; then
393	kde_result=done	393	kde_result=done
394	else	394	else
395	kde_result=problems	395	kde_result=problems
396	fi	396	fi
397		397
398	KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log	398	TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
399	kde_have_all_paths=yes	399	kde_have_all_paths=yes
400		400
401	KDE_SET_PATHS($kde_result)	401	KDE_SET_PATHS($kde_result)
Lines 551-561 Link Here
551	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")	551	AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
552		552
553	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"	553	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"
554	test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"	554	test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
555	if test -n "$KDEDIRS"; then	555	if test -n "$TDEDIRS"; then
556	kde_save_IFS=$IFS	556	kde_save_IFS=$IFS
557	IFS=:	557	IFS=:
558	for dir in $KDEDIRS; do	558	for dir in $TDEDIRS; do
559	kde_default_bindirs="$dir/bin $kde_default_bindirs "	559	kde_default_bindirs="$dir/bin $kde_default_bindirs "
560	done	560	done
561	IFS=$kde_save_IFS	561	IFS=$kde_save_IFS
Lines 572-578 Link Here
572		572
573	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then	573	if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
574	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"	574	kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
575	test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"	575	test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
576	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)	576	AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
577	if test "$KDE_XSL_STYLESHEET" = "NO"; then	577	if test "$KDE_XSL_STYLESHEET" = "NO"; then
578	KDE_XSL_STYLESHEET=""	578	KDE_XSL_STYLESHEET=""
Lines 1677-1683 Link Here
1677	if test -z "$1"; then	1677	if test -z "$1"; then
1678		1678
1679	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"	1679	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
1680	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"	1680	test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
1681	kde_incdirs="$ac_kde_includes $kde_incdirs"	1681	kde_incdirs="$ac_kde_includes $kde_incdirs"
1682	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)	1682	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
1683	ac_kde_includes="$kde_incdir"	1683	ac_kde_includes="$kde_incdir"
Lines 1689-1695 Link Here
1689	fi	1689	fi
1690		1690
1691	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}"	1691	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}"
1692	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"	1692	test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
1693	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"	1693	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1694	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)	1694	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1695	ac_kde_libraries="$kde_libdir"	1695	ac_kde_libraries="$kde_libdir"
Lines 3055-3061 Link Here
3055	AC_ARG_PROGRAM	3055	AC_ARG_PROGRAM
3056	AM_INIT_AUTOMAKE($1, $2)	3056	AM_INIT_AUTOMAKE($1, $2)
3057	AM_DISABLE_LIBRARIES	3057	AM_DISABLE_LIBRARIES
3058	AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})	3058	AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
3059	AC_CHECK_COMPILERS	3059	AC_CHECK_COMPILERS
3060	KDE_PROG_LIBTOOL	3060	KDE_PROG_LIBTOOL
3061	AM_KDE_WITH_NLS	3061	AM_KDE_WITH_NLS
Lines 4607-4614 Link Here
4607	AC_DEFUN(KDE_SET_PREFIX,	4607	AC_DEFUN(KDE_SET_PREFIX,
4608	[	4608	[
4609	unset CDPATH	4609	unset CDPATH
4610	dnl make $KDEDIR the default for the installation	4610	dnl make $TDEDIR the default for the installation
4611	AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})	4611	AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
4612		4612
4613	if test "x$prefix" = "xNONE"; then	4613	if test "x$prefix" = "xNONE"; then
4614	prefix=$ac_default_prefix	4614	prefix=$ac_default_prefix

Lines 62-68 Link Here

(-)libtqt-perl/configure.in (-3 / +3 lines)
62		62
63	dnl ------------------------------------------------------------------------	63	dnl ------------------------------------------------------------------------
64	dnl Reimplementation of AC_BASE_PATH_KDE avoiding the need for	64	dnl Reimplementation of AC_BASE_PATH_KDE avoiding the need for
65	dnl a prefix pointing to KDEDIR.	65	dnl a prefix pointing to TDEDIR.
66	dnl $(KDE_LDFLAGS) will be the kdeliblocation (if any)	66	dnl $(KDE_LDFLAGS) will be the kdeliblocation (if any)
67	dnl and $(kde_includes) will be the kdehdrlocation (if any)	67	dnl and $(kde_includes) will be the kdehdrlocation (if any)
68	dnl ------------------------------------------------------------------------	68	dnl ------------------------------------------------------------------------
Lines 110-116 Link Here
110	if test -z "$1"; then	110	if test -z "$1"; then
111		111
112	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"	112	kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
113	test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/tde $KDEDIR $kde_incdirs"	113	test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
114	kde_incdirs="$ac_kde_includes $kde_incdirs"	114	kde_incdirs="$ac_kde_includes $kde_incdirs"
115	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)	115	AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
116	ac_kde_includes="$kde_incdir"	116	ac_kde_includes="$kde_incdir"
Lines 123-129 Link Here
123	fi	123	fi
124		124
125	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}"	125	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}"
126	test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"	126	test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${kdelibsuff} $TDEDIR $kde_libdirs"
127	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"	127	kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
128	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)	128	AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
129	ac_kde_libraries="$kde_libdir"	129	ac_kde_libraries="$kde_libdir"