[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kde-common/admin
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2011-05-17 5:44:47
Message-ID: 20110517054447.0C333AC76D () svn ! kde ! org
[Download RAW message or body]

SVN commit 1232319 by tpearson:

Fix dcopidl calling issues
Apply 06_autoconf2.64.diff from Debian basket 1.0.2-8 to fix .so files not being \
generated


 M  +4 -4      am_edit  
 M  +2 -0      configure.in.min  


--- branches/trinity/kde-common/admin/am_edit #1232318:1232319
@@ -1264,7 +1264,7 @@
             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 @@
 
                 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) {
--- branches/trinity/kde-common/admin/configure.in.min #1232318:1232319
@@ -44,6 +44,8 @@
 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)


[prev in list] [next in list] [prev in thread] [next in thread]