Browse Source

Additional renaming of kde to tde

Timothy Pearson 7 years ago
parent
commit
695f133ced
4 changed files with 66 additions and 66 deletions
  1. 62
    62
      acinclude.m4.in
  2. 1
    1
      am_edit
  3. 1
    1
      config.pl
  4. 2
    2
      doxygen.sh

+ 62
- 62
acinclude.m4.in View File

@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
23 23
 dnl Please do not modify this file unless you expect your modifications to be
24 24
 dnl carried into every other module in the repository. 
25 25
 dnl
26
-dnl Single-module modifications are best placed in configure.in for kdelibs
27
-dnl and kdebase or configure.in.in if present.
26
+dnl Single-module modifications are best placed in configure.in for tdelibs
27
+dnl and tdebase or configure.in.in if present.
28 28
 
29 29
 # KDE_PATH_X_DIRECT
30 30
 dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
103 103
 [LIBS="$ac_save_LIBS"
104 104
 # First see if replacing the include by lib works.
105 105
 # Check X11 before X11Rn because it is often a symlink to the current release.
106
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
107
-    /usr/X11/lib${kdelibsuff}           \
108
-    /usr/X11R6/lib${kdelibsuff}         \
109
-    /usr/X11R5/lib${kdelibsuff}         \
110
-    /usr/X11R4/lib${kdelibsuff}         \
106
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
107
+    /usr/X11/lib${tdelibsuff}           \
108
+    /usr/X11R6/lib${tdelibsuff}         \
109
+    /usr/X11R5/lib${tdelibsuff}         \
110
+    /usr/X11R4/lib${tdelibsuff}         \
111 111
                                         \
112
-    /usr/lib${kdelibsuff}/X11           \
113
-    /usr/lib${kdelibsuff}/X11R6         \
114
-    /usr/lib${kdelibsuff}/X11R5         \
115
-    /usr/lib${kdelibsuff}/X11R4         \
112
+    /usr/lib${tdelibsuff}/X11           \
113
+    /usr/lib${tdelibsuff}/X11R6         \
114
+    /usr/lib${tdelibsuff}/X11R5         \
115
+    /usr/lib${tdelibsuff}/X11R4         \
116 116
                                         \
117
-    /usr/local/X11/lib${kdelibsuff}     \
118
-    /usr/local/X11R6/lib${kdelibsuff}   \
119
-    /usr/local/X11R5/lib${kdelibsuff}   \
120
-    /usr/local/X11R4/lib${kdelibsuff}   \
117
+    /usr/local/X11/lib${tdelibsuff}     \
118
+    /usr/local/X11R6/lib${tdelibsuff}   \
119
+    /usr/local/X11R5/lib${tdelibsuff}   \
120
+    /usr/local/X11R4/lib${tdelibsuff}   \
121 121
                                         \
122
-    /usr/local/lib${kdelibsuff}/X11     \
123
-    /usr/local/lib${kdelibsuff}/X11R6   \
124
-    /usr/local/lib${kdelibsuff}/X11R5   \
125
-    /usr/local/lib${kdelibsuff}/X11R4   \
122
+    /usr/local/lib${tdelibsuff}/X11     \
123
+    /usr/local/lib${tdelibsuff}/X11R6   \
124
+    /usr/local/lib${tdelibsuff}/X11R5   \
125
+    /usr/local/lib${tdelibsuff}/X11R4   \
126 126
                                         \
127
-    /usr/X386/lib${kdelibsuff}          \
128
-    /usr/x386/lib${kdelibsuff}          \
129
-    /usr/XFree86/lib${kdelibsuff}/X11   \
127
+    /usr/X386/lib${tdelibsuff}          \
128
+    /usr/x386/lib${tdelibsuff}          \
129
+    /usr/XFree86/lib${tdelibsuff}/X11   \
130 130
                                         \
131
-    /usr/lib${kdelibsuff}               \
132
-    /usr/local/lib${kdelibsuff}         \
133
-    /usr/unsupported/lib${kdelibsuff}   \
134
-    /usr/athena/lib${kdelibsuff}        \
135
-    /usr/local/x11r5/lib${kdelibsuff}   \
136
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
137
-    /lib/usr/lib${kdelibsuff}/X11       \
131
+    /usr/lib${tdelibsuff}               \
132
+    /usr/local/lib${tdelibsuff}         \
133
+    /usr/unsupported/lib${tdelibsuff}   \
134
+    /usr/athena/lib${tdelibsuff}        \
135
+    /usr/local/x11r5/lib${tdelibsuff}   \
136
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
137
+    /lib/usr/lib${tdelibsuff}/X11       \
138 138
                                         \
139
-    /usr/openwin/lib${kdelibsuff}       \
140
-    /usr/openwin/share/lib${kdelibsuff} \
139
+    /usr/openwin/lib${tdelibsuff}       \
140
+    /usr/openwin/share/lib${tdelibsuff} \
141 141
     ; \
142 142
 do
143 143
 dnl Don't even attempt the hair of trying to link an X program!
@@ -418,7 +418,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
418 418
 else
419 419
   AC_MSG_ERROR([your system fails at linking a small KDE application!
420 420
 Check, if your compiler is installed correctly and if you have used the
421
-same compiler to compile Qt and kdelibs as you did use now.
421
+same compiler to compile Qt and tdelibs as you did use now.
422 422
 For more details about this problem, look at the end of config.log.])
423 423
 fi
424 424
 
@@ -981,7 +981,7 @@ mips-sgi-irix6*)
981 981
     ac_x_includes="."
982 982
   fi
983 983
   if test -z "$ac_x_libraries"; then
984
-    ac_x_libraries="/usr/lib${kdelibsuff}"
984
+    ac_x_libraries="/usr/lib${tdelibsuff}"
985 985
   fi
986 986
 esac
987 987
 #from now on we use our own again
@@ -1349,7 +1349,7 @@ if test $kde_qtver = 4; then
1349 1349
   kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1350 1350
 fi
1351 1351
 if test $kde_qtver = 3; then
1352
-  kde_qt_dirs="$QTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
1352
+  kde_qt_dirs="$QTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
1353 1353
   if test -z "$PKG_CONFIG"; then
1354 1354
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1355 1355
   fi
@@ -1575,7 +1575,7 @@ qt_includes=""
1575 1575
 AC_ARG_WITH(qt-dir,
1576 1576
     AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
1577 1577
     [  ac_qt_includes="$withval"/include
1578
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
1578
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
1579 1579
        ac_qt_bindir="$withval"/bin
1580 1580
     ])
1581 1581
 
@@ -1628,7 +1628,7 @@ ac_qt_includes="$qt_incdir"
1628 1628
 
1629 1629
 qt_libdirs=""
1630 1630
 for dir in $kde_qt_dirs; do
1631
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
1631
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
1632 1632
 done
1633 1633
 if test -z "$PKG_CONFIG"; then
1634 1634
     AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -1823,11 +1823,11 @@ rm -f actest.ui actest.cpp
1823 1823
 AC_MSG_RESULT([$kde_cv_uic_plugins])
1824 1824
 if test "$kde_cv_uic_plugins" != yes; then
1825 1825
 	AC_MSG_ERROR([
1826
-you need to install kdelibs first.
1826
+you need to install tdelibs first.
1827 1827
 
1828
-If you did install kdelibs, then the Qt version that is picked up by
1829
-this configure is not the same version you used to compile kdelibs. 
1830
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1828
+If you did install tdelibs, then the Qt version that is picked up by
1829
+this configure is not the same version you used to compile tdelibs. 
1830
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the 
1831 1831
 _same Qt version_, compiled with the _same compiler_ and the same Qt
1832 1832
 configuration settings.
1833 1833
 ])
@@ -1984,8 +1984,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
1984 1984
 So, check this please and use another prefix!])
1985 1985
 fi
1986 1986
 
1987
-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/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
1988
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
1987
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
1988
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
1989 1989
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
1990 1990
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
1991 1991
 ac_kde_libraries="$kde_libdir"
@@ -2003,7 +2003,7 @@ fi
2003 2003
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
2004 2004
 AC_MSG_ERROR([
2005 2005
 I can't find the designer plugins. These are required and should have been installed
2006
-by kdelibs])
2006
+by tdelibs])
2007 2007
 fi
2008 2008
 
2009 2009
 if test -n "$kde_widgetdir"; then
@@ -2018,7 +2018,7 @@ else
2018 2018
     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
2019 2019
 fi
2020 2020
 
2021
-else dnl test -z $1, e.g. from kdelibs
2021
+else dnl test -z $1, e.g. from tdelibs
2022 2022
 
2023 2023
   ac_cv_have_kde="have_kde=no"
2024 2024
 
@@ -3827,9 +3827,9 @@ AC_DEFUN([KDE_CHECK_LIB64],
3827 3827
     AC_ARG_ENABLE(libsuffix,
3828 3828
         AC_HELP_STRING([--enable-libsuffix],
3829 3829
             [/lib directory suffix (64,32,none,auto[=default])]),
3830
-            kdelibsuff=$enableval, kdelibsuff="auto")
3830
+            tdelibsuff=$enableval, tdelibsuff="auto")
3831 3831
     
3832
-    if test "$kdelibsuff" = "auto"; then
3832
+    if test "$tdelibsuff" = "auto"; then
3833 3833
     
3834 3834
 cat > conftest.c << EOF
3835 3835
 #include <stdio.h>
@@ -3837,26 +3837,26 @@ int main() {
3837 3837
  return 0;
3838 3838
 }
3839 3839
 EOF
3840
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3840
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3841 3841
     s,.*/lib\([[^\/]]*\)/.*,\1, 
3842 3842
     p 
3843 3843
 }'`
3844 3844
 	rm -rf conftest.*
3845 3845
     fi	
3846 3846
 	
3847
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3848
-       kdelibsuff=
3847
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
3848
+       tdelibsuff=
3849 3849
     fi
3850
-    if test -z "$kdelibsuff"; then
3850
+    if test -z "$tdelibsuff"; then
3851 3851
         AC_MSG_RESULT([not using lib directory suffix])
3852 3852
         AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
3853 3853
     else
3854 3854
         if test "$libdir" = '${exec_prefix}/lib'; then
3855
-            libdir="$libdir${kdelibsuff}"
3855
+            libdir="$libdir${tdelibsuff}"
3856 3856
             AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3857 3857
         fi
3858
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3859
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3858
+        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
3859
+        AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
3860 3860
     fi
3861 3861
 ])
3862 3862
 
@@ -4881,7 +4881,7 @@ fi
4881 4881
 
4882 4882
 PYTHONINC=-I$python_incdir
4883 4883
 
4884
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
4884
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
4885 4885
 AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
4886 4886
 if test ! -r $python_libdir/libpython$version.so; then
4887 4887
   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -5357,7 +5357,7 @@ AC_DEFUN([KDE_CONF_FILES],
5357 5357
   AC_SUBST(CONF_FILES)
5358 5358
 ])dnl
5359 5359
 
5360
-dnl This sets the prefix, for arts and kdelibs
5360
+dnl This sets the prefix, for arts and tdelibs
5361 5361
 dnl Do NOT use in any other module.
5362 5362
 dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
5363 5363
 AC_DEFUN([KDE_SET_PREFIX_CORE],
@@ -5404,9 +5404,9 @@ AC_DEFUN([KDE_SET_PREFIX],
5404 5404
 
5405 5405
   kde_libs_prefix=`$KDECONFIG --prefix`
5406 5406
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
5407
-       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
5407
+       AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
5408 5408
                     This means it has been moved since you installed it.
5409
-                    This won't work. Please recompile kdelibs for the new prefix.
5409
+                    This won't work. Please recompile tdelibs for the new prefix.
5410 5410
                     ])
5411 5411
   fi
5412 5412
   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -6072,7 +6072,7 @@ ssl_includes=""
6072 6072
 AC_ARG_WITH(ssl-dir,
6073 6073
     AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
6074 6074
     [  ac_ssl_includes="$withval"/include
6075
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
6075
+       ac_ssl_libraries="$withval"/lib$tdelibsuff
6076 6076
     ])
6077 6077
 
6078 6078
 want_ssl=yes
@@ -6092,7 +6092,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
6092 6092
   AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
6093 6093
   ac_ssl_includes="$ssl_incdir"
6094 6094
 
6095
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
6095
+  ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
6096 6096
   if test ! "$ac_ssl_libraries" = "NO"; then
6097 6097
     ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
6098 6098
   fi
@@ -6329,9 +6329,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
6329 6329
 dnl also defines KSTUFF_PKG_ERRORS on error
6330 6330
 AC_DEFUN([KDE_PKG_CHECK_MODULES], [
6331 6331
 
6332
-   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
6332
+   PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
6333 6333
    if test "$prefix" != "$kde_libs_prefix"; then
6334
-       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
6334
+       PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
6335 6335
    fi
6336 6336
    export PKG_CONFIG_PATH
6337 6337
    PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
@@ -6717,7 +6717,7 @@ AC_DEFUN([AC_SQLITE3], [
6717 6717
   if test ! $enable_sqlite3 = no; then
6718 6718
     # determine name and path of sqlite3 plugin library
6719 6719
     qtlib=""
6720
-    if test ! "lib${kdelibsuff}" = "lib"; then
6720
+    if test ! "lib${tdelibsuff}" = "lib"; then
6721 6721
       qtlib=".lib64"
6722 6722
     fi 
6723 6723
     if test x$QTDIR = x; then

+ 1
- 1
am_edit View File

@@ -1736,7 +1736,7 @@ sub tag_POFILES ()
1736 1736
 	$pofiles =  join(" ", grep(/\.po$/, readdir(THISDIR)));
1737 1737
         closedir (THISDIR);
1738 1738
         print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
1739
-	if (-f "charset" && -f "kdelibs/kdelibs.po") {
1739
+	if (-f "charset" && -f "tdelibs/tdelibs.po") {
1740 1740
 	    handle_TOPLEVEL();
1741 1741
 	}
1742 1742
     }

+ 1
- 1
config.pl View File

@@ -8,7 +8,7 @@
8 8
 # has to recompile the regexps every time.
9 9
 #
10 10
 # this script does better. It changes all Makefile.ins in one process.
11
-# in kdelibs the time for building Makefile went down from 2:59 min to 13 sec!
11
+# in tdelibs the time for building Makefile went down from 2:59 min to 13 sec!
12 12
 #
13 13
 # written by Michael Matz <matz@kde.org>
14 14
 # adapted by Dirk Mueller <mueller@kde.org>

+ 2
- 2
doxygen.sh View File

@@ -3,7 +3,7 @@
3 3
 # doxygen.sh Copyright (C) 2005 by Adriaan de Groot
4 4
 #            Based on some code from Doxyfile.am, among other things.
5 5
 # License:   GPL version 2.
6
-#            See file COPYING in kdelibs for details.
6
+#            See file COPYING in tdelibs for details.
7 7
 
8 8
 echo "*** doxygen.sh"
9 9
 
@@ -844,7 +844,7 @@ if test "x." = "x$top_builddir" ; then
844 844
 	create_subdirs
845 845
 	create_installdox > installdox-slow
846 846
 	if test "x$recurse" = "x1" ; then
847
-		if test "x$module_name" = "xkdelibs" ; then
847
+		if test "x$module_name" = "xtdelibs" ; then
848 848
 			if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
849 849
 				test ! -f "qt/qt.tag" ; then
850 850
 				# Special case: create a qt tag file.

Loading…
Cancel
Save