Added --disable-alsamixer to configure script

diff --git a/Makefile.am b/Makefile.am
index 818a1a1d2453f17c0922fbce9d248626c924edb6..6bb04163f3564749def41d8f4f9df1e0bb05232b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
 INCLUDES=-I$(top_srcdir)/include
-SUBDIRS=include alsactl alsamixer amixer aplay seq utils
+if ALSAMIXER
+ALSAMIXER_DIR=alsamixer
+else
+ALSAMIXER_DIR=
+endif
+SUBDIRS=include alsactl $(ALSAMIXER_DIR) amixer aplay seq utils
 EXTRA_DIST=ChangeLog INSTALL TODO README configure cvscompile depcomp
 
 rpm: dist

diff --git a/configure.in b/configure.in
index 4c5236d281a5b76c1aba81d1109f96f1d8a969ed..4b56635a87d68ef814e4d08d1666cdfbd6f7fff1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,20 +4,44 @@ AC_PREFIX_DEFAULT(/usr)
 AM_INIT_AUTOMAKE(alsa-utils, 0.9.4)
 
 dnl Checks for programs.
+
+dnl try to gues cross-compiler if not set
+if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";
+then
+  AC_MSG_CHECKING(for cross-compiler)
+
+  which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+  which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \
+  && CC=${target_cpu}-${target-os}-gcc
+  which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \
+  && CC=${target_cpu}-${target_vendor}-${target_os}-gcc
+
+  AC_MSG_RESULT($CC)
+fi
+
 AC_PROG_CC
 dnl AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PATH_ALSA(0.9.0)
 
+AC_ARG_ENABLE(alsamixer,
+     [  --disable-alsamixer     Disable alsamixer compilation],
+     [case "${enableval}" in
+       yes) alsamixer=true ;;
+       no)  alsamixer=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-alsamixer) ;;
+     esac],[alsamixer=true])
+AM_CONDITIONAL(ALSAMIXER, test x$alsamixer = xtrue)
+
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_LIB(ncurses, initscr, 
-             [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; ], [ 
-       AC_CHECK_LIB(curses, initscr, 
-                    [ CURSESINC='<curses.h>'; CURSESLIB='-lcurses'; ],
-                     AC_MSG_ERROR(this packages requires a curses library))
-])
+#AC_CHECK_LIB(ncurses, initscr, 
+#             [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; ], [ 
+#      AC_CHECK_LIB(curses, initscr, 
+#                   [ CURSESINC='<curses.h>'; CURSESLIB='-lcurses'; ],
+#                     AC_MSG_ERROR(this packages requires a curses library))
+#])
 
 AC_SUBST(CURSESINC)
 AC_SUBST(CURSESLIB)