[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#6428: 24.0.50; UNEXEC.OBJ not defined
|
From: |
Glenn Morris |
|
Subject: |
bug#6428: 24.0.50; UNEXEC.OBJ not defined |
|
Date: |
Wed, 16 Jun 2010 11:58:14 -0400 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
john ffitch wrote:
> ~/GNU_21/emacs/trunk> bzr status
> renamed:
> configure => configure.OTHER*
> modified:
> configure.OTHER*
> unknown:
> configure
> configure.BASE
> configure.BASE.moved
> configure.BASE.moved.moved
> configure.BASE.moved.moved.moved
> configure.OTHER.moved
> configure.OTHER.moved.moved
> configure.OTHER.moved.moved.moved
> configure.THIS
> configure.THIS.moved
> configure.THIS.moved.moved
> conflicts:
> Contents conflict in configure
Clearly you have massive, multiple conflicts in configure, so it has
not been updating properly. You should do something like:
rm configure*
bzr revert configure configure.in
(assuming you have no local changes to configure.in) and re-run
bzr status
to check. Then
make maintainer-clean
and run `configure' again.
If you run `autoconf', you are likely to run into conflicts with
configure, which you need to pay attention to.