[svn:mod_parrot] r235 - mod_parrot/trunk

Author: jhorwitz
Date: Sun Jul 29 16:53:34 2007
New Revision: 235

Modified:
   mod_parrot/trunk/Configure.pl
   mod_parrot/trunk/Makefile.in

Log:
make sure apache can find shared libparrot during tests


Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl	(original)
+++ mod_parrot/trunk/Configure.pl	Sun Jul 29 16:53:34 2007
@@ -75,8 +75,9 @@
 # we can't use the config verbatim -- apxs chokes on it, so we use what we can
 my $cflags = " -I$parrot_build_dir/include -Iinclude";
 $cflags .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
-my $ldflags = parrot_config('ldflags') . " -L$parrot_build_dir/blib/lib";
-my $libs = parrot_config('libs') . ' -lparrot';
+my $ldflags = parrot_config('libparrot_ldflags');
+my $libs = parrot_config('libs') . " -lparrot";
+my $blib_dir = parrot_config('blib_dir');
 
 print "Generating Makefile...";
 my $template;
@@ -93,6 +94,7 @@
 $template =~ s/\@APXS\@/$apxs/g;
 $template =~ s/\@PERL\@/$perl/g;
 $template =~ s/\@PARROT_SOURCE\@/$parrot_build_dir/g;
+$template =~ s/\@PARROT_BLIB_DIR\@/$parrot_build_dir\/$blib_dir/g;
 $template =~ s/\@PARROT\@/$parrot_build_dir\/parrot/g;
 $template =~ s/\@APACHE_INCLUDE_DIR\@/$apache_include_dir/g;
 $template =~ s/\@CALLING_CONVENTIONS\@/$calling_conventions/g;

Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in	(original)
+++ mod_parrot/trunk/Makefile.in	Sun Jul 29 16:53:34 2007
@@ -9,6 +9,7 @@
 PERL=@PERL@
 APXS=@APXS@
 PARROT_SOURCE=@PARROT_SOURCE@
+PARROT_BLIB_DIR=@PARROT_BLIB_DIR@
 PARROT=@PARROT@
 APACHE_INCLUDE_DIR=@APACHE_INCLUDE_DIR@
 CALLING_CONVENTIONS=@CALLING_CONVENTIONS@
@@ -75,4 +76,4 @@
 
 test: $(SRC_DIR)/mod_parrot.la libraries
 	$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir
-	$(PERL) t/TEST
+	LD_LIBRARY_PATH=$(PARROT_BLIB_DIR) $(PERL) t/TEST