NOTE: This patch has been committed. Dear Big Brothers, this is the promised upgrade to Autoconf 2.50. Nothing has changed for the end-user. For developers, the important things to know are: 1/ you *must* now use autoconf 2.50 to regenerate the configure script. It is *not* backward compatible with Autoconf 2.13. 2/ the source file for the configure script has been renamed from `configure.in' to `configure.ac'. I'll post a new configure script in a separate message. ChangeLog addition: 2001-06-05 Didier Verna <[EMAIL PROTECTED]> * aclocal.m4: upgrade to Autoconf 2.50. * aclocal.m4 (BBDB_PRE_INIT): new. * aclocal.m4 (BBDB_ARG_SUBST): new. * configure.ac: renamed from configure.in. Upgrade to Autoconf 2.50. BBDB Patch (runsocks cvs -q diff -u -t -b -B -w configure.in configure.ac aclocal.m4): Executing ssh-askpass to query the password... cvs server: configure.in was removed, no comparison available cvs server: configure.ac is a new entry, no comparison available Index: aclocal.m4 =================================================================== RCS file: /cvsroot/bbdb/bbdb/aclocal.m4,v retrieving revision 1.2 diff -u -u -t -b -B -w -r1.2 aclocal.m4 --- aclocal.m4 2001/05/23 07:49:04 1.2 +++ aclocal.m4 2001/06/05 12:17:04 @@ -22,13 +22,58 @@ dnl Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -dnl Transforms a colon separated list into a space separated one: +dnl BBDB_PRE_INIT +dnl +dnl Find BBDB version number and put it in the m4 macro BBDB_VERSION +dnl +dnl I fought really hard, but finally I got it accepted to make autoconf load +dnl aclocal *before* AC_INIT is called. This is important for me, in +dnl situations like this precise one, where I want to dynamically compute the +dnl version number to pass to AC_INIT. +dnl There's one minor glitch however, the AC_DEFUN mechanism is not available +dnl before AC_INIT is called because of diversions. So this macro is defined +dnl only in terms of "m4 sugar". +m4_define([BBDB_PRE_INIT], +[ m4_define([_BBDB_VERSION], + m4_esyscmd([sed -n 's/^(defconst bbdb-version "\(.*\)")/\1/p' +lisp/bbdb.el])) + m4_define([BBDB_VERSION], + m4_substr(_BBDB_VERSION, 0, decr(len(_BBDB_VERSION)))) + m4_undefine([_BBDB_VERSION]) +]) + +dnl BBDB_ARG_SUBST(VAR, OPTION, VAL, DESC[, DEFAULT[, ACTION]]) +dnl +dnl Substitute the autoconf variable VAR to a value specified by the user +dnl option --with-OPTION[=VAL] (described by DESC), or with a DEFAULT value. +dnl If an additional ACTION is given, it is executed at the top of the +dnl ACTION-IF-FOUND part of AC_ARG_WITH. +dnl #### WARNING: pay attention to the quoting of ACTION if given !!!!! +AC_DEFUN([BBDB_ARG_SUBST], +[ + AC_SUBST([$1]) + AC_ARG_WITH([$2], + AC_HELP_STRING([--with-][$2]ifelse($3, [], [], [=$3]), + [$4]ifelse($5, [], [], [ [[[$5]]]])), + [ + ifelse($6, [], [], $6) + $1="${withval}" + ], + ifelse($5, [], [], [$1="$5"])) +]) + +dnl BBDB_COLON_TO_SPACE(VAR) +dnl +dnl Transforms a (possibly) colon separated list VAR into a space separated +dnl one. VAR needs not be quoted. AC_DEFUN([BBDB_COLON_TO_SPACE], [ case "$$1" in *:*) $1="`echo $$1 | sed -e 's/:/ /g'`";; esac ]) -dnl Find GNU tar: +dnl BBDB_PROG_GNU_TAR +dnl +dnl Find a (g)tar program and make sure it is GNU one. A failure is not fatal +dnl since tar is needed for non critical targets only. AC_DEFUN([BBDB_PROG_GNU_TAR], [ AC_CHECK_PROGS(TAR, gtar tar) if test "x${TAR}" = "xtar" ; then @@ -45,7 +90,10 @@ AC_MSG_WARN([*** Some targets will be unavailable.]) fi ]) -dnl Choose a compression program: +dnl BBDB_PROG_COMPRESS +dnl +dnl Find a gzip / compress compression program. A failure is not fatal, only +dnl tarballs won't be compressed. AC_DEFUN([BBDB_PROG_COMPRESS], [ AC_CHECK_PROGS(COMPRESS, gzip compress) AC_SUBST(COMPEXT) @@ -60,7 +108,10 @@ COMPEXT=Z fi ]) -dnl Find makeinfo: +dnl BBDB_PROG_MAKEINFO +dnl +dnl Find a makeinfo program. A failure is not fatal, only info files won't be +dnl built. AC_DEFUN([BBDB_PROG_MAKEINFO], [ AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo) if test "x${MAKEINFO}" = "x" ; then @@ -68,7 +119,10 @@ AC_MSG_WARN([*** Info files will not be built.]) fi ]) -dnl Find texi2dvi: +dnl BBDB_PROG_TEXI2DVI +dnl +dnl Find a texi2dvi program. A failure is not fatal, only dvi and pdf files +dnl won't be built. AC_DEFUN([BBDB_PROG_TEXI2DVI], [ AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi) if test "x${TEXI2DVI}" = "x" ; then @@ -76,7 +130,10 @@ AC_MSG_WARN([*** DVI and PDF files will not be built.]) fi ]) -dnl Find etags: +dnl BBDB_PROG_ETAGS +dnl +dnl Find an etags program. A failure is not fatal, only TAGS file won't be +dnl built. AC_DEFUN([BBDB_PROG_ETAGS], [ AC_CHECK_PROG(ETAGS, etags, etags) if test "x${ETAGS}" = "x" ; then @@ -84,7 +141,10 @@ AC_MSG_WARN([*** Tags file will not be built.]) fi ]) -dnl Choose an Emacs flavor: +dnl BBDB_PROG_EMACS +dnl +dnl Choose an Emacs flavor according to the --with-emacs user option, or try +dnl emacs and xemacs. 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 @@ -96,7 +156,8 @@ tmp_EMACS=${EMACS} fi AC_ARG_WITH([emacs], - [ --with-emacs=PROG which flavor of Emacs to use], + AC_HELP_STRING([--with-emacs=PROG], + [choose which flavor of Emacs to use]), [ tmp_EMACS="${withval}" ], [ AC_CHECK_PROGS(tmp_EMACS, emacs xemacs) ]) if test "x${tmp_EMACS}" = "x" ; then -- 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/