|
Lines 623-658
Link Here
|
| 623 |
fi |
623 |
fi |
| 624 |
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) |
624 |
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) |
| 625 |
trinity2ornewer=1 |
625 |
trinity14ornewer=1 |
| 626 |
trinity3ornewer=1 |
626 |
if test "$kde_qtver" = "3"; then |
| 627 |
if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then |
627 |
if test "$KDECONFIG" != "compiled"; then |
| 628 |
trinity2ornewer= |
628 |
if test `$KDECONFIG --version | grep TDE | sed 's/TDE: R\(..\).*/\1/'` -lt 14; then |
| 629 |
trinity3ornewer= |
629 |
trinity14ornewer= |
| 630 |
else |
|
|
| 631 |
if test "$kde_qtver" = "3"; then |
| 632 |
if test "$kde_qtsubver" -le 1; then |
| 633 |
trinity2ornewer= |
| 634 |
fi |
| 635 |
if test "$kde_qtsubver" -le 2; then |
| 636 |
trinity3ornewer= |
| 637 |
fi |
| 638 |
if test "$KDECONFIG" != "compiled"; then |
| 639 |
if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then |
| 640 |
trinity3ornewer= |
| 641 |
fi |
| 642 |
fi |
| 643 |
fi |
| 644 |
if test "$kde_qtver" = "4"; then |
| 645 |
trinity2ornewer=1 |
| 646 |
trinity3ornewer=1 |
| 647 |
fi |
630 |
fi |
|
|
631 |
fi |
| 632 |
fi |
| 633 |
if test "$kde_qtver" = "4"; then |
| 634 |
trinity14ornewer=1 |
| 648 |
fi |
635 |
fi |
| 649 |
if test -n "$trinity2ornewer"; then |
636 |
if test -n "$trinity14ornewer"; then |
| 650 |
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) |
637 |
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) |
| 651 |
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
638 |
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
| 652 |
fi |
|
|
| 653 |
if test -n "$trinity3ornewer"; then |
| 654 |
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) |
639 |
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) |
| 655 |
AC_SUBST(MAKEKDEWIDGETS) |
640 |
AC_SUBST(MAKEKDEWIDGETS) |
| 656 |
fi |
641 |
fi |
|
Lines 670-676
Link Here
|
| 670 |
fi |
655 |
fi |
| 671 |
DCOP_DEPENDENCIES='$(DCOPIDL)' |
656 |
DCOP_DEPENDENCIES='$(DCOPIDL)' |
| 672 |
if test -n "$trinity2ornewer"; then |
657 |
if test -n "$trinity14ornewer"; then |
| 673 |
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' |
658 |
KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' |
| 674 |
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' |
659 |
DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' |
| 675 |
AC_SUBST(KCONFIG_COMPILER) |
660 |
AC_SUBST(KCONFIG_COMPILER) |
|
Lines 2907-2913
Link Here
|
| 2907 |
if test "$build_arts" '!=' "no"; then |
2892 |
if test "$build_arts" '!=' "no"; then |
| 2908 |
KDE_FIND_PATH(mcopidl, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) |
2893 |
KDE_FIND_PATH(mcopidl, TQTMCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)]) |
| 2909 |
fi |
2894 |
fi |
| 2910 |
if test -n "$trinity2ornewer"; then |
2895 |
if test -n "$trinity14ornewer"; then |
| 2911 |
KDE_FIND_PATH(dcopidlng, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
2896 |
KDE_FIND_PATH(dcopidlng, TQTDCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) |
| 2912 |
fi |
2897 |
fi |