Changeset 872 for trunk/perl

Timestamp:

Feb 8, 2008 2:01:38 PM (16 years ago)

Author:

dkearney

Message:

mainly code cleanups that i've made and stored in my repository over time.

Location:

trunk/perl

Files:

• Makefile.PL.in (modified) (4 diffs)
• Rappture.xs (modified) (1 diff)

trunk/perl/Makefile.PL.in

@@ -22 +22 @@
                      );
     }
+    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
+        "../include", "/usr/local/include", "/opt/include");
+    $RAPPTURE_INC = "rappture.h";
     @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
         "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
@@ -27 +30 @@
         "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
     $EXPAT_INC="expat.h";
-    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
-        "../include", "/usr/local/include", "/opt/include");
-    $RAPPTURE_INC = "rappture.h";
+    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
+        "@libdir@",
+        "../src", "/usr/local/lib", "/opt/lib" );
+    @RAPPTURE_LIBS=("librappture.so","librappture.a");
     @EXPAT_LIB_SEARCHPATH = ( "@prefix@/lib",
         "@libdir@",
@@ -36 +40 @@
         "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
     @EXPAT_LIBS=("libexpat.so", "libexpat.a");
-    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
-        "@libdir@",
-        "../src", "/usr/local/lib", "/opt/lib" );
-    @RAPPTURE_LIBS=("librappture.so","librappture.a");
 }
 else {
@@ -115 +115 @@
 }
 
+find_include(\@RAPPTURE_INC_SEARCHPATH, $RAPPTURE_INC, \@INCLUDES);
 find_include(\@EXPAT_INC_SEARCHPATH, $EXPAT_INC, \@INCLUDES);
-find_include(\@RAPPTURE_INC_SEARCHPATH, $RAPPTURE_INC, \@INCLUDES);
+find_lib(\@RAPPTURE_LIB_SEARCHPATH, \@RAPPTURE_LIBS, \@LIBS);
 find_lib(\@EXPAT_LIB_SEARCHPATH, \@EXPAT_LIBS, \@LIBS);
-find_lib(\@RAPPTURE_LIB_SEARCHPATH, \@RAPPTURE_LIBS, \@LIBS);
 
 WriteMakefile(

trunk/perl/Rappture.xs

@@ -67 +67 @@
 void
 RpLibrary::result()
+        CODE:
+                THIS->put("tool.version.rappture.language", "perl");
+                THIS->result();
 
 MODULE = Rappture               PACKAGE = Rappture::RpUnits