Browse Source

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>
master
Michele Calgaro 2 months ago committed by Slávek Banko
parent
commit
9e6f7cc6ed
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668
  1. 15
      kalyptus/kalyptus
  2. 1
      smoke/tde/generate.pl.in
  3. 1
      smoke/tqt/generate.pl.in

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{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;

1
smoke/tde/generate.pl.in

@ -185,6 +185,7 @@ find(
);
# Launch kalyptus
$ENV{KDE_PREFIX} = "@KDE_PREFIX@";
system "perl kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --allow_k_dcop_accessors --outputdir=$outdir @headers @kdeheaders";
my $exit = $? >> 8;
exit $exit if ($exit);

1
smoke/tqt/generate.pl.in

@ -132,6 +132,7 @@ foreach $filename (readdir(QT)) {
closedir QT;
# Launch kalyptus
$ENV{KDE_PREFIX} = "@KDE_PREFIX@";
chdir "../smoke/tqt";
system "perl -I@top_srcdir@/kalyptus @top_srcdir@/kalyptus/kalyptus @ARGV --globspace -fsmoke --name=qt $macros --no-cache --outputdir=$outdir @headers";
my $exit = $? >> 8;

Loading…
Cancel
Save