undesired EMACS=`basename $EMACS` (was: Any issues that would hold up release of 4.6.1?)

[Mojca M. <moj...@gm...>]

On Tue, Sep 18, 2012 at 1:08 AM, Ethan A Merritt wrote:
>
> Is anyone aware of an unresolved bug or other reason to hold off
> release of version 4.6.1?  If not, I will probably package it up
> for release next weekend.

Hello,

Not a major showstopper, but I would be grateful if someone could take
a look at the attached patch for emacs (and apply before the release
it if possible). The problem is that setting
    EMACS=/path/to/some/Emacs ./configure
is later "reset" with
    EMACS=`basename $EMACS`
in lisp/configure[.in], so version checking and all further
emacs-related operation fail to work properly since they call whatever
emacs/xemacs comes first in PATH instead of the one requested by user.

If one points the variable to (rather standard location)
    EMACS=/Applications/Emacs.app/Contents/MacOS/Emacs
it even fails on case-sensitive systems (even if another "emacs"
itself is present in PATH, it doesn't recognize it). On
case-insensitive systems it works, but is wrong as it picks the wrong
binary to do the version check.

Apparently the following
    INFO_LOOK_ELC=
also needs to be reset to an empty value when patching info-look.el is
not needed. That problem only manifested itself because the binary is
called "Emacs" and not "emacs" or "xemacs". The file info-look.el
doesn't need patching, so it's irrelevant if
    test `basename $EMACS` = emacs
fails to recognize "Emacs", but INFO_LOOK_ELC has to become empty in
the same way as in
  if test "$vnum" -ge 2030 ; then
    info_look="not needed with emacs $emacs_version"
    INFO_LOOK_ELC=
  else

The bug was reported by Jamison (CC-ed).

Thank you,
    Mojca


--- lisp/configure.in.orig
+++ lisp/configure.in
@@ -13,8 +13,6 @@ AC_SET_MAKE
 AC_PROG_INSTALL
 AM_PATH_LISPDIR

-EMACS=`basename $EMACS`
-
 AC_CHECK_PROGS(DVIPS, dvips, no)
 AC_CHECK_PROGS(LATEX, latex latex2e, no)
 AC_PATH_PROG(MAKEINFO, makeinfo, no)
@@ -75,7 +73,7 @@ AC_MSG_RESULT([$emacs_version])
 vnum=`echo $emacs_version |awk -F\. '{print 100*$1+$2}'`

 AC_MSG_CHECKING([whether info-look.el is needed])
-if test "$EMACS" = emacs ; then
+if test `basename $EMACS` = emacs ; then
   if test "$vnum" -ge 2030 ; then
     info_look="not needed with emacs $emacs_version"
     INFO_LOOK_ELC=
@@ -83,7 +81,7 @@ if test "$EMACS" = emacs ; then
     info_look="using info-look.20.2.el"
     cp info-look.20.2.el info-look.el
   fi
-elif test "$EMACS" = xemacs ; then
+elif test `basename $EMACS` = xemacs ; then
   if test "$vnum" -ge 2000 ; then
     info_look="using info-look.20.3.el"
     cp info-look.20.3.el info-look.el
@@ -93,6 +91,7 @@ elif test "$EMACS" = xemacs ; then
   fi
 else
   info_look="using none"
+  INFO_LOOK_ELC=
 fi
 AC_MSG_RESULT([$info_look])