Adaptation for Trinity

v3.5.13-sru
Slávek Banko 12 years ago
parent 3db67ad9fe
commit 4a399d165e

@ -479,14 +479,14 @@ if test "$1" = "default"; then
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2' kde_moduledir='\${libdir}/kde2'
else else
kde_moduledir='\${libdir}/kde3' kde_moduledir='\${libdir}/trinity'
fi fi
fi fi
if test -z "$kde_styledir"; then if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles' kde_styledir='\${libdir}/trinity/plugins/styles'
fi fi
if test -z "$kde_widgetdir"; then if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer' kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi fi
if test -z "$xdg_appsdir"; then if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde' xdg_appsdir='\${datadir}/applications/kde'
@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
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" 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" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" 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" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
@ -1817,7 +1817,7 @@ fi
if test -z "$1"; 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/kde3/include /opt/kde/include $x_includes $qt_includes" 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" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@ -1829,7 +1829,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi 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}/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}" 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" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@ -1837,7 +1837,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO kde_widgetdir=NO
dnl this might be somewhere else dnl this might be somewhere else
AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir) 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 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
@ -1845,14 +1845,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by kdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi fi

28
configure vendored

@ -2854,7 +2854,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
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" 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" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
@ -31443,7 +31443,7 @@ fi
if test -z ""; then if test -z ""; 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/kde3/include /opt/kde/include $x_includes $qt_includes" 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" test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
@ -31473,7 +31473,7 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi 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}/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}" 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" test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
@ -31498,7 +31498,7 @@ kde_widgetdir=NO
kde_widgetdir=NO kde_widgetdir=NO
for i in $kde_libdirs; for i in $kde_libdirs;
do do
for j in "kde3/plugins/designer/kdewidgets.la"; for j in "trinity/plugins/designer/kdewidgets.la";
do do
echo "configure: 31503: $i/$j" >&5 echo "configure: 31503: $i/$j" >&5
if test -r "$i/$j"; then if test -r "$i/$j"; then
@ -31520,7 +31520,7 @@ So, check this please and use another prefix!" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs" >&5 by kdelibs" >&5
@ -31531,7 +31531,7 @@ by kdelibs" >&2;}
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi fi
@ -31774,14 +31774,14 @@ if test "$ac_use_path_checking" = "default"; then
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2' kde_moduledir='\${libdir}/kde2'
else else
kde_moduledir='\${libdir}/kde3' kde_moduledir='\${libdir}/trinity'
fi fi
fi fi
if test -z "$kde_styledir"; then if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles' kde_styledir='\${libdir}/trinity/plugins/styles'
fi fi
if test -z "$kde_widgetdir"; then if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer' kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi fi
if test -z "$xdg_appsdir"; then if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde' xdg_appsdir='\${datadir}/applications/kde'
@ -32076,14 +32076,14 @@ if test "$ac_use_path_checking" = "default"; then
if test "$kde_qtver" = "2"; then if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2' kde_moduledir='\${libdir}/kde2'
else else
kde_moduledir='\${libdir}/kde3' kde_moduledir='\${libdir}/trinity'
fi fi
fi fi
if test -z "$kde_styledir"; then if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/kde3/plugins/styles' kde_styledir='\${libdir}/trinity/plugins/styles'
fi fi
if test -z "$kde_widgetdir"; then if test -z "$kde_widgetdir"; then
kde_widgetdir='\${libdir}/kde3/plugins/designer' kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi fi
if test -z "$xdg_appsdir"; then if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde' xdg_appsdir='\${datadir}/applications/kde'
@ -32359,7 +32359,7 @@ _ACEOF
fi fi
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" 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" test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
@ -33011,7 +33011,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" 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" test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
KDE_XSL_STYLESHEET=NO KDE_XSL_STYLESHEET=NO

@ -156,7 +156,7 @@
> og tilføj <filename class="directory" > og tilføj <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> i søgestien for plugin (erstat $<envar > i søgestien for plugin (erstat $<envar
>KDEDIR</envar >KDEDIR</envar
> med KDE's basismappe). </para> > med KDE's basismappe). </para>

@ -156,7 +156,7 @@
> und fügen Sie <filename class="directory" > und fügen Sie <filename class="directory"
>$<envar >$<envar
>KDEDIRS</envar >KDEDIRS</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> zu dem Suchpfad für Bibliotheken hinzu (ersetzen Sie $<envar > zu dem Suchpfad für Bibliotheken hinzu (ersetzen Sie $<envar
>KDEDIRS</envar >KDEDIRS</envar
> durch Ihren Basisordner von &kde;). </para> > durch Ihren Basisordner von &kde;). </para>

@ -184,7 +184,7 @@
> y añada <filename class="directory" > y añada <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> a la ruta de búsqueda de extensiones (reemplace $<envar > a la ruta de búsqueda de extensiones (reemplace $<envar
>KDEDIR</envar >KDEDIR</envar
> con su directorio base de kde). </para> > con su directorio base de kde). </para>

@ -156,7 +156,7 @@
> ja lisa <filename class="directory" > ja lisa <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> plugina otsinguteele (asenda $<envar > plugina otsinguteele (asenda $<envar
>KDEDIR</envar >KDEDIR</envar
> oma KDE baaskataloogiga). </para> > oma KDE baaskataloogiga). </para>

@ -139,7 +139,7 @@
> et ajoutez <filename class="directory" > et ajoutez <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/module externes</filename >/lib/trinity/module externes</filename
>_au_chemin_du_module_externe (remplacez $<envar >_au_chemin_du_module_externe (remplacez $<envar
>KDEDIR</envar >KDEDIR</envar
> par le dossier racine de kde). </para> > par le dossier racine de kde). </para>

@ -170,7 +170,7 @@ Traduzione dell'interfaccia grafica</contrib
> ed aggiungi <filename class="directory" > ed aggiungi <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> al percorso di ricerca dei plugin (rimpiazza $<envar > al percorso di ricerca dei plugin (rimpiazza $<envar
>KDEDIR</envar >KDEDIR</envar
> con la tua cartella base di kde). </para> > con la tua cartella base di kde). </para>

@ -156,7 +156,7 @@
> op en voeg <filename class="directory" > op en voeg <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> toen aan tabblad Library Paths (vervang $<envar > toen aan tabblad Library Paths (vervang $<envar
>KDEDIR</envar >KDEDIR</envar
> door de basismap van uw &kde;-installatie). </para> > door de basismap van uw &kde;-installatie). </para>

@ -155,7 +155,7 @@
> i dodaj <filename class="directory" > i dodaj <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> do ścieżki wyszukiwania wtyczek(the plugin search path) (zamień $<envar > do ścieżki wyszukiwania wtyczek(the plugin search path) (zamień $<envar
>KDEDIR</envar >KDEDIR</envar
> na ścieżkę do Twojego KDE). </para> > na ścieżkę do Twojego KDE). </para>

@ -157,7 +157,7 @@
> e adicione <filename class="directory" > e adicione <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> às localizações de procura de 'plugins' (substitua $<envar > às localizações de procura de 'plugins' (substitua $<envar
>KDEDIR</envar >KDEDIR</envar
> pela sua directoria base do KDE). </para> > pela sua directoria base do KDE). </para>

@ -153,7 +153,7 @@
> e adicione <filename class="directory" > e adicione <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> ao caminho de busca de plugin (substitua $<envar > ao caminho de busca de plugin (substitua $<envar
>KDEDIR</envar >KDEDIR</envar
> com seu diretório base do kde). </para> > com seu diretório base do kde). </para>

@ -167,7 +167,7 @@
> и добавьте <filename class="directory" > и добавьте <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> в список поиска (замените $<envar > в список поиска (замените $<envar
>KDEDIR</envar >KDEDIR</envar
> установочным каталогом). </para> > установочным каталогом). </para>

@ -156,7 +156,7 @@
> och lägg till <filename class="directory" > och lägg till <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> i sökvägen för instickskomponenter (ersätt $<envar > i sökvägen för instickskomponenter (ersätt $<envar
>KDEDIR</envar >KDEDIR</envar
> med KDE:s baskatalog). </para> > med KDE:s baskatalog). </para>

@ -200,7 +200,7 @@
> і додайте <filename class="directory" > і додайте <filename class="directory"
>$<envar >$<envar
>KDEDIR</envar >KDEDIR</envar
>/lib/kde3/plugins</filename >/lib/trinity/plugins</filename
> у список пошуку втулків (замініть $<envar > у список пошуку втулків (замініть $<envar
>KDEDIR</envar >KDEDIR</envar
> на вашу базову теку kde). </para> > на вашу базову теку kde). </para>

Loading…
Cancel
Save