applied modified patch from Henrik Brix Andersen which adds the

2006-01-20  Michael Natterer  <mitch@gimp.org>

	* configure.in: applied modified patch from Henrik Brix Andersen
	which adds the possibility to build --without-alsa, even if alsa
	is available. Fixes bug #327777.
This commit is contained in:
Michael Natterer 2006-01-20 10:46:05 +00:00 committed by Michael Natterer
parent 8c35465cdb
commit c0eb0d78aa
2 changed files with 15 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2006-01-20 Michael Natterer <mitch@gimp.org>
* configure.in: applied modified patch from Henrik Brix Andersen
which adds the possibility to build --without-alsa, even if alsa
is available. Fixes bug #327777.
2006-01-19 Michael Natterer <mitch@gimp.org> 2006-01-19 Michael Natterer <mitch@gimp.org>
* app/tools/gimprectangletool.c (gimp_rectangle_tool_dispose): * app/tools/gimprectangletool.c (gimp_rectangle_tool_dispose):

View File

@ -1340,7 +1340,7 @@ AC_SUBST(WMF_CFLAGS)
# Check for lcms # Check for lcms
################ ################
AC_ARG_WITH(lcms,[ --without-lcms build without lcms support]) AC_ARG_WITH(lcms, [ --without-lcms build without lcms support])
have_lcms=no have_lcms=no
if test "x$with_lcms" != xno; then if test "x$with_lcms" != xno; then
@ -1370,17 +1370,20 @@ AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)
# Check for alsa # Check for alsa
################ ################
AM_PATH_ALSA(alsa_required_version, AC_ARG_WITH(alsa, [ --without-alsa disable alsa support in midi input controller])
if test "x$with_alsa" != xno; then
AM_PATH_ALSA(alsa_required_version,
AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if alsa is available]), AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if alsa is available]),
AC_MSG_WARN([*** midi input controller will be built without alsa support (alsa not found or unuseable) ***])) AC_MSG_WARN([*** midi input controller will be built without alsa support (alsa not found or unuseable) ***]))
fi
####################### #######################
# Check for linux input # Check for linux input
####################### #######################
AC_ARG_WITH(linux-input, AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module])
[ --without-linux-input don't build linux input event controller module])
have_linux_input=no have_linux_input=no
if test "x$with_linux_input" != "xno"; then if test "x$with_linux_input" != "xno"; then