diff --git a/configure.in.in b/configure.in.in index 71b17442..1516da05 100644 --- a/configure.in.in +++ b/configure.in.in @@ -302,4 +302,4 @@ dnl Check if knewstuff is present, if not don't bother.. KDE_CHECK_KNS dnl remove when fixed -DO_NOT_COMPILE="$DO_NOT_COMPILE dcopjava qtsharp" +DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp" diff --git a/dcopc/configure.in.in b/dcopc/configure.in.in index a1cac53e..56d3e9bc 100644 --- a/dcopc/configure.in.in +++ b/dcopc/configure.in.in @@ -1,7 +1,3 @@ -dnl if test "$GTK_CONFIG" = "no"; then - DO_NOT_COMPILE="$DO_NOT_COMPILE dcopc" -dnl fi -dnl dnl AC_CHECK_GETHOSTNAME AC_GTK_2 diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs index 509366af..177b6769 100644 --- a/dcopperl/DCOP.xs +++ b/dcopperl/DCOP.xs @@ -26,11 +26,11 @@ #undef vform #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL index c22ff234..085fc266 100644 --- a/dcopperl/Makefile.PL +++ b/dcopperl/Makefile.PL @@ -4,7 +4,7 @@ use Config; # the contents of the Makefile that is written. print "Trying to find some configuration information...\n"; -my $kde_dirs = $ENV{KDEDIRS} || '/usr/local/kde'; +my $kde_dirs = $ENV{KDEDIRS} || '/opt/trinity'; my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt'; my $kde_inc = "$kde_dirs/include"; my $kde_lib = "$kde_dirs/lib"; @@ -26,7 +26,7 @@ chomp $input, $kde_lib = $input if (($input = <>) =~ /\S/); WriteMakefile( NAME => 'DCOP', VERSION_FROM => 'DCOP.pm', - INC => "-I$qt_inc -I$kde_inc", + INC => "-I$qt_inc -I$kde_inc -I/usr/include/tqt", LIBS => "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP", XS => {'DCOP.xs' => 'DCOP.cpp'}, XSOPT => '-C++', diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in index 2a8e355b..a0a3ac14 100644 --- a/dcopperl/Makefile.PL.in +++ b/dcopperl/Makefile.PL.in @@ -8,11 +8,11 @@ my $kde_inc = "@kde_includes@"; my $kde_lib = "@kde_libraries@"; my $qt_inc = "@qt_includes@"; my $qt_lib = "@qt_libraries@"; - + WriteMakefile( NAME => 'DCOP', VERSION_FROM => '@srcdir@/DCOP.pm', - INC => "-I$qt_inc -I$kde_inc", + INC => "-I$qt_inc -I$kde_inc -I/usr/include/tqt", LIBS => "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP", XS => {'DCOP.xs' => 'DCOP.cpp'}, XSOPT => '-C++', diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs index e6243250..3387dbf8 100644 --- a/qtsharp/src/generator/Printer.cs +++ b/qtsharp/src/generator/Printer.cs @@ -226,7 +226,7 @@ namespace QtCSharp { { if (check) return "\n\n\t\t\tif ((qparent = parent) != null)\n" + - "\t\t\t\parent.AddChild (this);\n"; + "\t\t\tparent.AddChild (this);\n"; else return ""; } diff --git a/xparts/configure.in.in b/xparts/configure.in.in index 284c0cf5..0e54b28f 100644 --- a/xparts/configure.in.in +++ b/xparts/configure.in.in @@ -1 +1 @@ -DO_NOT_COMPILE="$DO_NOT_COMPILE xparts" +# DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"