4:51 a.m.
Its use was causing a non-srcdir build to fail.
* Makefile.am (EXTRA_DIST): Remove mylibtool.
* configure.in: Don't use mylibtool.
---
An alternative (if you don't want to use automake's silent-rules option)
would be to keep mylibtool, but to use $(abs_top_srcdir) rather than
$(top_srcdir) in that script.
Makefile.am | 3 +--
configure.in | 4 ----
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index dd98ff2..c251f96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,7 @@ EXTRA_DIST = \
.x-sc_require_config_h \
.x-sc_prohibit_nonreentrant \
Makefile.nonreentrant \
- autogen.sh \
- mylibtool
+ autogen.sh
man_MANS = virsh.1
diff --git a/configure.in b/configure.in
index 1170958..a6f6754 100644
--- a/configure.in
+++ b/configure.in
@@ -59,10 +59,6 @@ dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL)
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
-dnl Override normal libtool in favour of our quiet version
-LIBTOOL='$(SHELL) $(top_srcdir)/mylibtool'
-AC_SUBST([LIBTOOL])
-
AM_PROG_CC_C_O
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
--
1.6.3.3.524.g8586b
5:22 a.m.
On Wed, Jul 08, 2009 at 11:51:59AM +0200, Jim Meyering wrote:
Its use was causing a non-srcdir build to fail.
* Makefile.am (EXTRA_DIST): Remove mylibtool.
* configure.in: Don't use mylibtool.
---
An alternative (if you don't want to use automake's silent-rules option)
would be to keep mylibtool, but to use $(abs_top_srcdir) rather than
$(top_srcdir) in that script.
NACK, this only works with automake 1.11, which is not available
on RHEL-5
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
5:26 a.m.
Daniel P. Berrange wrote:
On Wed, Jul 08, 2009 at 11:51:59AM +0200, Jim Meyering wrote:
>
> Its use was causing a non-srcdir build to fail.
> * Makefile.am (EXTRA_DIST): Remove mylibtool.
> * configure.in: Don't use mylibtool.
> ---
>
> An alternative (if you don't want to use automake's silent-rules option)
> would be to keep mylibtool, but to use $(abs_top_srcdir) rather than
> $(top_srcdir) in that script.
NACK, this only works with automake 1.11, which is not available
on RHEL-5
Ok.
I'll fix it the other way and resend.
However, note that these are all on top of my big
gnulib-submodule series. I haven't tried to apply them
to master yet.
5:50 a.m.
Daniel P. Berrange wrote:
On Wed, Jul 08, 2009 at 11:51:59AM +0200, Jim Meyering wrote:
> Its use was causing a non-srcdir build to fail.
> * Makefile.am (EXTRA_DIST): Remove mylibtool.
> * configure.in: Don't use mylibtool.
> ---
>
> An alternative (if you don't want to use automake's silent-rules option)
> would be to keep mylibtool, but to use $(abs_top_srcdir) rather than
> $(top_srcdir) in that script.
NACK, this only works with automake 1.11, which is not available
on RHEL-5
Here's that alternative patch:
From 018953765f5329c0e7ac182e5e0ce4e550528238 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 8 Jul 2009 12:49:27 +0200
Subject: [PATCH] mylibtool: fix a "make distcheck" and non-srcdir build failure
* configure.in (LIBTOOL): Use $(abs_top_srcdir), not $(top_srcdir).
---
configure.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 1170958..b135987 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl Override normal libtool in favour of our quiet version
-LIBTOOL='$(SHELL) $(top_srcdir)/mylibtool'
+LIBTOOL='$(SHELL) $(abs_top_srcdir)/mylibtool'
AC_SUBST([LIBTOOL])
AM_PROG_CC_C_O
--
1.6.3.3.524.g8586b
6:10 a.m.
Jim Meyering wrote:
Daniel P. Berrange wrote:
> On Wed, Jul 08, 2009 at 11:51:59AM +0200, Jim Meyering wrote:
>> Its use was causing a non-srcdir build to fail.
>> * Makefile.am (EXTRA_DIST): Remove mylibtool.
>> * configure.in: Don't use mylibtool.
>> ---
>>
>> An alternative (if you don't want to use automake's silent-rules option)
>> would be to keep mylibtool, but to use $(abs_top_srcdir) rather than
>> $(top_srcdir) in that script.
>
> NACK, this only works with automake 1.11, which is not available
> on RHEL-5
Here's that alternative patch:
>From 018953765f5329c0e7ac182e5e0ce4e550528238 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 8 Jul 2009 12:49:27 +0200
Subject: [PATCH] mylibtool: fix a "make distcheck" and non-srcdir build
failure
* configure.in (LIBTOOL): Use $(abs_top_srcdir), not $(top_srcdir).
---
configure.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 1170958..b135987 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl Override normal libtool in favour of our quiet version
-LIBTOOL='$(SHELL) $(top_srcdir)/mylibtool'
+LIBTOOL='$(SHELL) $(abs_top_srcdir)/mylibtool'
This is wrong, since it's libtool that is in the builddir.
New patch after lunch.
5616
days inactive
5616
days old
4 comments
2 participants
participants (2)
-
Daniel P. Berrange -
Jim Meyering