--- xmlwrapp-0.5.0.orig/configure.pl	2009-02-06 18:06:37.000000000 +0100
+++ xmlwrapp-0.5.0.orig/configure.pl	2009-02-06 18:57:43.000000000 +0100
@@ -125,6 +125,7 @@ 
   --contrib            Configure for being bundled inside another project
   --disable-shared     Don't build a shared library
   --disable-examples   Don't build the example programs
+  --disable-xslt       Don't build with xslt
   --enable-tests       Enable the building of test programs
 
   --xml2-config file   Run file to get info about libxml2 [xml2-config]
@@ -405,12 +406,12 @@ 
 	print STDERR "\n**** hey, I can't cd into my src/$src_sub_dir directory: $!\n";
 	exit 1;
     }
-
     my $extra_flags = "--shared-lib $libname --major $xmlwrapp_mjr" unless $clo{'disable-shared'};
+    $extra_flags = "$extra_flags --linkwith xslt" unless $clo{'disable-xslt'};
     foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
 
     print "Creating src/$src_sub_dir/Makefile ...\n";
-    system("$^X $mkmf $mkmf_flags --static-lib $libname $extra_flags *.cxx");
+    system("$^X $mkmf $mkmf_flags --static-lib $libname --linkwith xml2 $extra_flags *.cxx");
     chdir($cwd);
 
     ##
@@ -420,11 +421,11 @@ 
 	exit 1;
     }
 
-    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr" unless $clo{'disable-shared'};
+    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr --linkwith $cwd${dirsep}src${dirsep}$xslt_sub_dir,$libname" unless $clo{'disable-shared'};
     foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
 
     print "Creating src/$xslt_sub_dir/Makefile ...\n";
-    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname $extra_flags *.cxx");
+    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname --linkwith xslt --linkwith exslt $extra_flags *.cxx");
     chdir($cwd);
 }
 ################################################################################
--- xmlwrapp-0.5.0.orig/tools/mkmf	2009-02-06 18:06:37.000000000 +0100
+++ xmlwrapp-0.5.0.orig/tools/mkmf	2009-02-06 18:33:06.000000000 +0100
@@ -234,11 +234,11 @@ 
     }
 
     $lib = $static_lib_prefix . $lib . $static_lib_extension;
-    addflags($ENV{'LDFLAGS'}, "'$path$lib'");
+    addflags($ENV{'POST_LDFLAGS'}, "'$path$lib'");
 }
 
 foreach (@{$clo{'linkwith'}}) {
-    addflags($ENV{'LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
+    addflags($ENV{'POST_LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
 }
 
 foreach (@{$clo{'include'}}) {