#4528 : support for running mapscript tests without having to install…

… core mapserver
MapServer · Feb 14, 2013 · a4ac07d · a4ac07d
1 parent b240378
commit a4ac07d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/mapscript/perl/Makefile.PL.in b/mapscript/perl/Makefile.PL.in
@@ -18,7 +18,7 @@ $inc =~ s/\-I\./\-I$home/g;
 
 $libs = <STREAM>;
 chomp $libs;
-$libs = "-L$libdir -lmapserver";
+$libs = "-L$libdir -L$home/.libs -lmapserver";
 
 $static_libs = <STREAM>;
 chomp $static_libs;

diff --git a/mapscript/python/setup.py b/mapscript/python/setup.py
@@ -131,6 +131,8 @@ class ms_ext(build_ext):
     ])
 
     def initialize_options(self):
+        print "LD_RUN_PATH set"
+        os.environ["LD_RUN_PATH"] = os.getcwd()+"/../../.libs"
         build_ext.initialize_options(self)
         self.gdaldir = None
         self.mapserver_config = self.MAPSERVER_CONFIG

diff --git a/mapscript/ruby/extconf.rb b/mapscript/ruby/extconf.rb
@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby 
 require 'mkmf'
+require 'pathname'
 
 mapscriptvars = File.open("../../mapscriptvars")
 make_home = mapscriptvars.gets.chomp
@@ -9,12 +10,14 @@
 make_static_libs = mapscriptvars.gets.chomp
 mapscriptvars.close
 
+MAPSERVER_LOCAL_LIBS=Pathname.new(File.dirname(__FILE__) + '/../../.libs').realpath
+
 # $CFLAGS works only with 1.8 ??? -> the -Wall argument is not needed !!!
 $CFLAGS = ""
 $CPPFLAGS = make_inc + " -idirafter $(rubylibdir)/$(arch) " + make_define
-$LDFLAGS += " -fPIC"
+$LDFLAGS += " -fPIC -Wl,-rpath,#{MAPSERVER_LOCAL_LIBS}"
 #$LOCAL_LIBS += " -L../../.libs/ " + " -lmapserver " + make_static_libs
-$LOCAL_LIBS += " -L../../.libs/ " + " -lmapserver "
+$LOCAL_LIBS += " -L#{MAPSERVER_LOCAL_LIBS} " + " -lmapserver "
 
 # if the source file 'mapscript_wrap.c' is missing nothing works
 # this is a workaround !!
@@ -23,6 +26,8 @@
 	$objs.push("mapscript_wrap.o")
 end
 
+#CONFIG['LDSHARED'] = "LD_RUN_PATH=#{MAPSERVER_LOCAL_LIBS} " + CONFIG['LDSHARED']
+
 create_makefile("mapscript")
 
 make_file = File.open("Makefile", "a")