Search for versioned perl library instead of using hardcoded name on Windows. Backpat...

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index fbebe77b7355762123a1e538fd0d3368c15136e6..43c51fbbf5c7fa02cbfd27a1001e5845b81e1274 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
 # Makefile for PL/Perl
-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.33 2007/12/01 15:30:09 adunstan Exp $
+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.33.2.1 2009/06/05 18:31:48 adunstan Exp $
 
 subdir = src/pl/plperl
 top_builddir = ../../..
@@ -19,7 +19,8 @@ ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))
 ifeq ($(PORTNAME), win32)
 perl_archlibexp := $(subst \,/,$(perl_archlibexp))
 perl_privlibexp := $(subst \,/,$(perl_privlibexp))
-perl_embed_ldflags = -L$(perl_archlibexp)/CORE -lperl58
+perl_lib := $(basename $(notdir $(wildcard $(perl_archlibexp)/CORE/perl[5-9]*.lib)))
+perl_embed_ldflags = -L$(perl_archlibexp)/CORE -l$(perl_lib)
 override CPPFLAGS += -DPLPERL_HAVE_UID_GID
 # Perl on win32 contains /* within comment all over the header file,
 # so disable this warning.

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 7a498b12808c54fefaa54c00a824fe1cae4bf98d..69100f51c7706bcd3b03fe5f0dd4bd3fb683c396 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25.2.3 2008/05/10 16:07:56 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25.2.4 2009/06/05 18:31:48 adunstan Exp $
 #
 use Carp;
 use Win32;
@@ -104,7 +104,16 @@ sub mkvcbuild
             }
         }
         $plperl->AddReference($postgres);
-        $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+               my @perl_libs = grep {/perl\d+.lib$/ }
+                  glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
+               if (@perl_libs == 1)
+               {
+                       $plperl->AddLibrary($perl_libs[0]);
+               }
+               else
+               {
+                       die "could not identify perl library version";
+               }
     }
 
     if ($solution->{options}->{python})