diff options
| -rw-r--r-- | kalyptus/kalyptus | 15 | ||||
| -rw-r--r-- | smoke/tde/generate.pl.in | 1 | ||||
| -rw-r--r-- | smoke/tqt/generate.pl.in | 1 |
3 files changed, 16 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; diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index d5d8416d..2bf8112c 100644 --- a/smoke/tde/generate.pl.in +++ b/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); diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index f1629222..50c3d78f 100644 --- a/smoke/tqt/generate.pl.in +++ b/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; |