[alsa-cvslog] alsa-lib: ALSA library repository branch, master now at v1.0.23-28-g5cfa03d

[<nor...@al...>]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  5cfa03d2f3a9e6bc62f740640d20bd137b4e3bb5 (commit)
       via  443c1057379f167639acad5dc197bd50a915b5ab (commit)
      from  2f6206da0c1ff88235e6eca0077343f22a4b43ee (commit)

- Log -----------------------------------------------------------------
commit 5cfa03d2f3a9e6bc62f740640d20bd137b4e3bb5
Author:     Simon McVittie <sm...@de...>
AuthorDate: Fri Oct 8 09:06:58 2010 +0100
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Sun Oct 17 11:05:13 2010 +0200

    configure.in: don't rely on test -a, not all shells support it
    
    Notably, /bin/sh in older Debian and Ubuntu is dash, which doesn't.
    
    Signed-off-by: Takashi Iwai <ti...@su...>

commit 443c1057379f167639acad5dc197bd50a915b5ab
Author:     Simon McVittie <sm...@de...>
AuthorDate: Fri Oct 8 09:06:29 2010 +0100
Commit:     Takashi Iwai <ti...@su...>
CommitDate: Sun Oct 17 11:03:57 2010 +0200

    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 <sm...@de...>
    Signed-off-by: Takashi Iwai <ti...@su...>

-----------------------------------------------------------------------

Diffstat:
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/configure.in b/configure.in
index abc4687..c353759 100644
--- a/configure.in
+++ b/configure.in
@@ -115,11 +115,11 @@ 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
-  if test $major -eq 1 -a $minor -gt 3; then
+  if test $major -eq 1 && test $minor -gt 3; then
     pass=1
   else
     if test $major -gt 1; then
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  2f6206da0c1ff88235e6eca0077343f22a4b43ee \
  5cfa03d2f3a9e6bc62f740640d20bd137b4e3bb5