From cccd9fabe8e12f2b1c3dd672088de456aec71049 Mon Sep 17 00:00:00 2001 From: Kazuki Sakamoto Date: Tue, 3 Nov 2015 21:55:46 -0800 Subject: [PATCH] Add vi_cv_dll_name_perl to pass libperl.dylib path --- src/auto/configure | 8 +++++++- src/configure.in | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index 9cd27c62da..be3c8a14b7 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5755,7 +5755,13 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } if test "$perl_ok" = "yes" -a "X$libperl" != "X"; then $as_echo "#define DYNAMIC_PERL 1" >>confdefs.h - PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS" + if ${vi_cv_dll_name_perl+:} false; then : + $as_echo_n "(cached) " >&6 +else + vi_cv_dll_name_perl="$libperl" +fi + + PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$vi_cv_dll_name_perl\\\" $PERL_CFLAGS" fi fi diff --git a/src/configure.in b/src/configure.in index 0c2999c5af..795f9f1c30 100644 --- a/src/configure.in +++ b/src/configure.in @@ -1051,7 +1051,8 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then if test "$enable_perlinterp" = "dynamic"; then if test "$perl_ok" = "yes" -a "X$libperl" != "X"; then AC_DEFINE(DYNAMIC_PERL) - PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS" + AC_CACHE_VAL(vi_cv_dll_name_perl, [vi_cv_dll_name_perl="$libperl"]) + PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$vi_cv_dll_name_perl\\\" $PERL_CFLAGS" fi fi