* 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

1 files changed, 8 insertions, 8 deletions

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