diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-17 05:44:46 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-17 05:44:46 +0000 |
| commit | 770d3ed66830982f9e76f11ff2ed6be11bd9c042 (patch) | |
| tree | bdf1acdcbbdf00d7ce2181f7a6506e6ee10c4fec | |
| parent | 645b876e7388a53d53aeb390cfbb3d773cc088b1 (diff) | |
| download | other-770d3ed6.tar.gz other-770d3ed6.zip | |
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@1232319 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | admin/am_edit | 8 | ||||
| -rw-r--r-- | admin/configure.in.min | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/admin/am_edit b/admin/am_edit index 668c5ac..867565b 100644 --- a/admin/am_edit +++ b/admin/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/admin/configure.in.min b/admin/configure.in.min index 0dfe378..a8a4292 100644 --- a/admin/configure.in.min +++ b/admin/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) |