diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-10 01:55:05 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-10 01:55:05 -0500 |
| commit | b2e0df6cf55f8accd86fb0a726724744857714f4 (patch) | |
| tree | 79d585af09ab3e1a22393a8d80bcb23b7a26e9bc /dcopperl | |
| parent | c87286d815eddf298686450f1ef1bf033161db84 (diff) | |
| download | tdebindings-b2e0df6cf55f8accd86fb0a726724744857714f4.tar.gz tdebindings-b2e0df6cf55f8accd86fb0a726724744857714f4.zip | |
Fix a number of tdebindings build issues
This partially resolves Bug 597
Thanks to Darrell Anderson for the patch!
Diffstat (limited to 'dcopperl')
| -rw-r--r-- | dcopperl/DCOP.xs | 10 | ||||
| -rw-r--r-- | dcopperl/Makefile.PL | 24 | ||||
| -rw-r--r-- | dcopperl/Makefile.PL.in | 10 |
3 files changed, 22 insertions, 22 deletions
diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs index 7c6280dc..e5384478 100644 --- a/dcopperl/DCOP.xs +++ b/dcopperl/DCOP.xs @@ -26,11 +26,11 @@ #undef vform #endif -#include <qpoint.h> -#include <qrect.h> -#include <qregexp.h> -#include <qsize.h> -#include <qstringlist.h> +#include <tqpoint.h> +#include <tqrect.h> +#include <tqregexp.h> +#include <tqsize.h> +#include <tqstringlist.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL index 66121e65..fbd26f0a 100644 --- a/dcopperl/Makefile.PL +++ b/dcopperl/Makefile.PL @@ -4,30 +4,30 @@ use Config; # the contents of the Makefile that is written. print "Trying to find some configuration information...\n"; -my $kde_dirs = $ENV{TDEDIRS} || '/usr/local/kde'; -my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt'; -my $kde_inc = "$kde_dirs/include"; -my $kde_lib = "$kde_dirs/lib"; +my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity'; +my $qt_dir = $ENV{QTDIR} || '/opt/trinity/lib'; +my $tde_inc = "$tde_dirs/include"; +my $tde_lib = "$tde_dirs/lib"; my $qt_inc = "$qt_dir/include"; my $qt_lib = "$qt_dir/lib"; -$kde_inc = undef unless -f "$kde_inc/dcopclient.h"; -$kde_lib = undef unless -f "$kde_lib/libDCOP.$Config{dlext}"; +$tde_inc = undef unless -f "$tde_inc/dcopclient.h"; +$tde_lib = undef unless -f "$tde_lib/libDCOP.$Config{dlext}"; $qt_dir = undef unless -f "$qt_inc/qglobal.h"; print "Path to Qt headers? [$qt_inc]: "; chomp $input, $qt_inc = $input if (($input = <>) =~ /\S/); print "Path to Qt libraries? [$qt_lib]: "; chomp $input, $qt_lib = $input if (($input = <>) =~ /\S/); -print "Path to KDE headers? [$kde_inc]: "; -chomp $input, $kde_inc = $input if (($input = <>) =~ /\S/); -print "Path to KDE libraries? [$kde_lib]: "; -chomp $input, $kde_lib = $input if (($input = <>) =~ /\S/); +print "Path to TDE headers? [$tde_inc]: "; +chomp $input, $tde_inc = $input if (($input = <>) =~ /\S/); +print "Path to TDE libraries? [$tde_lib]: "; +chomp $input, $tde_lib = $input if (($input = <>) =~ /\S/); WriteMakefile( NAME => 'DCOP', VERSION_FROM => 'DCOP.pm', - INC => "-I$qt_inc -I$kde_inc", - LIBS => "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP", + INC => "-I$qt_inc -I$tde_inc -I/usr/include/tqt", + LIBS => "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP", XS => {'DCOP.xs' => 'DCOP.cpp'}, XSOPT => '-C++', CCFLAGS => '-x c++', diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in index 3c5e0c18..a1b7b3e2 100644 --- a/dcopperl/Makefile.PL.in +++ b/dcopperl/Makefile.PL.in @@ -4,16 +4,16 @@ use Config; # the contents of the Makefile that is written. print "Trying to find some configuration information...\n"; -my $kde_inc = "@kde_includes@"; -my $kde_lib = "@kde_libraries@"; +my $tde_inc = "@tde_includes@"; +my $tde_lib = "@tde_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", - LIBS => "-L$qt_lib -ltqt-mt -L$kde_lib -ltdecore -lDCOP", + INC => "-I$qt_inc -I$tde_inc -I/usr/include/tqt", + LIBS => "-L$qt_lib -ltqt-mt -L$tde_lib -ltdecore -lDCOP", XS => {'DCOP.xs' => 'DCOP.cpp'}, XSOPT => '-C++', CCFLAGS => '-x c++', |