* gcc4.4 compilation fixes

* automake updates

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1062803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

10 files changed, 28 insertions, 15 deletions

diff --git a/kmtrace/Makefile.am b/kmtrace/Makefile.am
index 68fce88d..3d721ac6 100644
--- a/kmtrace/Makefile.am
+++ b/kmtrace/Makefile.am
@@ -33,13 +33,15 @@ kmmatch_LDFLAGS = $(all_libraries)
 
 bin_SCRIPTS = kminspector
 
-lib_LIBRARIES = libktrace_s.a
+kmtracelibdir = $(libdir)/kmtrace
+
+kmtracelib_LIBRARIES = libktrace_s.a
 libktrace_s_a_SOURCES = ktrace_s.c
 
 ktrace_s.c: $(srcdir)/ktrace.c
 	$(LN_S) $(srcdir)/ktrace.c $@
 
-lib_LTLIBRARIES = libktrace.la
+kmtracelib_LTLIBRARIES = libktrace.la
 libktrace_la_LDFLAGS = -avoid-version
 libktrace_la_SOURCES = ksotrace.cpp ktrace.c
 libktrace_la_LIBADD = $(LIBDL)
diff --git a/kmtrace/README b/kmtrace/README
index 63e35228..2e6beb17 100644
--- a/kmtrace/README
+++ b/kmtrace/README
@@ -23,7 +23,7 @@ friends.
 
 You can activate malloc logging by starting yourApplication as:
 
-	MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=$KDEDIR/lib/libktrace.so yourApplication
+	MALLOC_TRACE=/tmp/ktrace.out LD_PRELOAD=/usr/lib/kmtrace/libktrace.so yourApplication
 
 2) The manual way
 
@@ -37,7 +37,7 @@ Add as first statement in main():
 
 Add ktrace_s.a to the LDADD line in your Makefile.am like:
 
-	kicker_LDADD = kicker.la /opt/kde/lib/libktrace_s.a
+	kicker_LDADD = kicker.la /usr/lib/kmtrace/libktrace_s.a
 
 Note that the static library is used.
 You can now activate malloc logging by starting yourApplication as:
diff --git a/kmtrace/configure.in.in b/kmtrace/configure.in.in
index 5df3711e..6270df4e 100644
--- a/kmtrace/configure.in.in
+++ b/kmtrace/configure.in.in
@@ -1,7 +1,7 @@
 dnl AC_OUTPUT( kmtrace/kminspector )
 
 case "$host" in
-   *-gnu)
+   *-gnu*)
       saved_LIBS="$LIBS"
       LIBS="$LIBS -Wl,-Bstatic -liberty -Wl,-Bdynamic"
       AC_TRY_LINK([], [], [kde_compile_kmtrace=$GCC], [kde_compile_kmtrace=no])
diff --git a/kmtrace/kminspector.in b/kmtrace/kminspector.in
index 572ed200..4d2e2042 100755
--- a/kmtrace/kminspector.in
+++ b/kmtrace/kminspector.in
@@ -2,7 +2,7 @@
 
 export MALLOC_TREE=kminspector.tree
 export MALLOC_THRESHOLD=2000
-export LD_PRELOAD=@kde_libraries@/libktrace.so
+export LD_PRELOAD=@kde_libraries@/kmtrace/libktrace.so
 
 $*
 
diff --git a/poxml/antlr/antlr/CharScanner.hpp b/poxml/antlr/antlr/CharScanner.hpp
index b0ab9276..102d28e0 100644
--- a/poxml/antlr/antlr/CharScanner.hpp
+++ b/poxml/antlr/antlr/CharScanner.hpp
@@ -35,6 +35,7 @@
  * @author <br><a href="mailto:pete@yamuna.demon.co.uk">Pete Wells</a>
  */
 
+#include <cstdio>
 #include "antlr/config.hpp"
 #include "antlr/TokenStream.hpp"
 #include "antlr/RecognitionException.hpp"
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3cea8486..89adcaa5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -41,17 +41,19 @@ EXTRA_DIST = completions kde-emacs \
 #%.1: %
 #	pod2man $< $@
 
+pod2man_options = "--center=K Desktop Environment (SDK)" "--release=KDE 3.5"
+
 kde-build.1: kde-build
-	pod2man $(srcdir)/kde-build > $@
+	pod2man $(pod2man_options) $< > $@
 kdesvn-build.1: kdesvn-build
-	pod2man $(srcdir)/kdesvn-build > $@
+	pod2man $(pod2man_options) $< > $@
 cvsversion.1: cvsversion
-	pod2man $(srcdir)/cvsversion > $@
+	pod2man $(pod2man_options) $< > $@
 cvscheck.1: cvscheck
-	pod2man $(srcdir)/cvscheck > $@
+	pod2man $(pod2man_options) $< > $@
 noncvslist.1: noncvslist
-	pod2man $(srcdir)/noncvslist > $@
+	pod2man $(pod2man_options) $< > $@
 cvsblame.1: cvsblame
-	pod2man $(srcdir)/cvsblame > $@
+	pod2man $(pod2man_options) $< > $@
 includemocs.1: includemocs
-	pod2man $(srcdir)/includemocs > $@
+	pod2man $(pod2man_options) $< > $@
diff --git a/scripts/create_makefile b/scripts/create_makefile
index e83b61d7..a27d3848 100755
--- a/scripts/create_makefile
+++ b/scripts/create_makefile
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Create Makefile.in and Makefile in a directory (containing a Makefile.am !)
 # Saves time compared to re-running configure completely
diff --git a/scripts/kde-build b/scripts/kde-build
index 5c9a111d..8790f602 100755
--- a/scripts/kde-build
+++ b/scripts/kde-build
@@ -881,6 +881,9 @@ The following error codes are returned by the script.
 
         cd ~/scripts/; vi ./kde-buildrc; ./kde-build
 
+On Debian systems, an example F<kde-buildrc> can be found in
+the directory /usr/share/doc/kdesdk-scripts/.
+
 =head1 BUGS
 
 Probably.
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index bcb02b4c..ddf2efa8 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -1,5 +1,5 @@
 " To use this file, add this line to your ~/.vimrc:, w/o the dquote
-" source /path/to/kde/sources/kdesdk/scripts/kde-devel-vim.vim
+" source /usr/share/kdesdk-scripts/kde-devel-vim.vim
 "
 " For CreateChangeLogEntry() : If you don't want to re-enter your
 " Name/Email in each vim session then make sure to have the viminfo
diff --git a/scripts/qtdoc b/scripts/qtdoc
index f92345d9..622353b3 100755
--- a/scripts/qtdoc
+++ b/scripts/qtdoc
@@ -1,4 +1,9 @@
 #!/bin/sh
+
+if [ -z "$QTDIR" ]; then
+  QTDIR=/usr/share/qt3
+fi
+
 # Run from command line, to open a qt help page in kfm/konqueror
 # No argument => main page
 # Classname (case insensitive) => page for this class