Skip to content

Commit e5422ec

Browse files
committedMar 5, 2025·
overdue configure re-gen for 2088058
1 parent ea54a21 commit e5422ec

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed
 

‎platforms/unix/config/configure

+19
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@ enable_fast_bitblt
828828
with_custom_display
829829
with_vm_display_fbdev
830830
with_vm_sound_OSS
831+
with_vm_sound_Sun
831832
with_custom_sound
832833
enable_iconv
833834
enable_mpg_mmx
@@ -1525,6 +1526,7 @@ Optional Packages:
15251526
--with-custom-display enable custom window support default=disabled
15261527
--without-vm-display-fbdev disable frame buffer vm display support default=enabled
15271528
--without-vm-sound-OSS disable OSS vm sound support (default=enabled)
1529+
--without-vm-sound-Sun disable Sun vm sound support (default=enabled)
15281530
--with-custom-sound enable custom sound support default=disabled
15291531
--with-libtls Use libtls instead of OpenSSL unconditionally
15301532

@@ -18278,6 +18280,16 @@ plibs=""
1827818280
rm -f vm-sound-Sun.sub vm-sound-Sun.lib
1827918281
# -*- sh -*-
1828018282

18283+
18284+
# Check whether --with-vm-sound-Sun was given.
18285+
if test "${with_vm_sound_Sun+set}" = set; then :
18286+
withval=$with_vm_sound_Sun; with_vm_sound_Sun="$withval"
18287+
else
18288+
with_vm_sound_Sun="yes"
18289+
fi
18290+
18291+
18292+
if test "$with_vm_sound_Sun" = "yes"; then
1828118293
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SunOS/Solaris audio" >&5
1828218294
$as_echo_n "checking for SunOS/Solaris audio... " >&6; }
1828318295
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18339,6 +18351,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1833918351

1834018352
fi
1834118353
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
18354+
else
18355+
18356+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ******** disabling vm-sound-Sun" >&5
18357+
$as_echo "******** disabling vm-sound-Sun" >&6; }
18358+
disabled_plugins="${disabled_plugins} vm-sound-Sun";
18359+
fi
18360+
1834218361
if test "${plibs}"; then
1834318362
llibs="${LIBS}"
1834418363
for l in ${plibs}; do

‎platforms/unix/config/ltmain.sh

+8-20
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
PROGRAM=libtool
3333
PACKAGE=libtool
34-
VERSION="2.4.7 Debian-2.4.7-5"
34+
VERSION="2.4.7 Debian-2.4.7-7~deb12u1"
3535
package_revision=2.4.7
3636

3737

@@ -572,27 +572,15 @@ func_require_term_colors ()
572572
# ---------------------
573573
# Append VALUE onto the existing contents of VAR.
574574

575-
# We should try to minimise forks, especially on Windows where they are
576-
# unreasonably slow, so skip the feature probes when bash or zsh are
577-
# being used:
578-
if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
579-
: ${_G_HAVE_ARITH_OP="yes"}
580-
: ${_G_HAVE_XSI_OPS="yes"}
581-
# The += operator was introduced in bash 3.1
582-
case $BASH_VERSION in
583-
[12].* | 3.0 | 3.0*) ;;
584-
*)
585-
: ${_G_HAVE_PLUSEQ_OP="yes"}
586-
;;
587-
esac
588-
fi
589-
590575
# _G_HAVE_PLUSEQ_OP
591576
# Can be empty, in which case the shell is probed, "yes" if += is
592577
# useable or anything else if it does not work.
593-
test -z "$_G_HAVE_PLUSEQ_OP" \
594-
&& (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
595-
&& _G_HAVE_PLUSEQ_OP=yes
578+
if test -z "$_G_HAVE_PLUSEQ_OP" && \
579+
__PLUSEQ_TEST="a" && \
580+
__PLUSEQ_TEST+=" b" 2>/dev/null && \
581+
test "a b" = "$__PLUSEQ_TEST"; then
582+
_G_HAVE_PLUSEQ_OP=yes
583+
fi
596584

597585
if test yes = "$_G_HAVE_PLUSEQ_OP"
598586
then
@@ -2308,7 +2296,7 @@ include the following information:
23082296
compiler: $LTCC
23092297
compiler flags: $LTCFLAGS
23102298
linker: $LD (gnu? $with_gnu_ld)
2311-
version: $progname $scriptversion Debian-2.4.7-5
2299+
version: $progname $scriptversion Debian-2.4.7-7~deb12u1
23122300
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
23132301
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
23142302

0 commit comments

Comments
 (0)
Please sign in to comment.