More build fixes (gtk1 check removal from echomixer), cvscompile removal

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2012-01-23 11:40:34 +01:00
parent 52384d8479
commit 3375a08a4c
28 changed files with 418 additions and 477 deletions

View file

@ -1,27 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(echomixer.c)
AM_INIT_AUTOMAKE(echomixer, 1.0.5)
AC_PROG_CC
AC_PROG_INSTALL
AC_HEADER_STDC
AC_ARG_WITH(gtk2,
[ --with-gtk2=yes,no Build with GTK+2 (default = yes)],
with_gtk2="$withval", with_gtk2="yes")
if test "$with_gtk2" = "yes"; then
PKG_CHECK_MODULES(ECHOMIXER, gtk+-2.0 alsa >= 1.0.0)
else
AM_PATH_GTK(1.2.0)
AM_PATH_ALSA(1.0.0)
ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
AC_SUBST(ECHOMIXER_CFLAGS)
AC_SUBST(ECHOMIXER_LIBS)
fi
AC_OUTPUT(Makefile)

View file

@ -1,9 +0,0 @@
AC_INIT(echomixer.c)
AM_INIT_AUTOMAKE(echomixer, 1.0.5)
AC_PROG_CC
AC_PROG_INSTALL
AC_HEADER_STDC
PKG_CHECK_MODULES(ECHOMIXER, gtk+-2.0 alsa >= 1.0.0)
AC_OUTPUT(Makefile)

View file

@ -1,25 +0,0 @@
#!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then
if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake
fi
if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake"
fi
fi
for f in install-sh mkinstalldirs missing; do
cp -av $AUTOMAKE_DIR/$f .
done
aclocal $ACLOCAL_FLAGS
automake --add-missing --copy
touch depcomp
autoconf
export CFLAGS='-O2 -Wall -pipe -g'
echo "CFLAGS=$CFLAGS"
echo "./configure $@"
./configure $@
unset CFLAGS
make