Attached a patch for the rrd-tool LIBDBI integration with the following improvements:

[rrdtool.git] / bindings / perl-shared / Makefile.PL

diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
index 75834ec..8dd92d6 100644 (file)
--- a/bindings/perl-shared/Makefile.PL
+++ b/bindings/perl-shared/Makefile.PL
@@ -3,14 +3,20 @@ use Config;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 
-# Specify the location of the archive containing PIC compiled object files.
-my $R = "";
-
-
-for ($^O){
-        /linux/   && do{ $R = "-Wl,--rpath -Wl,\$(RPATH)"};
-        /hpux/    && do{ $R = "+b\$(RPATH)"};
-        /solaris/ && do{ $R = "-R\$(RPATH)"};
+# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
+# path to librrd.so then the Makefile will be written such that RRDs.so knows
+# where to find librrd.so later on ... 
+my $R="";
+if ($ARGV[-1] =~ /RPATH=(\S+)/){
+       pop @ARGV;
+       my $rp = $1;
+       for ($^O){
+               /linux/   && do{ $R = "-Wl,--rpath -Wl,$rp"};
+               /hpux/    && do{ $R = "+b$rp"};
+               /solaris/ && do{ $R = "-R$rp"};
+               /bsd/     && do{ $R = "-R$rp"};
+                /aix/     && do{ $R = "-Wl,-blibpath:$rp"};
+       }
 }
 
 # darwin works without this because librrd contains its
@@ -26,6 +32,9 @@ WriteMakefile(
     'DEFINE'      => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
     'INC'          => '-I../../src',
     # Perl will figure out which one is valid
-    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
+    #'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
+    'depend'       => {'RRDs.c' => "../../src/librrd.la"},
+    'LDFROM'       => '$(OBJECT) '.$librrd, 
     'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' }
 );
+