Changeset 718 for trunk/perl/Makefile.PL.in

Timestamp:

May 9, 2007 1:48:39 PM (14 years ago)

Author:

dkearney

Message:

after the core rappture library (librappture.so) is created the include
files necessary to compile all other bindings are copied to the top level
include directory. python, perl, matlab, octave and tcl bindings now refer
to this top level include directory to find header files.

fortran and c examples are only compiled if we find a compiler, this check
helps prevent builds from failing before the libraries are installed.

added more checks to the configure script

removed rappture search paths from perl's unix build because perl could find
an older version of rappture and compile against it. I would rather the build
fail and have the person enter a valid prefix.

addrd the -fPIC flag to CFLAGS in src2's makefile

File:

• trunk/perl/Makefile.PL.in (modified) (9 diffs)

trunk/perl/Makefile.PL.in

@@ -8 +8 @@
 
 if ($ARGV[0] eq "DEBUG") {
-        shift @ARGV;
-        $DEBUG = 1;
+    shift @ARGV;
+    $DEBUG = 1;
 }
 
@@ -16 +16 @@
     $LD = '@CXX@';
     if ($^O eq 'darwin') {
-        @LDDLFLAGS = ( q[-bundle], 
-                       q[-bundle_loader /usr/bin/perl], 
+        @LDDLFLAGS = ( q[-bundle],
+                       q[-bundle_loader /usr/bin/perl],
                        q[-L/usr/local/lib],
                        q[-L$(PERL_INC) -lperl]
@@ -23 +23 @@
     }
     @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
-        "/apps/rappture/include", "/opt/rappture/include",
         "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
         "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
@@ -29 +28 @@
     $EXPAT_INC="expat.h";
     @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
-        "../src/core", "../include", "/apps/rappture/include",
-        "/opt/rappture/include", "/usr/local/include", "/opt/include");
+        "../include", "/usr/local/include", "/opt/include");
     $RAPPTURE_INC = "rappture.h";
     @EXPAT_LIB_SEARCHPATH = ( "@prefix@/lib",
-        "/apps/rappture/lib", "/opt/rappture/lib",
+        "@libdir@",
         "/usr/local/lib", "/opt/lib", "../../expat-2.0.0/lib",
         "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
@@ -39 +37 @@
     @EXPAT_LIBS=("libexpat.so", "libexpat.a");
     @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
-        "../src", "/apps/rappture/lib", "/opt/rappture/lib",
-        "/usr/local/lib", "/opt/lib" );
+        "@libdir@",
+        "../src", "/usr/local/lib", "/opt/lib" );
     @RAPPTURE_LIBS=("librappture.so","librappture.a");
 }
@@ -49 +47 @@
     }
 
-    @EXPAT_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include", 
-        "C:\\opt\\rappture\\include", "C:\\opt\\include", 
-        "..\\..\\expat-2.0.0\\lib", "..\\..\\expat\\lib", 
-        "C:\\Program Files\\Expat-2.0.0\\Source\\lib", 
-        "C:\\Program Files\\Expat\\Source\\lib", 
+    @EXPAT_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
+        "C:\\opt\\rappture\\include", "C:\\opt\\include",
+        "..\\..\\expat-2.0.0\\lib", "..\\..\\expat\\lib",
+        "C:\\Program Files\\Expat-2.0.0\\Source\\lib",
+        "C:\\Program Files\\Expat\\Source\\lib",
         "C:\\opt\\expat-2.0.0\\lib", "C:\\opt\\expat\\lib" );
     $EXPAT_INC="expat.h";
-    @RAPPTURE_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include", 
+    @RAPPTURE_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
         "C:\\opt\\rappture\\include", "C:\\opt\\include", "..\\include" );
     $RAPPTURE_INC = "rappture.h";
-    @EXPAT_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib", 
-        "C:\\opt\\rappture\\lib", "C:\\opt\\lib", 
-        "..\\..\\expat-2.0.0\\lib\\Release_static", 
-        "..\\..\\expat\\lib\\Release_static", 
+    @EXPAT_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
+        "C:\\opt\\rappture\\lib", "C:\\opt\\lib",
+        "..\\..\\expat-2.0.0\\lib\\Release_static",
+        "..\\..\\expat\\lib\\Release_static",
         "C:\\Program Files\\Expat-2.0.0\\StaticLibs",
-        "C:\\Program Files\\Expat\\StaticLibs", 
-        "C:\\opt\\expat-2.0.0\\lib\\Release_static", 
+        "C:\\Program Files\\Expat\\StaticLibs",
+        "C:\\opt\\expat-2.0.0\\lib\\Release_static",
         "C:\\opt\\expat\\lib\\Release_static" );
     @EXPAT_LIBS=("libexpat.lib", "libexpatMT.lib");
-    @RAPPTURE_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib", 
+    @RAPPTURE_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
         "C:\\opt\\rappture\\lib", "C:\\opt\\lib", "..\\src" );
     @RAPPTURE_LIBS=("librappture.lib");
@@ -82 +80 @@
                 push @$incref, "-I$component"; 
             }
-            return 1;
+            return 1;
             last;
         }
@@ -109 +107 @@
                     push @$libref, $file;
                 }
-                return 1;
+                return 1;
                 last SEARCH;
             }
@@ -142 +140 @@
 
 sub dynamic_lib {
-        my $inherited = shift->SUPER::dynamic_lib(@_);
-        if (($^O eq "MSWin32") && ($Config{'cc'} eq "cl")) {
-            $inherited .= "\tMT.EXE -manifest \$@.manifest -outputresource:\$@;2\n";
-            $inherited .= "\t\$(RM_F) \$@.manifest\n";
-        }
-        return($inherited);
+    my $inherited = shift->SUPER::dynamic_lib(@_);
+    if (($^O eq "MSWin32") && ($Config{'cc'} eq "cl")) {
+        $inherited .= "\tMT.EXE -manifest \$@.manifest -outputresource:\$@;2\n";
+        $inherited .= "\t\$(RM_F) \$@.manifest\n";
+    }
+    return($inherited);
 }