To: vim_dev@googlegroups.com
Subject: Patch 8.2.0603
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.0603
Problem:    Configure does not detect moonjit.
Solution:   Add check for moonjit. (Shlomi Fish, closes #5947)
Files:      src/configure.ac, src/auto/configure


*** ../vim-8.2.0602/src/configure.ac	2020-04-18 18:24:13.110776118 +0200
--- src/configure.ac	2020-04-19 17:41:00.263364288 +0200
***************
*** 625,631 ****
  	  LUA_INC=/lua$vi_cv_version_lua
  	else
  	  AC_MSG_RESULT(no)
! 	  vi_cv_path_lua_pfx=
  	fi
        fi
      fi
--- 625,650 ----
  	  LUA_INC=/lua$vi_cv_version_lua
  	else
  	  AC_MSG_RESULT(no)
! 
! 	  # Detect moonjit:
! 	  # https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk
! 	  lua_suf=/moonjit-2.3
! 	  inc_path="$vi_cv_path_lua_pfx/include"
! 	  for dir in "$inc_path"/moonjit-[0-9]* ; do
! 	    if test -d "$dir" ; then
! 	      lua_suf=`basename '$dir'`
! 	      lua_suf="/$lua_suf"
! 	      break
! 	    fi
! 	  done
! 	  AC_MSG_CHECKING(if lua.h can be found in $inc_path$lua_suf)
! 	  if test -f "$inc_path$lua_suf/lua.h"; then
! 	    AC_MSG_RESULT(yes)
! 	    LUA_INC=$lua_suf
! 	  else
! 	    AC_MSG_RESULT(no)
! 	    vi_cv_path_lua_pfx=
! 	  fi
  	fi
        fi
      fi
*** ../vim-8.2.0602/src/auto/configure	2020-04-18 18:24:13.106776132 +0200
--- src/auto/configure	2020-04-19 17:41:11.827340014 +0200
***************
*** 5480,5486 ****
  	else
  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
! 	  vi_cv_path_lua_pfx=
  	fi
        fi
      fi
--- 5480,5508 ----
  	else
  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
! 
! 	  # Detect moonjit:
! 	  # https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk
! 	  lua_suf=/moonjit-2.3
! 	  inc_path="$vi_cv_path_lua_pfx/include"
! 	  for dir in "$inc_path"/moonjit-0-9* ; do
! 	    if test -d "$dir" ; then
! 	      lua_suf=`basename '$dir'`
! 	      lua_suf="/$lua_suf"
! 	      break
! 	    fi
! 	  done
! 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5
! $as_echo_n "checking if lua.h can be found in $inc_path$lua_suf... " >&6; }
! 	  if test -f "$inc_path$lua_suf/lua.h"; then
! 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
! $as_echo "yes" >&6; }
! 	    LUA_INC=$lua_suf
! 	  else
! 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
! $as_echo "no" >&6; }
! 	    vi_cv_path_lua_pfx=
! 	  fi
  	fi
        fi
      fi
*** ../vim-8.2.0602/src/version.c	2020-04-19 17:24:48.665264342 +0200
--- src/version.c	2020-04-19 17:45:58.798733365 +0200
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     603,
  /**/

-- 
Sometimes you can protect millions of dollars in your budget simply by buying
a bag of cookies, dropping it on the budget anylyst's desk, and saying
something deeply personal such as "How was your weekend, big guy?"
				(Scott Adams - The Dilbert principle)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///