diff --git a/config/perl.m4 b/config/perl.m4 index d602a5bb1b0f38dc98fe282c7d5ba979251d219d..0b43b04742e9a7a164ca6a45c5eda2da55f1ae12 100644 --- a/config/perl.m4 +++ b/config/perl.m4 @@ -38,6 +38,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIG], [AC_REQUIRE([PGAC_PATH_PERL]) AC_MSG_CHECKING([for Perl $1]) perl_$1=`$PERL -MConfig -e 'print $Config{$1}'` +test "$PORTNAME" = "win32" && perl_$1=`echo $perl_$1 | sed 's,\\\\,/,g'` AC_SUBST(perl_$1)dnl AC_MSG_RESULT([$perl_$1])]) @@ -57,9 +58,14 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS], AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS], [AC_REQUIRE([PGAC_PATH_PERL]) AC_MSG_CHECKING(for flags to link embedded Perl) +if test "$PORTNAME" = "win32" ; then +perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib` +test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib" +else pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]` +fi AC_SUBST(perl_embed_ldflags)dnl if test -z "$perl_embed_ldflags" ; then AC_MSG_RESULT(no) diff --git a/configure b/configure index ef016329cc2bb9076b739179e905957b34e6aaad..13dad004db515f1a33d83f5d8688e2f59bd552d1 100755 --- a/configure +++ b/configure @@ -7320,24 +7320,32 @@ $as_echo "$as_me: error: Perl not found" >&2;} { $as_echo "$as_me:$LINENO: checking for Perl archlibexp" >&5 $as_echo_n "checking for Perl archlibexp... " >&6; } perl_archlibexp=`$PERL -MConfig -e 'print $Config{archlibexp}'` +test "$PORTNAME" = "win32" && perl_archlibexp=`echo $perl_archlibexp | sed 's,\\\\,/,g'` { $as_echo "$as_me:$LINENO: result: $perl_archlibexp" >&5 $as_echo "$perl_archlibexp" >&6; } { $as_echo "$as_me:$LINENO: checking for Perl privlibexp" >&5 $as_echo_n "checking for Perl privlibexp... " >&6; } perl_privlibexp=`$PERL -MConfig -e 'print $Config{privlibexp}'` +test "$PORTNAME" = "win32" && perl_privlibexp=`echo $perl_privlibexp | sed 's,\\\\,/,g'` { $as_echo "$as_me:$LINENO: result: $perl_privlibexp" >&5 $as_echo "$perl_privlibexp" >&6; } { $as_echo "$as_me:$LINENO: checking for Perl useshrplib" >&5 $as_echo_n "checking for Perl useshrplib... " >&6; } perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'` +test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'` { $as_echo "$as_me:$LINENO: result: $perl_useshrplib" >&5 $as_echo "$perl_useshrplib" >&6; } { $as_echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5 $as_echo_n "checking for flags to link embedded Perl... " >&6; } +if test "$PORTNAME" = "win32" ; then +perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib` +test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib" +else pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts` pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'` perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"` +fi if test -z "$perl_embed_ldflags" ; then { $as_echo "$as_me:$LINENO: result: no" >&5 $as_echo "no" >&6; } diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index e1f94937f6f800a617984f185bcffd5987dcd0dd..e0e31ecfbf8ce980daea7b2eab2522762688599d 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -16,10 +16,6 @@ endif ifeq ($(shared_libperl),yes) ifeq ($(PORTNAME), win32) -perl_archlibexp := $(subst \,/,$(perl_archlibexp)) -perl_privlibexp := $(subst \,/,$(perl_privlibexp)) -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.