* Updated automake/autoconf

* Detects Python 2.6
* Various compilation fixes



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

24 files changed, 53 insertions, 51 deletions

diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
index 922e59ff..3e919043 100644
--- a/dcopjava/binding/Makefile.am
+++ b/dcopjava/binding/Makefile.am
@@ -6,10 +6,13 @@ libjavadcop_la_LIBADD = $(LIB_KDECORE)
 
 INCLUDES = $(jni_includes) $(all_includes)
 
-client.cpp: org_kde_DCOP_Client.h 
+client.$(OBJEXT): org_kde_DCOP_Client.h 
 
-org_kde_DCOP_Client.h: org/kde/DCOP/Client.class
-	CLASSPATH=$(srcdir) $(JAVAH) -jni org.kde.DCOP.Client
+client.lo: org_kde_DCOP_Client.h 
+
+org_kde_DCOP_Client.h:
+	$(MAKE) -C org
+	$(JAVAH)  -classpath .:$(srcdir) -jni org.kde.DCOP.Client
 
 SUBDIRS = org
 
diff --git a/dcoppython/lib/Makefile.am b/dcoppython/lib/Makefile.am
index 99dbac94..c72a0662 100644
--- a/dcoppython/lib/Makefile.am
+++ b/dcoppython/lib/Makefile.am
@@ -1,4 +1,4 @@
 
 pyt_DATA = pydcop.py 
-pytdir = $(PYTHONMODDIR)
+pytdir = $(PYTHONMODDIR)/site-packages
 
diff --git a/dcoppython/shell/gen_marshal_code.py b/dcoppython/shell/gen_marshal_code.py
index 73cb1fd0..c24c8760 100644
--- a/dcoppython/shell/gen_marshal_code.py
+++ b/dcoppython/shell/gen_marshal_code.py
@@ -119,21 +119,21 @@ class DocType:
     
     def __init__(self, type):
         self.type = type
-        self.demarshal_as = None
-        self.as = []
+        self.demarshal_asme = None
+        self.asme = []
         self.info = []
 
-    def add_as(self, as):
-        if self.demarshal_as == None: self.demarshal_as = as
-        self.as += [as]
+    def add_asme(self, asme):
+        if self.demarshal_asme == None: self.demarshal_asme = asme
+        self.asme += [asme]
 
     def add_info(self,info):
         self.info += [info]
 
     def xml(self):
         return ['<type dcoptype="%s">' % self.type,
-                '  <demarshal-as>%s</demarshal-as>' % self.demarshal_as] + \
-               ['  <marshal-as>%s</marshal-as>' % as for as in self.as ] + \
+                '  <demarshal-asme>%s</demarshal-asme>' % self.demarshal_asme] + \
+               ['  <marshal-asme>%s</marshal-asme>' % asme for asme in self.asme ] + \
                ['  <info>%s</info>' % info for info in self.info ] + \
                ['</type>']
 
@@ -186,7 +186,7 @@ for l in in_file.readlines():
     if m:
         doc_cmd, rest = m.groups()
         if doc_cmd=="as":
-            doc_types[current_type].add_as(rest)
+            doc_types[current_type].add_asme(rest)
         if doc_cmd=="info":
             doc_types[current_type].add_info(rest)
         continue
diff --git a/kdejava/koala/Makefile.am b/kdejava/koala/Makefile.am
index cb48a314..a0d75ae8 100644
--- a/kdejava/koala/Makefile.am
+++ b/kdejava/koala/Makefile.am
@@ -1,10 +1,10 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = koala
+noinst_PROGRAMS = koala
 
 ## INCLUDES were found outside kdevelop specific part
 
 koala_SOURCES = main.cpp 
-koala_LDADD   = ./kdejava/libkdejava.la $(LIB_KSPELL) -lqtjava -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
+koala_LDADD   = ./kdejava/libkdejava.la ../../qtjava/javalib/qtjava/libqtjava.la $(LIB_KSPELL) -lkparts $(LIB_KIO) -lXext -lX11 $(LIBSOCKET)
 
 SUBDIRS = org kdejava 
 
diff --git a/kdejava/koala/kdejava/Makefile.am b/kdejava/koala/kdejava/Makefile.am
index 2e90f46a..68f079c2 100644
--- a/kdejava/koala/kdejava/Makefile.am
+++ b/kdejava/koala/kdejava/Makefile.am
@@ -1,5 +1,6 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libkdejava.la
+jniloc_LTLIBRARIES = libkdejava.la
+jnilocdir = $(libdir)/jni
 
 
 ## INCLUDES were found outside kdevelop specific part
@@ -34,4 +35,4 @@ libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):
 
 libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
 
-KDE_OPTIONS = qtonly
+KDE_OPTIONS = qtonly nofinal
diff --git a/kdejava/koala/org/kde/koala/Makefile.am b/kdejava/koala/org/kde/koala/Makefile.am
index 163870dc..bae2af61 100644
--- a/kdejava/koala/org/kde/koala/Makefile.am
+++ b/kdejava/koala/org/kde/koala/Makefile.am
@@ -11,7 +11,7 @@ noinst_JAVA = $(EXTRA_DIST)
 #install-data-hook:	uninstall-javaJAVA
 
 JAVAROOT = ../../..
-CLASSPATH = $(srcdir)/../../..:$(srcdir)/../../../../../qtjava/javalib/qtjava.jar:$(srcdir)
-JAVACFLAGS = -classpath $(CLASSPATH)
+CLASSPATH = ../../..:../../../../../qtjava/javalib/qtjava.jar:.
+JAVACFLAGS = -classpath $(CLASSPATH) -encoding iso-8859-1
 # Prevent stupid automake from putting JAVAC=javac in Makefile.in
 JAVAC = @JAVAC@
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am
index eda2e3e1..175344b1 100644
--- a/kjsembed/cpptests/jsaccess/Makefile.am
+++ b/kjsembed/cpptests/jsaccess/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_
 
 INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
 
-bin_PROGRAMS    = jsaccess
+noinst_PROGRAMS    = jsaccess
 
 jsaccess_SOURCES =        jsaccess.cpp
 jsaccess_LDFLAGS =        $(all_libraries) $(KDE_RPATH)
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index f3071bb2..ff2d954a 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES=  -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
 KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
 
-kde_module_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la \
-	libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
+kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
+noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la
 METASOURCES = AUTO
 
 # the Plugin's source, library search path, and link libraries
@@ -33,6 +33,6 @@ libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la
 
 # this is where the desktop file will go
 plugindesktopdir   = $(kde_servicesdir)
-plugindesktop_DATA = customobject_plugin.desktop customqobject_plugin.desktop imagefx_plugin.desktop\
-	 qprocess_plugin.desktop kfileitem_plugin.desktop
+plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop
+noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
 
diff --git a/kjsembed/stdlib/Makefile.am b/kjsembed/stdlib/Makefile.am
index bd7e241a..279c2bf6 100644
--- a/kjsembed/stdlib/Makefile.am
+++ b/kjsembed/stdlib/Makefile.am
@@ -1,5 +1,5 @@
 # -*- makefile -*-
 
 jslibdir = $(kde_datadir)/kjsembed
-jslib_DATA = cmdline.js
+jslib_SCRIPTS = cmdline.js
 
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
index c135f4e9..56427288 100644
--- a/korundum/rubylib/korundum/Makefile.am
+++ b/korundum/rubylib/korundum/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
 
-rubylibdir = $(RUBY_SITEARCHDIR)
+rubylibdir = $(RUBY_ARCHDIR)
 rubylib_LTLIBRARIES = korundum.la
 korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
 korundum_la_METASOURCES = AUTO
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index de265e6d..81ad0bcb 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -7,9 +7,11 @@ else
   RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
   RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
   RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+  RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
   AC_SUBST(RUBY_ARCHDIR)
   AC_SUBST(RUBY_SITEARCHDIR)
+  AC_SUBST(RUBY_RUBYLIBDIR)
   AC_SUBST(RUBY_SITEDIR)
 fi
 
diff --git a/korundum/rubylib/korundum/lib/KDE/Makefile.am b/korundum/rubylib/korundum/lib/KDE/Makefile.am
index 3f7b0c53..e69bcb05 100644
--- a/korundum/rubylib/korundum/lib/KDE/Makefile.am
+++ b/korundum/rubylib/korundum/lib/KDE/Makefile.am
@@ -1,5 +1,5 @@
-kderubylibdir = $(RUBY_SITEDIR)/KDE
+kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE
 kderubylib_DATA = korundum.rb
 
-rubylibdir = $(RUBY_SITEDIR)
+rubylibdir = $(RUBY_RUBYLIBDIR)
 rubylib_DATA = Korundum.rb
diff --git a/qtjava/designer/juic/bin/juic b/qtjava/designer/juic/bin/juic
index 8104ac9b..b01cadc7 100755
--- a/qtjava/designer/juic/bin/juic
+++ b/qtjava/designer/juic/bin/juic
@@ -14,13 +14,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 
-getAbsolutePath() {
-    ls=$(ls -l $1)
-    pushd `dirname ${ls##* }` >/dev/null
-    pwd -P
-    popd >/dev/null
-}
-
 usage() {
     juic=$(basename $0)
     cat <<EOT
@@ -43,8 +36,7 @@ EOT
 #              common/
 #              java
 
-a=$(getAbsolutePath $0)
-UIXSLDIR=$(dirname "$a")
+UIXSLDIR=/usr/share/juic
 UIXSL=${UIXSLDIR}/juic.xsl
 
 ABSTRACT="true"
diff --git a/qtjava/javalib/Makefile.am b/qtjava/javalib/Makefile.am
index aa90452e..ff360c62 100644
--- a/qtjava/javalib/Makefile.am
+++ b/qtjava/javalib/Makefile.am
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-bin_PROGRAMS = javalib
+noinst_PROGRAMS = javalib
 
 ## INCLUDES were found outside kdevelop specific part
 
diff --git a/qtjava/javalib/org/kde/qt/Makefile.am b/qtjava/javalib/org/kde/qt/Makefile.am
index c05e600a..48a7978b 100644
--- a/qtjava/javalib/org/kde/qt/Makefile.am
+++ b/qtjava/javalib/org/kde/qt/Makefile.am
@@ -11,7 +11,7 @@ noinst_JAVA = $(EXTRA_DIST)
 #install-data-hook:	uninstall-javaJAVA
 
 JAVAROOT = ../../..
-CLASSPATH = $(srcdir)/../../..
+CLASSPATH = ../../..
 JAVACFLAGS = -classpath $(CLASSPATH)
 # Prevent stupid automake from putting JAVAC=javac in Makefile.in
 JAVAC = @JAVAC@
diff --git a/qtjava/javalib/qtjava/Makefile.am b/qtjava/javalib/qtjava/Makefile.am
index b1e12fa9..56279a41 100644
--- a/qtjava/javalib/qtjava/Makefile.am
+++ b/qtjava/javalib/qtjava/Makefile.am
@@ -1,5 +1,7 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
-lib_LTLIBRARIES = libqtjava.la libqtjavasupport.la
+jniloc_LTLIBRARIES = libqtjava.la
+lib_LTLIBRARIES = libqtjavasupport.la
+jnilocdir = $(libdir)/jni
 
 
 ## INCLUDES were found outside kdevelop specific part
diff --git a/qtruby/bin/rbqtapi b/qtruby/bin/rbqtapi
index 30735b48..4540b3c6 100755
--- a/qtruby/bin/rbqtapi
+++ b/qtruby/bin/rbqtapi
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby1.8
 
 # Note: this program is part of qtruby and makes use of its internal functions.
 #       You should not rely on those in your own programs.
diff --git a/qtruby/bin/rbqtsh b/qtruby/bin/rbqtsh
index b9d8ee9e..0ee674bd 100755
--- a/qtruby/bin/rbqtsh
+++ b/qtruby/bin/rbqtsh
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby1.8
 
 # rbqtsh : a graphical shell for qtruby.
 #
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index e7f21bea..af91f64c 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR)
 
-rubylibdir = $(RUBY_SITEARCHDIR)
+rubylibdir = $(RUBY_ARCHDIR)
 rubylib_LTLIBRARIES = qui.la
 qui_la_SOURCES = qui.cpp
 qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0
diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
index 1df273bf..156f80ac 100644
--- a/qtruby/rubylib/qtruby/Makefile.am
+++ b/qtruby/rubylib/qtruby/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libqtrubyinternal.la
 libqtrubyinternal_la_SOURCES = Qt.cpp handlers.cpp 
 libqtrubyinternal_la_METASOURCES = AUTO
 
-rubylibdir = $(RUBY_SITEARCHDIR)
+rubylibdir = $(RUBY_ARCHDIR)
 rubylib_LTLIBRARIES = qtruby.la
 qtruby_la_SOURCES = 
 qtruby_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index a8415512..342863e6 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE object, VALUE new_klass)
 const char *
 get_VALUEtype(VALUE ruby_value)
 {
-	char * classname = rb_obj_classname(ruby_value);
+	const char * classname = rb_obj_classname(ruby_value);
     const char *r = "";
     if(ruby_value == Qnil)
 	r = "u";
@@ -1395,7 +1395,7 @@ static Smoke::Index new_qvariant_qmap = 0;
 }
 
 static QCString *
-find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
+find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
 {
     // Look in the cache
 static QCString * mcid = 0;
@@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
 static VALUE
 method_missing(int argc, VALUE * argv, VALUE self)
 {
-	char * methodName = rb_id2name(SYM2ID(argv[0]));
+	const char * methodName = rb_id2name(SYM2ID(argv[0]));
     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
 
 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
@@ -1482,7 +1482,7 @@ static QString * pred = 0;
 
 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
 			if (_current_method == -1) {
-				char * op = rb_id2name(SYM2ID(argv[0]));
+				const char * op = rb_id2name(SYM2ID(argv[0]));
 				if (	qstrcmp(op, "-") == 0
 						|| qstrcmp(op, "+") == 0
 						|| qstrcmp(op, "/") == 0
@@ -1557,7 +1557,7 @@ static VALUE
 class_method_missing(int argc, VALUE * argv, VALUE klass)
 {
 	VALUE result = Qnil;
-	char * methodName = rb_id2name(SYM2ID(argv[0]));
+	const char * methodName = rb_id2name(SYM2ID(argv[0]));
 	VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
     temp_stack[0] = rb_str_new2("Qt");
     temp_stack[1] = rb_str_new2(methodName);
@@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
 VALUE
 getmetainfo(VALUE self, int &offset, int &index)
 {
-    char * signalname = rb_id2name(rb_frame_last_func());
+    const char * signalname = rb_id2name(rb_frame_last_func());
     VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
 
     smokeruby_object *ometa = value_obj_info(metaObject_value);
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 41654f5e..453bb68d 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -7,12 +7,14 @@ else
   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+  RUBY_RUBYLIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'`
   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
   AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR, libdir $RUBY_LIBDIR, librubyarg $RUBY_LIBRUBYARG])
   AC_SUBST(RUBY_ARCHDIR)
   AC_SUBST(RUBY_SITEARCHDIR)
   AC_SUBST(RUBY_SITEDIR)
+  AC_SUBST(RUBY_RUBYLIBDIR)
   AC_SUBST(RUBY_LIBDIR)
   AC_SUBST(RUBY_LIBRUBYARG)
 fi
diff --git a/qtruby/rubylib/qtruby/lib/Makefile.am b/qtruby/rubylib/qtruby/lib/Makefile.am
index e8f6457a..b8298cb7 100644
--- a/qtruby/rubylib/qtruby/lib/Makefile.am
+++ b/qtruby/rubylib/qtruby/lib/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = Qt 
 
-rubylibdir = $(RUBY_SITEDIR)
+rubylibdir = $(RUBY_RUBYLIBDIR)
 rubylib_DATA = Qt.rb
diff --git a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
index 267582ef..b20eb92e 100644
--- a/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
+++ b/qtruby/rubylib/qtruby/lib/Qt/Makefile.am
@@ -1,2 +1,2 @@
-qtrubylibdir = $(RUBY_SITEDIR)/Qt
+qtrubylibdir = $(RUBY_RUBYLIBDIR)/Qt
 qtrubylib_DATA = qtruby.rb