[alsa-devel] [PATCH 1/2] Version-check libtool correctly when doing an out-of-tree build
libtool is only created at the end of ./configure, so it doesn't make sense to grep it in ./configure (the check would always fail the first time). However, ltmain.sh is copied into the ${srcdir} by libtoolize and should be safe to check at any time that configure can be run.
Signed-off-by: Simon McVittie smcv@debian.org --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in index abc4687..e904956 100644 --- a/configure.in +++ b/configure.in @@ -115,7 +115,7 @@ AC_ARG_WITH(versioned, versioned="$withval", versioned="yes") if test "$versioned" = "yes"; then # it seems that GNU ld versions since 2.10 are not broken - xres=`grep '^VERSION=' libtool | cut -d = -f 2 | cut -d " -f 2` + xres=`grep '^VERSION=' ${srcdir}/ltmain.sh | cut -d = -f 2 | cut -d " -f 2` major=`echo $xres | cut -d . -f 1` minor=`echo $xres | cut -d . -f 2` pass=0
At Fri, 8 Oct 2010 09:06:29 +0100, Simon McVittie wrote:
libtool is only created at the end of ./configure, so it doesn't make sense to grep it in ./configure (the check would always fail the first time). However, ltmain.sh is copied into the ${srcdir} by libtoolize and should be safe to check at any time that configure can be run.
Signed-off-by: Simon McVittie smcv@debian.org
Applied now. Thanks.
Takashi
configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in index abc4687..e904956 100644 --- a/configure.in +++ b/configure.in @@ -115,7 +115,7 @@ AC_ARG_WITH(versioned, versioned="$withval", versioned="yes") if test "$versioned" = "yes"; then # it seems that GNU ld versions since 2.10 are not broken
- xres=`grep '^VERSION=' libtool | cut -d = -f 2 | cut -d " -f 2`
- xres=`grep '^VERSION=' ${srcdir}/ltmain.sh | cut -d = -f 2 | cut -d " -f 2` major=`echo $xres | cut -d . -f 1` minor=`echo $xres | cut -d . -f 2` pass=0
-- 1.7.1
[1.2 Digital signature <application/pgp-signature (7bit)>]
[2 <text/plain; us-ascii (7bit)>] _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
participants (2)
-
Simon McVittie -
Takashi Iwai