Changeset 718 for trunk/perl


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/perl/Makefile.PL.in

    r708 r718  
    88
    99if ($ARGV[0] eq "DEBUG") {
    10         shift @ARGV;
    11         $DEBUG = 1;
     10    shift @ARGV;
     11    $DEBUG = 1;
    1212}
    1313
     
    1616    $LD = '@CXX@';
    1717    if ($^O eq 'darwin') {
    18         @LDDLFLAGS = ( q[-bundle], 
    19                        q[-bundle_loader /usr/bin/perl], 
     18        @LDDLFLAGS = ( q[-bundle],
     19                       q[-bundle_loader /usr/bin/perl],
    2020                       q[-L/usr/local/lib],
    2121                       q[-L$(PERL_INC) -lperl]
     
    2323    }
    2424    @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
    25         "/apps/rappture/include", "/opt/rappture/include",
    2625        "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
    2726        "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
     
    2928    $EXPAT_INC="expat.h";
    3029    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
    31         "../src/core", "../include", "/apps/rappture/include",
    32         "/opt/rappture/include", "/usr/local/include", "/opt/include");
     30        "../include", "/usr/local/include", "/opt/include");
    3331    $RAPPTURE_INC = "rappture.h";
    3432    @EXPAT_LIB_SEARCHPATH = ( "@prefix@/lib",
    35         "/apps/rappture/lib", "/opt/rappture/lib",
     33        "@libdir@",
    3634        "/usr/local/lib", "/opt/lib", "../../expat-2.0.0/lib",
    3735        "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
     
    3937    @EXPAT_LIBS=("libexpat.so", "libexpat.a");
    4038    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
    41         "../src", "/apps/rappture/lib", "/opt/rappture/lib",
    42         "/usr/local/lib", "/opt/lib" );
     39        "@libdir@",
     40        "../src", "/usr/local/lib", "/opt/lib" );
    4341    @RAPPTURE_LIBS=("librappture.so","librappture.a");
    4442}
     
    4947    }
    5048
    51     @EXPAT_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include", 
    52         "C:\\opt\\rappture\\include", "C:\\opt\\include", 
    53         "..\\..\\expat-2.0.0\\lib", "..\\..\\expat\\lib", 
    54         "C:\\Program Files\\Expat-2.0.0\\Source\\lib", 
    55         "C:\\Program Files\\Expat\\Source\\lib", 
     49    @EXPAT_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
     50        "C:\\opt\\rappture\\include", "C:\\opt\\include",
     51        "..\\..\\expat-2.0.0\\lib", "..\\..\\expat\\lib",
     52        "C:\\Program Files\\Expat-2.0.0\\Source\\lib",
     53        "C:\\Program Files\\Expat\\Source\\lib",
    5654        "C:\\opt\\expat-2.0.0\\lib", "C:\\opt\\expat\\lib" );
    5755    $EXPAT_INC="expat.h";
    58     @RAPPTURE_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include", 
     56    @RAPPTURE_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
    5957        "C:\\opt\\rappture\\include", "C:\\opt\\include", "..\\include" );
    6058    $RAPPTURE_INC = "rappture.h";
    61     @EXPAT_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib", 
    62         "C:\\opt\\rappture\\lib", "C:\\opt\\lib", 
    63         "..\\..\\expat-2.0.0\\lib\\Release_static", 
    64         "..\\..\\expat\\lib\\Release_static", 
     59    @EXPAT_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
     60        "C:\\opt\\rappture\\lib", "C:\\opt\\lib",
     61        "..\\..\\expat-2.0.0\\lib\\Release_static",
     62        "..\\..\\expat\\lib\\Release_static",
    6563        "C:\\Program Files\\Expat-2.0.0\\StaticLibs",
    66         "C:\\Program Files\\Expat\\StaticLibs", 
    67         "C:\\opt\\expat-2.0.0\\lib\\Release_static", 
     64        "C:\\Program Files\\Expat\\StaticLibs",
     65        "C:\\opt\\expat-2.0.0\\lib\\Release_static",
    6866        "C:\\opt\\expat\\lib\\Release_static" );
    6967    @EXPAT_LIBS=("libexpat.lib", "libexpatMT.lib");
    70     @RAPPTURE_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib", 
     68    @RAPPTURE_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
    7169        "C:\\opt\\rappture\\lib", "C:\\opt\\lib", "..\\src" );
    7270    @RAPPTURE_LIBS=("librappture.lib");
     
    8280                push @$incref, "-I$component";
    8381            }
    84             return 1;
     82            return 1;
    8583            last;
    8684        }
     
    109107                    push @$libref, $file;
    110108                }
    111                 return 1;
     109                return 1;
    112110                last SEARCH;
    113111            }
     
    142140
    143141sub dynamic_lib {
    144         my $inherited = shift->SUPER::dynamic_lib(@_);
    145         if (($^O eq "MSWin32") && ($Config{'cc'} eq "cl")) {
    146             $inherited .= "\tMT.EXE -manifest \$@.manifest -outputresource:\$@;2\n";
    147             $inherited .= "\t\$(RM_F) \$@.manifest\n";
    148         }
    149         return($inherited);
     142    my $inherited = shift->SUPER::dynamic_lib(@_);
     143    if (($^O eq "MSWin32") && ($Config{'cc'} eq "cl")) {
     144        $inherited .= "\tMT.EXE -manifest \$@.manifest -outputresource:\$@;2\n";
     145        $inherited .= "\t\$(RM_F) \$@.manifest\n";
     146    }
     147    return($inherited);
    150148}
    151149
Note: See TracChangeset for help on using the changeset viewer.