From 81b796b34f04593e47d979fc9b71287f4c94a805 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 8 May 2006 16:04:53 +0000
Subject: update for polypaudio 0.8.1

git-svn-id: file:///home/lennart/svn/public/libao-pulse/trunk@20 a8d83910-18e2-0310-866c-8ed7f9518005
---
 Makefile.am  |  5 +----
 bootstrap.sh | 40 ++++++++++++++++++++++++++++------------
 configure.ac | 12 +++++++-----
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 19001f5..2b8a2c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,4 @@ homepage: all dist
 	cp doc/README.html doc/style.css $$HOME/homepage/private/projects/libao-polyp
 	cp $$HOME/homepage/private/projects/libao-polyp/README.html $$HOME/homepage/private/projects/libao-polyp/index.html
 
-distcleancheck:
-	@:
-
-.PHONY: homepage distcleancheck
+.PHONY: homepage
diff --git a/bootstrap.sh b/bootstrap.sh
index c2e8bbc..bef8f4b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -17,31 +17,47 @@
 # along with libao-polyp; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
+VERSION=1.9
+
 run_versioned() {
     local P
-    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+    
+    if [ -e "`which $1$V`" ] ; then
+    	P="$1$V" 
+    else
+	if [ -e "`which $1-$2`" ] ; then
+	    P="$1-$2" 
+	else
+	    P="$1"
+	fi
+    fi
 
     shift 2
     "$P" "$@"
 }
 
+set -ex
+
 if [ "x$1" = "xam" ] ; then
-    set -ex
-    run_versioned automake 1.7 -a -c --foreign
+    run_versioned automake "$VERSION" -a -c --foreign
     ./config.status
 else 
-    set -ex
-
     rm -rf autom4te.cache
     rm -f config.cache
 
-    run_versioned aclocal 1.7
-    libtoolize -c --force
-    autoheader
-    run_versioned automake 1.7 -a -c --foreign
-    autoconf -Wall
+    test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
 
-    CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"
+    "$LIBTOOLIZE" -c --force
+    run_versioned aclocal "$VERSION"
+    run_versioned autoconf 2.59 -Wall
+    run_versioned autoheader 2.59
+    run_versioned automake "$VERSION" -a -c --foreign
 
-    make clean
+    if test "x$NOCONFIGURE" = "x"; then
+        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --enable-force-preopen "$@" 
+        make clean
+    fi
 fi
diff --git a/configure.ac b/configure.ac
index 261eb74..88b13c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,10 +20,10 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
-AC_INIT([libao-polyp],[0.4],[mzyvonbcbylc (at) 0pointer (dot) de])
+AC_INIT([libao-polyp],[0.8.1],[mzyvonbcbylc (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/ao_polyp.c])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
 AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/libao-polyp/])
 
@@ -44,12 +44,14 @@ AC_CHECK_FUNCS([memset strdup])
 AC_C_CONST
 AC_FUNC_MALLOC
 
+PKG_PROG_PKG_CONFIG
+
 if test -d ../polypaudio ; then
-   POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio'
-   POLYP_LIBS='-L$(top_srcdir)/../polypaudio/polyp -lpolyp-simple-0.7 -lpolyp-0.7'
+   POLYP_CFLAGS='-I$(top_srcdir)/../polypaudio/src'
+   POLYP_LIBS='-L$(top_srcdir)/../polypaudio/src/.libs -lpolyp-simple-0.8.1'
    echo "*** Found polypaudio in ../polypaudio, using that version ***"
 else
-   PKG_CHECK_MODULES(POLYP, [ polyplib-simple >= 0.7 ])
+   PKG_CHECK_MODULES(POLYP, [ polyplib-simple >= 0.8 ])
 fi
 
 AC_SUBST(POLYP_LIBS)
-- 
cgit