build system updates

git-svn-id: file:///home/lennart/svn/public/pavucontrol/trunk@6 c17c95f2-f111-0410-90bf-f30a9569010c
This commit is contained in:
Lennart Poettering 2006-04-21 19:55:43 +00:00
parent 134de95485
commit 5b1dcd4d3a
2 changed files with 23 additions and 10 deletions

View File

@ -17,28 +17,41 @@
# along with pavucontrol; if not, write to the Free Software Foundation, # along with pavucontrol; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
VERSION=1.9
run_versioned() { run_versioned() {
local P 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 shift 2
"$P" "$@" "$P" "$@"
} }
if [ "x$1" = "xam" ] ; then
set -ex
run_versioned automake 1.7 -a -c --foreign
./config.status
else
set -ex set -ex
if [ "x$1" = "xam" ] ; then
run_versioned automake "$VERSION" -a -c --foreign
./config.status
else
rm -rf autom4te.cache rm -rf autom4te.cache
rm -f config.cache rm -f config.cache
run_versioned aclocal 1.7 run_versioned aclocal "$VERSION"
autoheader run_versioned autoconf 2.59 -Wall
run_versioned automake 1.7 -a -c --foreign run_versioned autoheader 2.59
autoconf -Wall run_versioned automake "$VERSION" -a -c --foreign
CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@" CFLAGS="-g -O0" ./configure --sysconfdir=/etc "$@"

View File

@ -23,7 +23,7 @@ AC_PREREQ(2.57)
AC_INIT([pavucontrol],[0.8],[mzcnihpbageby (at) 0pointer (dot) de]) AC_INIT([pavucontrol],[0.8],[mzcnihpbageby (at) 0pointer (dot) de])
AC_CONFIG_SRCDIR([src/pavucontrol.cc]) AC_CONFIG_SRCDIR([src/pavucontrol.cc])
AC_CONFIG_HEADERS([config.h]) 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/pavucontrol/]) AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/pavucontrol/])