From 72af58a8d2445a955f2e2036494ea3e56dc366e9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 17 May 2011 05:44:46 +0000
Subject: [PATCH] Fix dcopidl calling issues Apply 06_autoconf2.64.diff from
 Debian basket 1.0.2-8 to fix .so files not being generated

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common/admin@1232319 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 am_edit          | 8 ++++----
 configure.in.min | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/am_edit b/am_edit
index 668c5ac..867565b 100644
--- a/am_edit
+++ b/am_edit
@@ -1264,7 +1264,7 @@ sub tag_IDLFILES ()
             if ($allidls !~ /$source\_kidl/) {
                 
                 $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG) \$(DCOPIDLNG)" : " \$(TQTDCOPIDL) \$(DCOPIDL)";
+                $dcopidl =  $use_ng ? "KDECONFIG=\"\$(KDECONFIG)\" \$(TQTDCOPIDLNG)" : " \$(TQTDCOPIDL)";
 
                 $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
                 $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
@@ -1278,11 +1278,11 @@ sub tag_IDLFILES ()
 
                 if ($skel) {
                     $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n";
-                    $dep_lines .= "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
+                    $dep_lines .= "\t\$(TQTDCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
                 } elsif ($stub) {
-                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
                 } else { # signals - obsolete, remove in KDE 4
-                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) \$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
+                    $dep_lines_tmp = "\t\$(TQTDCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
                 }
 
                 if ($stub || $signals) {
diff --git a/configure.in.min b/configure.in.min
index 0dfe378..a8a4292 100644
--- a/configure.in.min
+++ b/configure.in.min
@@ -44,6 +44,8 @@ dnl generate the config header
 AM_CONFIG_HEADER(config.h) dnl at the distribution this done
 
 dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_CXX
 AC_CHECK_COMPILERS
 AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)