[xiph-commits] r18870 - trunk/squishyball

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2013-03-12 12:51:15 -0700 (Tue, 12 Mar 2013)
New Revision: 18870

Modified:
   trunk/squishyball/audio.c
   trunk/squishyball/autogen.sh
Log:
From: "Kyle J. McKay" <mackyle at gmail.com>
Subject: [PATCH 1/6] autogen.sh sanity
Support --noconfigure to skip the configure step.
Always copy the missing items rather than symlinking them.


Modified: trunk/squishyball/audio.c
===================================================================
--- trunk/squishyball/audio.c	2013-03-12 00:41:44 UTC (rev 18869)
+++ trunk/squishyball/audio.c	2013-03-12 19:51:15 UTC (rev 18870)
@@ -710,7 +710,7 @@
   sf.bits=bits;
   sf.byte_format=AO_FMT_LITTLE;
   sf.matrix=(ch>2?matrix:0);
-  aoe.key="quiet";
+  aoe.key="debug";
 
   if(!device){
     /* if we don't have an explicit device, defaults make this easy */
@@ -751,9 +751,15 @@
       /* don't try to open the driver if it doesn't have the device/id
          option; it will ignore the option and try to open its default */
       for(j=0;j<info->option_count;j++)
-        if(!strcmp(info->options[j],ao.key))break;
-      if(j<info->option_count)
+        if(!strcmp(info->options[j],ao.key)){
+          fprintf(stderr,"Got option for %s\n",aname);
+          break;
+        }
+      if(j<info->option_count){
+        fprintf(stderr,"opening %s %d\n",aname,id);
         if((ret=ao_open_live(id,&sf,&ao)))break;
+        fprintf(stderr,"open fialed\n");
+      }
     }
   }
   if(ret && sb_verbose)

Modified: trunk/squishyball/autogen.sh
===================================================================
--- trunk/squishyball/autogen.sh	2013-03-12 00:41:44 UTC (rev 18869)
+++ trunk/squishyball/autogen.sh	2013-03-12 19:51:15 UTC (rev 18870)
@@ -108,21 +108,26 @@
         exit 1
 fi
 
-if test -z "$*"; then
-        echo "I am going to run ./configure with no arguments - if you wish "
-        echo "to pass any to it, please specify them on the $0 command line."
-fi
-
 /bin/echo "Generating configuration files for $package, please wait...."
 
 /bin/echo "  $ACLOCAL $ACLOCAL_FLAGS"
 $ACLOCAL $ACLOCAL_FLAGS || exit 1
-/bin/echo "  $LIBTOOLIZE --automake --force"
-$LIBTOOLIZE --automake --force || exit 1
-/bin/echo "  $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
-$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
+/bin/echo "  $LIBTOOLIZE --automake --copy --force"
+$LIBTOOLIZE --automake --copy --force || exit 1
+/bin/echo "  $AUTOMAKE --add-missing --copy $AUTOMAKE_FLAGS"
+$AUTOMAKE --add-missing --copy $AUTOMAKE_FLAGS || exit 1
 /bin/echo "  autoconf"
 autoconf || exit 1
 
+if test "x$1" = "x--noconfigure"; then
+        exit 0
+fi
+
+if test -z "$*"; then
+        echo "I am going to run ./configure with no arguments - if you wish "
+        echo "to pass any to it, please specify them on the $0 command line."
+        echo "(Use --noconfigure to suppress running configure at all.)"
+fi
+
 cd $olddir
 $srcdir/configure "$@" && /bin/echo