Update of /cvsroot/alsa/alsa-utils
In directory sc8-pr-cvs1:/tmp/cvs-serv3019
Modified Files:
configure.in Makefile.am
Log Message:
Added --disable-alsamixer to configure script
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/configure.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- configure.in 31 May 2003 17:49:55 -0000 1.60
+++ configure.in 14 Jun 2003 08:32:44 -0000 1.61
@@ -4,20 +4,44 @@
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)
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.am 24 Oct 2002 12:10:53 -0000 1.24
+++ Makefile.am 14 Jun 2003 08:32:44 -0000 1.25
@@ -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
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
