Fix FTBFS when tdehw is not present. This resolves bug 2494.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 5 months ago
parent 8e06007e1b
commit 2f653946e2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
  1. 15
      kalyptus/kalyptus

@ -27,7 +27,7 @@ use vars qw/ %rootNodes $declNodeType @includes_list %options @formats_wanted $a
$libdir $libname $outputdir @libs $parse_global_space $qt_embedded $qt4 $striphpath $doPrivate $readstdin
$Version $quiet $debug $debuggen $parseonly $currentfile $cSourceNode $exe
%formats %flagnames @allowed_k_dcop_accesors $allowed_k_dcop_accesors_re $rootNode
@classStack $cNode $globalSpaceClassName
@classStack $cNode $globalSpaceClassName $have_tdehw_lib
$lastLine $docNode @includes $cpp $defcppcmd $cppcmd $docincluded
$inExtern $inNamespace %stats %definitions @inputqueue @codeqobject @qt4_codeqobject @qte_codeqobject /;
@ -230,6 +230,18 @@ if ( $#includes >= 0 && !$cpp ) {
die "$exe: --includedir requires --cpp\n";
}
# Check for tdehw lib headers presence
if (-e "$ENV{TDEDIR}/include/kdemacros.h")
{
$have_tdehw_lib = 1;
print "tdehw headers found\n";
}
else
{
$have_tdehw_lib = 0;
print "tdehw headers not found\n";
}
# Check output formats. HTML is the default
if( $#formats_wanted < 0 ) {
push @formats_wanted, "java";
@ -602,6 +614,7 @@ LOOP:
$p =~ m/^#\s*if\s+defined\s*\(qdoc/ or
$p =~ m/^#\s*ifndef\s+TQT_NO_MEMBER_TEMPLATES/ or
$p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
(not $have_tdehw_lib and $p =~ m/^#\s*ifdef\s+__TDE_HAVE_TDEHWLIB/) or
&$match_qt_defines( $p ) or
$p =~ m/^#\s*if\s+0\s+/ ) {
my $if_depth = 1;

Loading…
Cancel
Save