Ticket #46260: configure.patch

configure

@@ -3541 +3541 @@
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$bison_v" && test "$bison_v" -eq 20
+if test -n "$bison_v" && test "$bison_v" -gt 21
+then
+        echo "$as_me:$LINENO: result: setting bison lalr1 yychar variable name to yychar" >&5
+echo "${ECHO_T}setting bison lalr1 yychar variable name to yychar" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define YYCHAR_NAME yychar
+_ACEOF
+
+elif test -n "$bison_v" && test "$bison_v" -eq 20
 then
         echo "$as_me:$LINENO: result: setting bison lalr1 yychar variable name to yylooka_" >&5
 echo "${ECHO_T}setting bison lalr1 yychar variable name to yylooka_" >&6
@@ -3711 +3720 @@
 if test "${am_cv_python_pythondir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
      echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
@@ -3728 +3737 @@
 if test "${am_cv_python_pyexecdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
      echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
 fi
 echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5