--- admin/acinclude.m4.in	2008-08-19 22:20:50.000000000 +0200
+++ admin/acinclude.m4.in	2011-04-21 14:51:52.000000000 +0200
@@ -4649,7 +4649,8 @@
 
 AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.5",
+ KDE_CHECK_PYTHON_INTERN("2.6",
+  [KDE_CHECK_PYTHON_INTERN("2.5",
     [KDE_CHECK_PYTHON_INTERN("2.4",
      [KDE_CHECK_PYTHON_INTERN("2.3", 
        [KDE_CHECK_PYTHON_INTERN("2.2", 
@@ -4660,6 +4661,7 @@
          ])
        ])
      ])
+   ])
   ])
 ])

--- admin/cvs.sh~       2008-08-19 23:28:39.000000000 +0300
+++ admin/cvs.sh        2009-05-19 13:34:47.966210297 +0300
@@ -68,7 +68,7 @@
     echo "*** KDE requires automake $required_automake_version"
     exit 1
     ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
     echo "*** $AUTOMAKE_STRING found."
     UNSERMAKE=no
     ;;

--- admin/acinclude.m4.in	2010-07-09 14:15:14.492796798 +0300
+++ admin/acinclude.m4.in	2010-07-09 14:15:54.851671349 +0300
@@ -3056,8 +3056,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3116,11 +3126,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3149,10 +3154,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3478,8 +3479,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX