From 77ad89e54e505ec26fea712844f1da5a52de5d68 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 21 Aug 2011 01:43:11 +0000 Subject: Convert remaining references to kde3 (e.g. in paths) to trinity git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktechlab@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- acinclude.m4 | 38 +++++++++++++++++++------------------- aclocal.m4 | 38 +++++++++++++++++++------------------- config.log | 58 +++++++++++++++++++++++++++++----------------------------- 3 files changed, 67 insertions(+), 67 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index ff08dec..291001d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -488,14 +488,14 @@ if test "$1" = "default"; then if test "$kde_qtver" = "2"; then kde_moduledir='\${libdir}/kde2' else - kde_moduledir='\${libdir}/kde3' + kde_moduledir='\${libdir}/trinity' fi fi if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' + kde_styledir='\${libdir}/trinity/plugins/styles' fi if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' + kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then xdg_appsdir='\${datadir}/applications/kde' @@ -555,7 +555,7 @@ Please check whether you installed aRts correctly or use 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" if test -n "$KDEDIRS"; then kde_save_IFS=$IFS @@ -589,34 +589,34 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 - kde33ornewer=1 + trinity2ornewer=1 + trinity3ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= + trinity2ornewer= + trinity3ornewer= else if test "$kde_qtver" = "3"; then if test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi if test "$kde_qtsubver" -le 2; then - kde33ornewer= + trinity3ornewer= fi fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi - if test -n "$kde33ornewer"; then + if test -n "$trinity3ornewer"; then KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) 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" + 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 @@ -627,7 +627,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1795,7 +1795,7 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /opt/kde3/include/kde /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 /opt/trinity/include/kde /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) @@ -1807,7 +1807,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. 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}/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" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1815,7 +1815,7 @@ ac_kde_libraries="$kde_libdir" kde_widgetdir=NO 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 AC_MSG_ERROR([ @@ -1823,14 +1823,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) 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([ 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/kde3/plugins/designer" + kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" fi diff --git a/aclocal.m4 b/aclocal.m4 index f7915e1..3078d87 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -500,14 +500,14 @@ if test "$1" = "default"; then if test "$kde_qtver" = "2"; then kde_moduledir='\${libdir}/kde2' else - kde_moduledir='\${libdir}/kde3' + kde_moduledir='\${libdir}/trinity' fi fi if test -z "$kde_styledir"; then - kde_styledir='\${libdir}/kde3/plugins/styles' + kde_styledir='\${libdir}/trinity/plugins/styles' fi if test -z "$kde_widgetdir"; then - kde_widgetdir='\${libdir}/kde3/plugins/designer' + kde_widgetdir='\${libdir}/trinity/plugins/designer' fi if test -z "$xdg_appsdir"; then xdg_appsdir='\${datadir}/applications/kde' @@ -567,7 +567,7 @@ Please check whether you installed aRts correctly or use 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" if test -n "$KDEDIRS"; then kde_save_IFS=$IFS @@ -601,34 +601,34 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs]) - kde32ornewer=1 - kde33ornewer=1 + trinity2ornewer=1 + trinity3ornewer=1 if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then - kde32ornewer= - kde33ornewer= + trinity2ornewer= + trinity3ornewer= else if test "$kde_qtver" = "3"; then if test "$kde_qtsubver" -le 1; then - kde32ornewer= + trinity2ornewer= fi if test "$kde_qtsubver" -le 2; then - kde33ornewer= + trinity3ornewer= fi fi fi - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi - if test -n "$kde33ornewer"; then + if test -n "$trinity3ornewer"; then KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) AC_SUBST(MAKEKDEWIDGETS) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) 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" + 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 @@ -639,7 +639,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi DCOP_DEPENDENCIES='$(DCOPIDL)' - if test -n "$kde32ornewer"; then + if test -n "$trinity2ornewer"; then KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)' DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)' AC_SUBST(KCONFIG_COMPILER) @@ -1807,7 +1807,7 @@ fi 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" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) @@ -1819,7 +1819,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. 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}/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" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) @@ -1827,7 +1827,7 @@ ac_kde_libraries="$kde_libdir" kde_widgetdir=NO 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 AC_MSG_ERROR([ @@ -1835,14 +1835,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail. So, check this please and use another prefix!]) 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([ 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/kde3/plugins/designer" + kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" fi diff --git a/config.log b/config.log index 086d124..99c8162 100644 --- a/config.log +++ b/config.log @@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by configure, which was generated by GNU Autoconf 2.59. Invocation command line was - $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --disable-rpath --prefix=/opt/kde3 --libexecdir=/opt/kde3/bin --sysconfdir=/etc --libdir=/opt/kde3/lib --includedir=/opt/kde3/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/kde3/share/man --infodir=/opt/kde3/share/info --with-xinerama --prefix=/opt/kde3 + $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --disable-rpath --prefix=/opt/trinity --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/trinity/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-xinerama --prefix=/opt/trinity ## --------- ## ## Platform. ## @@ -27,10 +27,10 @@ hostinfo = unknown /usr/bin/oslevel = unknown /bin/universe = unknown -PATH: /opt/kde3/bin -PATH: /opt/kde3/bin -PATH: /opt/kde3/games -PATH: /opt/kde3/bin +PATH: /opt/trinity/bin +PATH: /opt/trinity/bin +PATH: /opt/trinity/games +PATH: /opt/trinity/bin PATH: /home/eldarion/bin PATH: /usr/local/sbin PATH: /usr/local/bin @@ -105,7 +105,7 @@ AMDEP_FALSE='' AMDEP_TRUE='' AMTAR='' AR='' -ARTSCCONFIG='/opt/kde3/bin/artsc-config' +ARTSCCONFIG='/opt/trinity/bin/artsc-config' AUTOCONF='' AUTODIRS='' AUTOHEADER='' @@ -121,8 +121,8 @@ CXX='' CXXCPP='' CXXDEPMODE='' CXXFLAGS='-g -O2' -DCOPIDL2CPP='/opt/kde3/bin/dcopidl2cpp' -DCOPIDL='/opt/kde3/bin/dcopidl' +DCOPIDL2CPP='/opt/trinity/bin/dcopidl2cpp' +DCOPIDL='/opt/trinity/bin/dcopidl' DCOPIDLNG='' DCOP_DEPENDENCIES='' DEFS='' @@ -209,7 +209,7 @@ LN_S='' LTLIBOBJS='' MAKEINFO='' MAKEKDEWIDGETS='' -MCOPIDL='/opt/kde3/bin/mcopidl' +MCOPIDL='/opt/trinity/bin/mcopidl' MEINPROC='' MOC='' MSGFMT='' @@ -276,38 +276,38 @@ include_ARTS_FALSE='' include_ARTS_TRUE='' include_x11_FALSE='' include_x11_TRUE='' -includedir='/opt/kde3/include/kde' -infodir='/opt/kde3/share/info' +includedir='/opt/trinity/include/kde' +infodir='/opt/trinity/share/info' install_sh='' -kde_appsdir='/opt/kde3/share/applnk' -kde_bindir='/opt/kde3/bin' -kde_confdir='/etc/kde3' -kde_datadir='/opt/kde3/share/apps' -kde_htmldir='/opt/kde3/share/doc/kde/HTML' -kde_icondir='/opt/kde3/share/icons' +kde_appsdir='/opt/trinity/share/applnk' +kde_bindir='/opt/trinity/bin' +kde_confdir='/etc/trinity' +kde_datadir='/opt/trinity/share/apps' +kde_htmldir='/opt/trinity/share/doc/kde/HTML' +kde_icondir='/opt/trinity/share/icons' kde_includes='' kde_kcfgdir='' kde_libraries='' kde_libs_htmldir='' kde_libs_prefix='' -kde_locale='/opt/kde3/share/locale' -kde_mimedir='/opt/kde3/share/mimelnk' -kde_moduledir='/opt/kde3/lib/kde3' +kde_locale='/opt/trinity/share/locale' +kde_mimedir='/opt/trinity/share/mimelnk' +kde_moduledir='/opt/trinity/lib/trinity' kde_qtver='' -kde_servicesdir='/opt/kde3/share/services' -kde_servicetypesdir='/opt/kde3/share/servicetypes' -kde_sounddir='/opt/kde3/share/sounds' +kde_servicesdir='/opt/trinity/share/services' +kde_servicetypesdir='/opt/trinity/share/servicetypes' +kde_sounddir='/opt/trinity/share/sounds' kde_styledir='' -kde_templatesdir='/opt/kde3/share/templates' -kde_wallpaperdir='/opt/kde3/share/wallpapers' +kde_templatesdir='/opt/trinity/share/templates' +kde_wallpaperdir='/opt/trinity/share/wallpapers' kde_widgetdir='' kdeinitdir='' -libdir='/opt/kde3/lib' -libexecdir='/opt/kde3/bin' +libdir='/opt/trinity/lib' +libexecdir='/opt/trinity/bin' localstatedir='${prefix}/var' -mandir='/opt/kde3/share/man' +mandir='/opt/trinity/share/man' oldincludedir='/usr/include' -prefix='/opt/kde3' +prefix='/opt/trinity' program_transform_name='s,x,x,' qt_includes='' qt_libraries='' -- cgit v1.2.3