NOTE: This patch has been committed.
Dear Big Brothers,
This fixes the problem people reported when configuring BBDB from an
Emacs shell buffer. I sincerely apologize for my being silent these days. I
just currently can't cope with all the things I have to do. I'm also preparing
an upgrade of the configure script to Autoconf 2.50. This should be there
around next week.
ChangeLog addition:
2001-05-23 Didier Verna <[EMAIL PROTECTED]>
* aclocal.m4 (BBDB_PROG_EMACS): fix Emacs detection problem when
configuring from an Emacs shell buffer.
BBDB Patch (runsocks cvs -q diff -u -t -b -B -w aclocal.m4):
Executing ssh-askpass to query the password...
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/bbdb/bbdb/aclocal.m4,v
retrieving revision 1.1
diff -u -u -t -b -B -w -r1.1 aclocal.m4
--- aclocal.m4 2001/01/08 15:34:16 1.1
+++ aclocal.m4 2001/05/23 07:41:55
@@ -85,17 +85,27 @@
fi ])
dnl Choose an Emacs flavor:
-dnl If I were pedantic, I'd check that the user-specified executable is
-dnl actually working. I might do that someday.
+dnl #### NOTE: when running from an Emacs shell buffer, the variable EMACS is
+dnl set to t, which confuses AC_CHECK_PROG. The solution we adopt is to use
+dnl another variable (namely tmp_EMACS) to perform the checkings. However, we
+dnl also want to preserve the ability to override the executable name through
+dnl the EMACS env var as is standardly done in configure scripts. So we take
+dnl care of initializing tmp_EMACS to EMACS, unless the value is t.
AC_DEFUN([BBDB_PROG_EMACS],
- [ AC_SUBST(EMACS)
+ [ if test "x${EMACS}" != "xt" ; then
+ tmp_EMACS=${EMACS}
+ fi
AC_ARG_WITH([emacs],
[ --with-emacs=PROG which flavor of Emacs to use],
- [ EMACS="${withval}" ],
- [ AC_CHECK_PROGS(EMACS, emacs xemacs) ])
- if test "x${EMACS}" = "x" ; then
+ [ tmp_EMACS="${withval}" ],
+ [ AC_CHECK_PROGS(tmp_EMACS, emacs xemacs) ])
+ if test "x${tmp_EMACS}" = "x" ; then
dnl This is critical enough to generate an error and not a warning...
AC_MSG_ERROR([*** No Emacs program found.])
- fi ])
+ fi
+ dnl If I were pedantic, I'd check that the user-specified executable is
+ dnl actually working. I might do that someday.
+ EMACS="${tmp_EMACS}"
+ AC_SUBST(EMACS) ])
dnl aclocal.m4 ends here
--
Didier Verna, [EMAIL PROTECTED], http://www.lrde.epita.fr/~didier
EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 53 14 59 47
94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 44 08 01 99 [EMAIL PROTECTED]
_______________________________________________
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/bbdb-info
BBDB Home Page: http://bbdb.sourceforge.net/
