[smolder-commits] SF.net SVN: smolder: [801] trunk

[<mic...@us...>]

Revision: 801
          http://smolder.svn.sourceforge.net/smolder/?rev=801&view=rev
Author:   michael_peters
Date:     2008-07-04 18:36:01 -0700 (Fri, 04 Jul 2008)

Log Message:
-----------
improving build for Debian/Ubuntu

Modified Paths:
--------------
    trunk/docs/Changes.pod
    trunk/platform/Debian/Platform.pm

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:23500
ef85ff6a-427b-4ddd-bce6-61dc0fed61e7:/local/smolder/trunk:51068
   + 6cb60ec2-19fc-4f48-ba02-516b4c84136d:/local/smolder:23500
ef85ff6a-427b-4ddd-bce6-61dc0fed61e7:/local/smolder/trunk:51069

Modified: trunk/docs/Changes.pod
===================================================================
--- trunk/docs/Changes.pod	2008-07-05 01:35:53 UTC (rev 800)
+++ trunk/docs/Changes.pod	2008-07-05 01:36:01 UTC (rev 801)
@@ -18,6 +18,8 @@
 
 =item * Fixed build and install on 0SX 10.5 (Leopard) - Elizabeth Cortell
 
+=item * Improved build and error messages on Ubuntu - Elizabeth Cortell
+
 =back
 
 =head2 1.22

Modified: trunk/platform/Debian/Platform.pm
===================================================================
--- trunk/platform/Debian/Platform.pm	2008-07-05 01:35:53 UTC (rev 800)
+++ trunk/platform/Debian/Platform.pm	2008-07-05 01:36:01 UTC (rev 801)
@@ -20,4 +20,25 @@
 	}
 }
 
+# some versions of Debian (at least Ubuntu Hardy Heron)
+# don't have libperl.so, they have libperl.so.5.8.8 or something
+# like that
+sub check_libperl {
+    my ($pkg, @args) = @_;
+    eval {
+        Smolder::Platform->check_libperl(@args);
+    };
+    if( $@ ) {
+        if( $@ =~ /library is required/i ) {
+            die "\n\nWe could not find libperl.so on your system. "
+                . "Perhaps you need a symlink to libperl.so"
+                . sprintf('%vd', $^V)
+                . "\n\n$@\n";
+                
+        } else {
+            die $@;
+        }
+    }
+}
+
 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.