Browse Source

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
tags/v3.5.13
tpearson 9 years ago
parent
commit
72af58a8d2
2 changed files with 6 additions and 4 deletions
  1. +4
    -4
      am_edit
  2. +2
    -0
      configure.in.min

+ 4
- 4
am_edit View File

@@ -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) {


+ 2
- 0
configure.in.min View File

@@ -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)


Loading…
Cancel
Save