diff -r -u ../perl-libapreq-1.1-1-/Cookie/Makefile.PL ./Cookie/Makefile.PL
--- ../perl-libapreq-1.1-1-/Cookie/Makefile.PL	2001-04-03 12:24:08.000000000 -0700
+++ ./Cookie/Makefile.PL	2003-05-22 19:22:57.000000000 -0700
@@ -5,6 +5,7 @@
 use Apache::libapreq qw(xsubpp);
 
 my $Is_Win32 = ($^O eq "MSWin32") || $ENV{WIN32_TEST}; 
+
 my @mm_args = (
 	       'NAME'	=> 'Apache::Cookie',
 	       'VERSION_FROM' => 'Cookie.pm',
@@ -21,13 +22,18 @@
     my $root = "../blib/arch/auto/libapreq";
     mkpath $root, 1, 0755 unless -d $root;
 
+    my $libs = "-L$root -lapreq";
+    if (defined($ENV{APLIBDIR})) {
+	$libs = "-L$root -L$ENV{APLIBDIR} -lmodperl -lapreq -lhttpd";
+    }
+
     #grr, must trick ExtUtils::Liblist
     system "touch $root/libapreq.a";
     WriteMakefile(
         @mm_args,
         'INC'	=> "-I../c ". $src->inc,
         'TYPEMAPS'  => $src->typemaps,
-        'LIBS' => "-L$root -lapreq",
+        'LIBS' => $libs,
 	'dynamic_lib' => {
 		'OTHERLDFLAGS' => $src->otherldflags,
 	},
diff -r -u ../perl-libapreq-1.1-1-/Request/Makefile.PL ./Request/Makefile.PL
--- ../perl-libapreq-1.1-1-/Request/Makefile.PL	2001-04-03 12:24:09.000000000 -0700
+++ ./Request/Makefile.PL	2003-05-22 19:22:17.000000000 -0700
@@ -5,6 +5,7 @@
 use Apache::libapreq qw(xsubpp);
 
 my $Is_Win32 = ($^O eq "MSWin32") || $ENV{WIN32_TEST}; 
+
 my @mm_args = (
 	       'NAME'	=> 'Apache::Request',
 	       'VERSION_FROM' => 'Request.pm',
@@ -21,13 +22,18 @@
     my $root = "../blib/arch/auto/libapreq";
     mkpath $root, 1, 0755 unless -d $root;
 
+    my $libs = "-L$root -lapreq";
+    if (defined($ENV{APLIBDIR})) {
+	$libs = "-L$root -L$ENV{APLIBDIR} -lmodperl -lapreq -lhttpd";
+    }
+
     #grr, must trick ExtUtils::Liblist
     system "touch $root/libapreq.a";
     WriteMakefile(
 	  @mm_args,
 	  'INC'	=> "-I../c ". $src->inc,
 	  'TYPEMAPS'  => $src->typemaps,
-          'LIBS' => "-L$root -lapreq",
+          'LIBS' => $libs,
 	  'dynamic_lib' => {
 	  	'OTHERLDFLAGS' => $src->otherldflags,
 	  },