Commits

Ken Takata  committed 5d30c3b

update auto/configure

  • Participants
  • Parent commits e7a4d5e

Comments (0)

Files changed (2)

File configure2.patch

+# HG changeset patch
+# Parent 63ce2f08a5e4c8a3d78b631160c2a65a943aad0a
+diff --git a/src/auto/configure b/src/auto/configure
+--- a/src/auto/configure
++++ b/src/auto/configure
+@@ -5893,10 +5893,19 @@
+ 
+ fi
+ 
+-
+-	if test "X$python_DLLLIBRARY" != "X"; then
+-	  python_INSTSONAME="$python_DLLLIBRARY"
+-	fi
++	if ${vi_cv_dll_name_python+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++
++	  if test "X$python_DLLLIBRARY" != "X"; then
++	    vi_cv_dll_name_python="$python_DLLLIBRARY"
++	  else
++	    vi_cv_dll_name_python="$python_INSTSONAME"
++	  fi
++
++fi
++
++
+ 	PYTHON_LIBS="${vi_cv_path_python_plibs}"
+ 	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
+ 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
+@@ -6209,10 +6218,19 @@
+ 
+ fi
+ 
+-
+-        if test "X$python3_DLLLIBRARY" != "X"; then
+-	  python3_INSTSONAME="$python3_DLLLIBRARY"
+-        fi
++	if ${vi_cv_dll_name_python3+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++
++	  if test "X$python3_DLLLIBRARY" != "X"; then
++	    vi_cv_dll_name_python3="$python3_DLLLIBRARY"
++	  else
++	    vi_cv_dll_name_python3="$python3_INSTSONAME"
++	  fi
++
++fi
++
++
+         PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
+         if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
+           PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
+@@ -6372,7 +6390,7 @@
+     int main(int argc, char** argv)
+     {
+       int not_needed = 0;
+-      if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
++      if (no_rtl_global_needed_for("${vi_cv_dll_name_python}", "${vi_cv_path_python_pfx}"))
+             not_needed = 1;
+       return !not_needed;
+     }
+@@ -6438,7 +6456,7 @@
+     int main(int argc, char** argv)
+     {
+       int not_needed = 0;
+-      if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
++      if (no_rtl_global_needed_for("${vi_cv_dll_name_python3}", L"${vi_cv_path_python3_pfx}"))
+             not_needed = 1;
+       return !not_needed;
+     }
+@@ -6461,18 +6479,18 @@
+ 
+   PYTHON_SRC="if_python.c"
+   PYTHON_OBJ="objects/if_python.o"
+-  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
++  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
+   PYTHON_LIBS=
+   PYTHON3_SRC="if_python3.c"
+   PYTHON3_OBJ="objects/if_python3.o"
+-  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
++  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
+   PYTHON3_LIBS=
+ elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then
+   $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h
+ 
+   PYTHON_SRC="if_python.c"
+   PYTHON_OBJ="objects/if_python.o"
+-  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${python_INSTSONAME}\\\""
++  PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\""
+   PYTHON_LIBS=
+ elif test "$python_ok" = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5
+@@ -6511,7 +6529,7 @@
+ 
+   PYTHON3_SRC="if_python3.c"
+   PYTHON3_OBJ="objects/if_python3.o"
+-  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${python3_INSTSONAME}\\\""
++  PYTHON3_CFLAGS="$PYTHON3_CFLAGS -DDYNAMIC_PYTHON3_DLL=\\\"${vi_cv_dll_name_python3}\\\""
+   PYTHON3_LIBS=
+ elif test "$python3_ok" = yes; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5
 add-stat-test.patch
 fix-config_cache-removal.patch
 fix-configure-python-soname.patch
+configure2.patch