diff options
| -rw-r--r-- | FAQ | 4 | ||||
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/en/index.docbook | 10 |
5 files changed, 16 insertions, 16 deletions
@@ -53,7 +53,7 @@ A: Most likely, you installed Smb4K to the wrong place. To correct this, Now, reconfigure the source by passing the '--prefix=PREFIX' option to the configure script: - $ ./configure --prefix=`kde-config --prefix` + $ ./configure --prefix=`tde-config --prefix` Afterwards, compile and install it: @@ -74,7 +74,7 @@ A: If you want to be able to uninstall Smb4K easily, you might want to use Configuration, compilation and installation using checkinstall will work like this (see also above): - $ ./configure --prefix=`kde-config --prefix` && make && su -c "checkinstall" + $ ./configure --prefix=`tde-config --prefix` && make && su -c "checkinstall" Q: The configure script fails and tells me, it can't find my Qt @@ -92,7 +92,7 @@ Compilation and Installation $ cd smb4k-x.x.x (Replace x.x.x with the version number) 2. Configure the source code with at least the following command - $ ./configure --prefix=`kde-config --prefix` + $ ./configure --prefix=`tde-config --prefix` Several more options can be added. Run $ ./configure --help to find out which ones are available. @@ -112,7 +112,7 @@ Compilation and Installation Those of you, who do not use KDE or who do not wish to install the Konqueror plugin, should run this configure command - $ ./configure --prefix=`kde-config --prefix` --without-konqplugin + $ ./configure --prefix=`tde-config --prefix` --without-konqplugin instead of the one mentioned above and else proceed as described. Additional information about compiling and installing the software is available @@ -124,7 +124,7 @@ If you experience crashes or similar and want to debug the source code yourself, compile the source code with debugging symbols. The procedure is similar to the one described in the "Compilation and Installation" section above except that you need to modify the configure command slightly: - $ ./configure --prefix=`kde-config --prefix` --enable-debug=full + $ ./configure --prefix=`tde-config --prefix` --enable-debug=full Now compile and install the program as stated above. If you do not want to install but only debug the newly compiled program, you may execute Smb4K from within the source code directory. Change into the 'smb4k' subdirectory and run: diff --git a/acinclude.m4 b/acinclude.m4 index 27079ef..b981350 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -4981,13 +4981,13 @@ AC_DEFUN([KDE_SET_PREFIX], KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix diff --git a/configure.in b/configure.in index e7a33ec..2a9d166 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 4d5cbd9..239e679 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -4905,7 +4905,7 @@ smb4kmounter.cpp:167: error: 'p' has a previous declaration as 'Smb4KMounterPriv <screen>/usr/bin/ld: cannot find -lsmb4kcore libtool: install: error: relink `libsmb4kwidgets.la´ with the above command before installing it</screen></para> <para><emphasis role="bold">Solution:</emphasis> One possibility to avoid this failure is to enable the building of static libraries during configuration:</para> -<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>kde-config</command> --prefix` --enable-static</userinput></screen> +<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>tde-config</command> --prefix` --enable-static</userinput></screen> <para>This will convert the error into a warning and the installation will succeed.</para> </listitem> @@ -4917,7 +4917,7 @@ libtool: install: error: relink `libsmb4kwidgets.la´ with the above command bef <screen><prompt>$</prompt> <userinput><command>make</command> distclean</userinput></screen> in the meantime.</para> <para>Reconfigure the source by passing the <option>--prefix=PREFIX</option> option to the configure script:</para> -<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>kde-config</command> --prefix`</userinput></screen> +<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>tde-config</command> --prefix`</userinput></screen> <para>Compile and install &smb4k; (see also <link linkend="appendix_compilation">here</link>):</para> <screen><prompt>$</prompt> <userinput><command>make</command> && <command>su</command> -c "<command>make</command> install"</userinput></screen> <para>&smb4k; will be installed to the right path and everything should work fine.</para> @@ -5271,7 +5271,7 @@ display charset = VAL3 <para>This section describes a full installation of &smb4k;. Please note that you might have to adjust the <command>./configure</command> command to match the installation paths of your distribution (e.g. Debian, Ubuntu).</para> <orderedlist> <listitem><para>Change into the root directory of the source code: <screen><prompt>$</prompt> <userinput><command>cd</command> smb4k-x.x.x</userinput></screen> (Replace x.x.x with the version number)</para></listitem> -<listitem><para>Configure the source code with at least the following command: <screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>kde-config</command> --prefix`</userinput></screen> Several more options can be added. Run <screen><prompt>$</prompt> <userinput><command>./configure</command> --help</userinput></screen> to find out which ones are available.</para></listitem> +<listitem><para>Configure the source code with at least the following command: <screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>tde-config</command> --prefix`</userinput></screen> Several more options can be added. Run <screen><prompt>$</prompt> <userinput><command>./configure</command> --help</userinput></screen> to find out which ones are available.</para></listitem> <listitem><para>Compile the source code: <screen><prompt>$</prompt> <userinput><command>make</command></userinput></screen></para></listitem> <listitem><para>Install the application. For that, become root <screen><prompt>$</prompt> <userinput><command>su</command></userinput></screen> and run <screen><prompt>$</prompt> <userinput><command>make</command> install</userinput></screen> in the root directory of the source code. If you want to be able to remove Smb4K with your package manager, install the 'checkinstall' package and run <screen><prompt>$</prompt> <userinput><command>checkinstall</command></userinput></screen> instead.</para></listitem> </orderedlist> @@ -5279,7 +5279,7 @@ display charset = VAL3 <sect2 id="appendix_compilation_without_konqplugin"> <title>Installation without Konqueror Plugin</title> <para>If you are not interested in the &konqueror; plugin that comes with &smb4k;, you should configure the source code as follows: -<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>kde-config</command> --prefix` --without-konqplugin</userinput></screen> +<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>tde-config</command> --prefix` --without-konqplugin</userinput></screen> The procedure to compile and install the application is the same as mentioned above.</para> </sect2> </sect1> @@ -5287,7 +5287,7 @@ The procedure to compile and install the application is the same as mentioned ab <sect1 id="appendix_debugging"> <title>Debugging the Source Code</title> <para>If you experience crashes or similar and want to debug the source code yourself, compile it with debugging symbols. The procedure is similar to the one described in the <link linkend="appendix_compilation">Compilation and Installation</link> section except that you need to modify the configure command slightly:</para> -<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>kde-config</command> --prefix` --enable-debug=full</userinput></screen> +<screen><prompt>$</prompt> <userinput><command>./configure</command> --prefix=`<command>tde-config</command> --prefix` --enable-debug=full</userinput></screen> <para>Now compile and install the program as stated <link linkend="appendix_compilation">before</link>. If you do not want to install but only debug the newly compiled program, you may execute &smb4k; from within the source code directory. Change into the <filename role="directory">smb4k</filename> subdirectory and run:</para> |