This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
PATCH: Regenerate aclocal.m4
- From: Mark Mitchell <mark at codesourcery dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Mon, 16 Jan 2006 14:16:39 -0800
- Subject: PATCH: Regenerate aclocal.m4
- Reply-to: mark at codesourcery dot com
While making other changes, I changed configure.ac and went to
regenerate configure. I got this error from autoconf-2.59:
configure:1354: error: possibly undefined macro: AM_CONDITIONAL
If this token and others are legitimate, please use m4_pattern_allow.
See the Autoconf documentation.
and a broken configure script; the generated script had references to
AM_CONDITIONAL in it.
The problem is that aclocal.m4 is not correct. In particular, it's
definition of AM_MAINTAINER_MODE relies on AM_CONDITIONAL, but no
definition of AM_CONDITIONAL is present. I used aclocal to regenerate
aclocal.m4, which fixed the problem. (The current version of the
configure script was correct; I hypothesize that it was generated with
some other aclocal.m4, not the one checked in.)
I've attached the aclocal.m4 diff, even though this is a generated
file, so that we can all see what's changing.
OK to commit?
--
Mark Mitchell
CodeSourcery
mark@codesourcery.com
(650) 331-3385 x713
2006-01-16 Mark Mitchell <mark@codesourcery.com>
* aclocal.m4: Regenerate.
Index: aclocal.m4
===================================================================
RCS file: /cvs/src/src/gdb/aclocal.m4,v
retrieving revision 1.17
diff -c -5 -p -r1.17 aclocal.m4
*** aclocal.m4 17 Dec 2005 22:33:59 -0000 1.17
--- aclocal.m4 16 Jan 2006 22:11:56 -0000
***************
*** 25,36 ****
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 51 Franklin Street, Fifth Floor,
! # Boston, MA 02110-1301, USA.
# serial 3
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--- 25,81 ----
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
!
! # serial 6
!
! # AM_CONDITIONAL(NAME, SHELL-CONDITION)
! # -------------------------------------
! # Define a conditional.
! AC_DEFUN([AM_CONDITIONAL],
! [AC_PREREQ(2.52)dnl
! ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
! [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
! AC_SUBST([$1_TRUE])
! AC_SUBST([$1_FALSE])
! if $2; then
! $1_TRUE=
! $1_FALSE='#'
! else
! $1_TRUE='#'
! $1_FALSE=
! fi
! AC_CONFIG_COMMANDS_PRE(
! [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
! AC_MSG_ERROR([[conditional "$1" was never defined.
! Usually this means the macro was only invoked conditionally.]])
! fi])])
!
! # Add --enable-maintainer-mode option to configure.
! # From Jim Meyering
!
! # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
! # Free Software Foundation, Inc.
!
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
!
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
! # 02111-1307, USA.
# serial 3
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])