From 1ae8a03ee70f271ead5a7ac90f1fadd369d3c1bd Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 12 Sep 2003 17:08:02 +0000 Subject: stuff doesn't contain gtk stuff anymore --- perl-install/c/Makefile.PL | 4 ++-- perl-install/c/stuff.xs.pl | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index 2de111c19..7bf7ce128 100644 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -7,7 +7,7 @@ use Config; my $lib = arch() =~ /x86_64/ ? 'lib64' : 'lib'; my $libs = '-lldetect -lext2fs'; -$libs .= " -L/usr/X11R6/$lib -lX11 -lXext -lgdk -lXxf86misc" if $ENV{C_DRAKX}; +$libs .= " -L/usr/X11R6/$lib -lX11 -lXext -lXxf86misc" if $ENV{C_DRAKX}; $libs .= ' -lrpm -lrpmdb -lrpmio -lpopt -lz' if $ENV{C_RPM}; my $pcmcia_dir = $ENV{C_DRAKX} && $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia_' : ''; @@ -22,5 +22,5 @@ WriteMakefile( 'VERSION_FROM' => 'stuff.pm', # finds $VERSION 'LIBS' => [$libs], # e.g., '-lm' 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => "-I/usr/include/rpm `pkg-config gtk+-2.0 --cflags`" . ($pcmcia_dir && " -I$pcmcia_dir -I$pcmcia_dir/.."), + 'INC' => "-I/usr/include/rpm " . ($pcmcia_dir && " -I$pcmcia_dir -I$pcmcia_dir/.."), ); diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index d65afeeb2..fb9f86074 100644 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -83,8 +83,6 @@ void rpmError_callback(void) { $ENV{C_DRAKX} and print ' -#include - void initIMPS2() { unsigned char imps2_s1[] = { 243, 200, 243, 100, 243, 80, }; unsigned char imps2_s2[] = { 246, 230, 244, 243, 100, 232, 3, }; -- cgit v1.2.1