+2003-10-03 Akim Demaille <akim@epita.fr>
+
+ * configure.ac: Quotation and formatting changes.
+ (EMACS): Don't set it if it is not recent enough to support
+ autoconf-mode.el.
+ From Eric Sunshine.
+
2003-10-02 Akim Demaille <akim@epita.fr>
* bin/ifnames.in (&scan_file): Skip C++ comments.
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
PACKAGE_BUGREPORT='bug-autoconf@gnu.org'
ac_unique_file="ChangeLog"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EXPR M4 HELP2MAN PERL EMACS EMACSLOADPATH lispdir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot EXPR M4 HELP2MAN PERL TEST_EMACS EMACS EMACSLOADPATH lispdir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
+## ---- ##
+## M4. ##
+## ---- ##
+
# We use a path for GNU m4 so even if users have another m4 first in
# their path, the installer can configure with a path that has GNU m4
# first and get that path embedded in the installed autoconf and
{ (exit 1); exit 1; }; }
fi
-# Man pages.
+## ----------- ##
+## Man pages. ##
+## ----------- ##
+
ac_config_files="$ac_config_files man/Makefile"
HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
+
+## ------ ##
+## Perl. ##
+## ------ ##
+
# We use a path for perl so the #! line in autoscan will work.
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ (exit 1); exit 1; }; }
}
-# Emacs modes.
+
+## ------- ##
+## Emacs. ##
+## ------- ##
+
ac_config_files="$ac_config_files lib/emacs/Makefile"
-test x"$EMACS" = xt && EMACS=
-for ac_prog in emacs xemacs
+TEST_EMACS=$EMACS
+test x"$TEST_EMACS" = xt && TEST_EMACS=
+for ac_prog in macs xemacs
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_EMACS+set}" = set; then
+if test "${ac_cv_prog_TEST_EMACS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$EMACS"; then
- ac_cv_prog_EMACS="$EMACS" # Let the user override the test.
+ if test -n "$TEST_EMACS"; then
+ ac_cv_prog_TEST_EMACS="$TEST_EMACS" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_EMACS="$ac_prog"
+ ac_cv_prog_TEST_EMACS="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
fi
fi
-EMACS=$ac_cv_prog_EMACS
-if test -n "$EMACS"; then
- echo "$as_me:$LINENO: result: $EMACS" >&5
-echo "${ECHO_T}$EMACS" >&6
+TEST_EMACS=$ac_cv_prog_TEST_EMACS
+if test -n "$TEST_EMACS"; then
+ echo "$as_me:$LINENO: result: $TEST_EMACS" >&5
+echo "${ECHO_T}$TEST_EMACS" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
- test -n "$EMACS" && break
+ test -n "$TEST_EMACS" && break
done
-test -n "$EMACS" || EMACS="no"
+test -n "$TEST_EMACS" || TEST_EMACS="no"
+
+
+# autoconf-mode.el and autotest-mode.el do not work with older version of
+# Emacs (i.e. 18.x.x). During byte-compilation, Emacs complains:
+# "Variable (broken nil) seen on pass 2 of byte compiler but not pass 1"
+# We detect this problem here.
+if test "$TEST_EMACS" != no; then
+ echo "$as_me:$LINENO: checking whether $TEST_EMACS is sufficiently recent" >&5
+echo $ECHO_N "checking whether $TEST_EMACS is sufficiently recent... $ECHO_C" >&6
+if test "${ac_cv_prog_emacs_ok+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Note: The quoted "EOF" is intentional. It protects the ` in the text.
+ cat >conftest.el << "EOF"
+ (defvar broken)
+ (defun broken-mode () (setq broken-defaults `(broken nil)))
+EOF
+ if { (echo "$as_me:$LINENO: \$TEST_EMACS -batch -q -f batch-byte-compile conftest.el 1>&2") >&5
+ ($TEST_EMACS -batch -q -f batch-byte-compile conftest.el 1>&2) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ ac_cv_prog_emacs_ok=yes
+else
+ ac_cv_prog_emacs_ok=no
+fi
+
+ rm -f conftest.el conftest.elc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_emacs_ok" >&5
+echo "${ECHO_T}$ac_cv_prog_emacs_ok" >&6
+ if test $ac_cv_prog_emacs_ok = no; then
+ TEST_EMACS=no
+fi
+
+fi
+
+
+EMACS=$TEST_EMACS
+
# Check whether --with-lispdir or --without-lispdir was given.
+
+## ------------ ##
+## Conclusion. ##
+## ------------ ##
+
ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile lib/m4sugar/Makefile lib/autoconf/Makefile lib/autotest/Makefile bin/Makefile"
s,@M4@,$M4,;t t
s,@HELP2MAN@,$HELP2MAN,;t t
s,@PERL@,$PERL,;t t
+s,@TEST_EMACS@,$TEST_EMACS,;t t
s,@EMACS@,$EMACS,;t t
s,@EMACSLOADPATH@,$EMACSLOADPATH,;t t
s,@lispdir@,$lispdir,;t t
[chmod +x tests/autoupdate])
AC_CONFIG_FILES([tests/ifnames:tests/wrapper.in],
[chmod +x tests/ifnames])
-AC_PATH_PROG(EXPR, expr)
+AC_PATH_PROG([EXPR], [expr])
+## ---- ##
+## M4. ##
+## ---- ##
+
# We use a path for GNU m4 so even if users have another m4 first in
# their path, the installer can configure with a path that has GNU m4
# first and get that path embedded in the installed autoconf and
AC_MSG_ERROR([GNU M4 1.4 is required])
fi
-# Man pages.
+## ----------- ##
+## Man pages. ##
+## ----------- ##
+
AC_CONFIG_FILES(man/Makefile)
AM_MISSING_PROG(HELP2MAN, help2man)
+
+## ------ ##
+## Perl. ##
+## ------ ##
+
# We use a path for perl so the #! line in autoscan will work.
AC_PATH_PROG([PERL], perl, no)
AC_SUBST([PERL])dnl
AC_MSG_ERROR([Perl 5.005_03 or better is required])
}
-# Emacs modes.
+
+## ------- ##
+## Emacs. ##
+## ------- ##
+
AC_CONFIG_FILES([lib/emacs/Makefile])
-test x"$EMACS" = xt && EMACS=
-AC_CHECK_PROGS(EMACS, emacs xemacs, no)
+TEST_EMACS=$EMACS
+test x"$TEST_EMACS" = xt && TEST_EMACS=
+AC_CHECK_PROGS([TEST_EMACS], [macs xemacs], [no])
+
+# autoconf-mode.el and autotest-mode.el do not work with older version of
+# Emacs (i.e. 18.x.x). During byte-compilation, Emacs complains:
+# "Variable (broken nil) seen on pass 2 of byte compiler but not pass 1"
+# We detect this problem here.
+AS_IF([test "$TEST_EMACS" != no],
+ [AC_CACHE_CHECK([whether $TEST_EMACS is sufficiently recent],
+ [ac_cv_prog_emacs_ok],
+ [# Note: The quoted "EOF" is intentional. It protects the ` in the text.
+ cat >conftest.el << "EOF"
+ (defvar broken)
+ (defun broken-mode () (setq broken-defaults `(broken nil)))
+EOF
+ AS_IF([AC_RUN_LOG(
+ [$TEST_EMACS -batch -q -f batch-byte-compile conftest.el 1>&2])],
+ [ac_cv_prog_emacs_ok=yes], [ac_cv_prog_emacs_ok=no])
+ rm -f conftest.el conftest.elc])
+ AS_IF([test $ac_cv_prog_emacs_ok = no], [TEST_EMACS=no])])
+
+AC_SUBST([EMACS], [$TEST_EMACS])
+
AM_PATH_LISPDIR
+
+## ------------ ##
+## Conclusion. ##
+## ------------ ##
+
AC_CONFIG_FILES([Makefile doc/Makefile
lib/Makefile lib/Autom4te/Makefile lib/autoscan/Makefile
lib/m4sugar/Makefile
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTOCONF "1" "September 2003" "autoconf 2.57f" "User Commands"
+.TH AUTOCONF "1" "October 2003" "autoconf 2.57f" "User Commands"
.SH NAME
autoconf \- Generate configuration scripts
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTOHEADER "1" "September 2003" "autoheader " "User Commands"
+.TH AUTOHEADER "1" "October 2003" "autoheader " "User Commands"
.SH NAME
autoheader \- Create a template header for configure
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTOM4TE "1" "September 2003" "autom4te 2.57f" "User Commands"
+.TH AUTOM4TE "1" "October 2003" "autom4te 2.57f" "User Commands"
.SH NAME
autom4te \- Generate files and scripts thanks to M4
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTORECONF "1" "September 2003" "autoreconf 2.57f" "User Commands"
+.TH AUTORECONF "1" "October 2003" "autoreconf 2.57f" "User Commands"
.SH NAME
autoreconf \- Update generated configuration files
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTOSCAN "1" "September 2003" "autoscan 2.57f" "User Commands"
+.TH AUTOSCAN "1" "October 2003" "autoscan 2.57f" "User Commands"
.SH NAME
autoscan \- Generate a preliminary configure.in
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH AUTOUPDATE "1" "September 2003" "autoupdate 2.57f" "User Commands"
+.TH AUTOUPDATE "1" "October 2003" "autoupdate 2.57f" "User Commands"
.SH NAME
autoupdate \- Update a configure.in to a newer Autoconf
.SH SYNOPSIS
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH IFNAMES "1" "September 2003" "ifnames " "User Commands"
+.TH IFNAMES "1" "October 2003" "ifnames " "User Commands"
.SH NAME
ifnames \- Extract CPP conditionals from a set of files
.SH SYNOPSIS
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TEST_EMACS = @TEST_EMACS@
VERSION = @VERSION@
ac_ct_STRIP = @ac_ct_STRIP@
am__leading_dot = @am__leading_dot@