From a3311933f3fbdca7779b1ce478105eb095bdb02e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 20 Mar 2001 13:03:20 +0000
Subject: have pcmcia_probe in stage2 (for non pcmcia.img, stage1 doesn't give
 the parameter any more)

---
 perl-install/c/Makefile.PL | 6 ++++--
 perl-install/c/stuff.xs.pm | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'perl-install/c')

diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL
index 080a755e0..5739da12c 100644
--- a/perl-install/c/Makefile.PL
+++ b/perl-install/c/Makefile.PL
@@ -6,13 +6,15 @@ my $libs = '-lldetect';
 $libs .= ' -L/usr/X11R6/lib -lX11 -lgdk -lXxf86misc' if $ENV{C_DRAKX};
 $libs .= ' -lrpm -lrpmio -lz' if $ENV{C_RPM};
 
+my $pcmcia_dir = '../../mdk-stage1/pcmcia';
+
 WriteMakefile(
     'NAME'	=> 'stuff',
     'OPTIMIZE'  => '-Os',
     'MAKEFILE'  => 'Makefile_c',
-    'OBJECT'    => 'stuff.o smp.o sbus.o silo.o',
+    'OBJECT'    => "stuff.o smp.o sbus.o silo.o $pcmcia_dir/pcmcia_probe.o",
     'VERSION_FROM' => 'stuff.pm', # finds $VERSION
     'LIBS'	=> [$libs],   # e.g., '-lm' 
     'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
-    'INC'	=> '-I/usr/include/rpm `gtk-config --cflags` `glib-config --cflags`',     # e.g., '-I/usr/include/other' 
+    'INC'	=> "-I/usr/include/rpm -I$pcmcia_dir `gtk-config --cflags` `glib-config --cflags`",     # e.g., '-I/usr/include/other' 
 );
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 590053618..bcc14f24a 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -78,6 +78,9 @@ void initIMPS2() {
   tcflush (fd, TCIFLUSH);
   tcdrain(fd);
 }
+
+void log_message(const char * s, ...) {}
+
 ';
 
 print '
@@ -104,6 +107,9 @@ Xtest(display)
 ';
 
 $ENV{C_DRAKX} and print '
+char *
+pcmcia_probe()
+
 void
 setMouseLive(display, type, emulate3buttons)
   char *display
-- 
cgit v1.2.1