diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-04-26 11:49:41 +0900 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2022-05-02 22:34:28 +0200 |
commit | 9e6f7cc6edf551e435d213cd60db2238a06cb892 (patch) | |
tree | 65c98bda5f51e8edcfab3ef2dfce6267dee41a2d /kalyptus | |
parent | 4532e7bde91b00a579447aed47542f3994d8bcd8 (diff) | |
download | tdebindings-9e6f7cc6edf551e435d213cd60db2238a06cb892.tar.gz tdebindings-9e6f7cc6edf551e435d213cd60db2238a06cb892.zip |
Fix FTBFS when tdehw is not present. This resolves bug 2494.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kalyptus')
-rw-r--r-- | kalyptus/kalyptus | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 21b0a519..a132a0bd 100644 --- a/kalyptus/kalyptus +++ b/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{KDE_PREFIX}/include/tdehardwaredevices.h") +{ + $have_tdehw_lib = 1; + print "kalyptus: tdehw headers found in $ENV{KDE_PREFIX}/include\n"; +} +else +{ + $have_tdehw_lib = 0; + print "kalyptus: tdehw headers not found in $ENV{KDE_PREFIX}/include\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; |