Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.3
alsa
0041-configure-Quite-AM_CONDITIONAL-arguments.p...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0041-configure-Quite-AM_CONDITIONAL-arguments.patch of Package alsa
From 8d14698931d6c319c42c4bc39886e92d13d19f1e Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Fri, 7 Dec 2012 09:27:11 +0100 Subject: [PATCH 41/43] configure: Quite AM_CONDITIONAL() arguments Otherwise it won't be processed properly with the recent automake. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- configure.in | 91 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/configure.in b/configure.in index 383f5de..e397dad 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ AC_CANONICAL_HOST AM_INIT_AUTOMAKE(alsa-lib, 1.0.26) eval LIBTOOL_VERSION_INFO="2:0:0" dnl ************************************************* -AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") +AM_CONDITIONAL([INSTALL_M4], [test -n "${ACLOCAL}"]) # Test for new silent rules and enable only if they are available m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -63,7 +63,7 @@ AC_HEADER_TIME dnl Checks for library functions. AC_PROG_GCC_TRADITIONAL AC_CHECK_FUNC([hsearch_r], [HAVE_HSEARCH_R=yes]) -AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes]) +AM_CONDITIONAL([ALSA_HSEARCH_R], [test "x$HAVE_HSEARCH_R" != xyes]) AC_CHECK_FUNCS([uselocale]) SAVE_LIBRARY_VERSION @@ -161,7 +161,7 @@ if test "$versioned" = "yes"; then else AC_MSG_RESULT(no) fi -AM_CONDITIONAL(VERSIONED_SYMBOLS, test x$versioned = xyes) +AM_CONDITIONAL([VERSIONED_SYMBOLS], [test x$versioned = xyes]) dnl Check for symbolic-functions AC_MSG_CHECKING(for symbolic-functions) @@ -179,7 +179,7 @@ if test "$symfuncs" = "yes"; then else AC_MSG_RESULT(no) fi -AM_CONDITIONAL(SYMBOLIC_FUNCTIONS, test x"$symfuncs" = xyes) +AM_CONDITIONAL([SYMBOLIC_FUNCTIONS], [test x"$symfuncs" = xyes]) dnl See if toolchain has a custom prefix for symbols ... AC_MSG_CHECKING(for custom symbol prefixes) @@ -254,6 +254,7 @@ AC_MSG_CHECKING(for libdl) AC_ARG_WITH(libdl, AS_HELP_STRING([--with-libdl], [Use libdl for plugins (default = yes)]), [ have_libdl="$withval" ], [ have_libdl="yes" ]) +HAVE_LIBDL= if test "$have_libdl" = "yes"; then AC_CHECK_LIB([dl], [dlsym], [HAVE_LIBDL="yes"]) if test "$HAVE_LIBDL" = "yes" ; then @@ -263,7 +264,7 @@ if test "$have_libdl" = "yes"; then else AC_MSG_RESULT(no) fi -AM_CONDITIONAL(BUILD_MODULES, test "$HAVE_LIBDL"="yes") +AM_CONDITIONAL([BUILD_MODULES], [test "$HAVE_LIBDL" = "yes"]) dnl Check for pthread AC_MSG_CHECKING(for pthread) @@ -409,7 +410,7 @@ test "$softfloat" = "yes" && build_alisp="no" AC_ARG_ENABLE(old-symbols, AS_HELP_STRING([--disable-old-symbols], [disable old obsoleted symbols]), [keep_old_symbols="$enableval"], [keep_old_symbols="yes"]) -AM_CONDITIONAL(KEEP_OLD_SYMBOLS, test x$keep_old_symbols = xyes) +AM_CONDITIONAL([KEEP_OLD_SYMBOLS], [test x$keep_old_symbols = xyes]) AC_ARG_ENABLE(python, AS_HELP_STRING([--disable-python], [disable the python components]), @@ -438,14 +439,14 @@ fi AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_INCLUDES) -AM_CONDITIONAL(BUILD_MIXER, test x$build_mixer = xyes) -AM_CONDITIONAL(BUILD_PCM, test x$build_pcm = xyes) -AM_CONDITIONAL(BUILD_RAWMIDI, test x$build_rawmidi = xyes) -AM_CONDITIONAL(BUILD_HWDEP, test x$build_hwdep = xyes) -AM_CONDITIONAL(BUILD_SEQ, test x$build_seq = xyes) -AM_CONDITIONAL(BUILD_UCM, test x$build_ucm = xyes) -AM_CONDITIONAL(BUILD_ALISP, test x$build_alisp = xyes) -AM_CONDITIONAL(BUILD_PYTHON, test x$build_python = xyes) +AM_CONDITIONAL([BUILD_MIXER], [test x$build_mixer = xyes]) +AM_CONDITIONAL([BUILD_PCM], [test x$build_pcm = xyes]) +AM_CONDITIONAL([BUILD_RAWMIDI], [test x$build_rawmidi = xyes]) +AM_CONDITIONAL([BUILD_HWDEP], [test x$build_hwdep = xyes]) +AM_CONDITIONAL([BUILD_SEQ], [test x$build_seq = xyes]) +AM_CONDITIONAL([BUILD_UCM], [test x$build_ucm = xyes]) +AM_CONDITIONAL([BUILD_ALISP], [test x$build_alisp = xyes]) +AM_CONDITIONAL([BUILD_PYTHON], [test x$build_python = xyes]) if test "$build_mixer" = "yes"; then AC_DEFINE([BUILD_MIXER], "1", [Build mixer component]) @@ -520,34 +521,34 @@ if test "$softfloat" = "yes"; then build_pcm_ladspa="no" fi -AM_CONDITIONAL(BUILD_PCM_PLUGIN, test x$build_pcm_plugin = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_COPY, test x$build_pcm_copy = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_LINEAR, test x$build_pcm_linear = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_ROUTE, test x$build_pcm_route = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_MULAW, test x$build_pcm_mulaw = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_ALAW, test x$build_pcm_alaw = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_ADPCM, test x$build_pcm_adpcm = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_RATE, test x$build_pcm_rate = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_PLUG, test x$build_pcm_plug = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_MULTI, test x$build_pcm_multi = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_SHM, test x$build_pcm_shm = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_FILE, test x$build_pcm_file = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_NULL, test x$build_pcm_null = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_EMPTY, test x$build_pcm_empty = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_SHARE, test x$build_pcm_share = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_METER, test x$build_pcm_meter = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_HOOKS, test x$build_pcm_hooks = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_LFLOAT, test x$build_pcm_lfloat = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_LADSPA, test x$build_pcm_ladspa = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_DMIX, test x$build_pcm_dmix = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_DSHARE, test x$build_pcm_dshare = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_DSNOOP, test x$build_pcm_dsnoop = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_ASYM, test x$build_pcm_asym = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_IEC958, test x$build_pcm_iec958 = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_SOFTVOL, test x$build_pcm_softvol = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_EXTPLUG, test x$build_pcm_extplug = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_IOPLUG, test x$build_pcm_ioplug = xyes) -AM_CONDITIONAL(BUILD_PCM_PLUGIN_MMAP_EMUL, test x$build_pcm_mmap_emul = xyes) +AM_CONDITIONAL([BUILD_PCM_PLUGIN], [test x$build_pcm_plugin = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_COPY], [test x$build_pcm_copy = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_LINEAR], [test x$build_pcm_linear = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_ROUTE], [test x$build_pcm_route = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_MULAW], [test x$build_pcm_mulaw = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_ALAW], [test x$build_pcm_alaw = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_ADPCM], [test x$build_pcm_adpcm = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_RATE], [test x$build_pcm_rate = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_PLUG], [test x$build_pcm_plug = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_MULTI], [test x$build_pcm_multi = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_SHM], [test x$build_pcm_shm = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_FILE], [test x$build_pcm_file = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_NULL], [test x$build_pcm_null = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_EMPTY], [test x$build_pcm_empty = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_SHARE], [test x$build_pcm_share = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_METER], [test x$build_pcm_meter = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_HOOKS], [test x$build_pcm_hooks = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_LFLOAT], [test x$build_pcm_lfloat = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_LADSPA], [test x$build_pcm_ladspa = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_DMIX], [test x$build_pcm_dmix = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_DSHARE], [test x$build_pcm_dshare = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_DSNOOP], [test x$build_pcm_dsnoop = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_ASYM], [test x$build_pcm_asym = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_IEC958], [test x$build_pcm_iec958 = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_SOFTVOL], [test x$build_pcm_softvol = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_EXTPLUG], [test x$build_pcm_extplug = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_IOPLUG], [test x$build_pcm_ioplug = xyes]) +AM_CONDITIONAL([BUILD_PCM_PLUGIN_MMAP_EMUL], [test x$build_pcm_mmap_emul = xyes]) dnl Defines for plug plugin if test "$build_pcm_rate" = "yes"; then @@ -606,9 +607,9 @@ for p in $ctl_plugins; do done done -AM_CONDITIONAL(BUILD_CTL_PLUGIN, test x$build_ctl_plugin = xyes) -AM_CONDITIONAL(BUILD_CTL_PLUGIN_SHM, test x$build_ctl_shm = xyes) -AM_CONDITIONAL(BUILD_CTL_PLUGIN_EXT, test x$build_ctl_ext = xyes) +AM_CONDITIONAL([BUILD_CTL_PLUGIN], [test x$build_ctl_plugin = xyes]) +AM_CONDITIONAL([BUILD_CTL_PLUGIN_SHM], [test x$build_ctl_shm = xyes]) +AM_CONDITIONAL([BUILD_CTL_PLUGIN_EXT], [test x$build_ctl_ext = xyes]) dnl Create ctl plugin symbol list for static library rm -f "$srcdir"/src/control/ctl_symbols_list.c -- 1.8.0.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
