From 96ba69a15232c8b3f95980f2dd526d7093bc9ae6 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Tue, 19 Nov 2024 07:28:03 +0100 Subject: [PATCH] package/win32: only enable/disable NLS once It's on by default, so not needed in configure.sh. --- extras/package/win32/build.sh | 3 +++ extras/package/win32/configure.sh | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh index f6bdc5b3f5..02a291999c 100755 --- a/extras/package/win32/build.sh +++ b/extras/package/win32/build.sh @@ -456,6 +456,9 @@ fi if [ "$I18N" != "yes" ]; then CONFIGFLAGS="$CONFIGFLAGS --disable-nls" MCONFIGFLAGS="$MCONFIGFLAGS -Dnls=disabled" +else + CONFIGFLAGS="$CONFIGFLAGS --enable-nls" + MCONFIGFLAGS="$MCONFIGFLAGS -Dnls=enabled" fi if [ -n "$BREAKPAD" ]; then CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD" diff --git a/extras/package/win32/configure.sh b/extras/package/win32/configure.sh index 6b0adddb4a..a8db615404 100755 --- a/extras/package/win32/configure.sh +++ b/extras/package/win32/configure.sh @@ -12,7 +12,6 @@ OPTIONS=" --enable-goom --enable-sse --enable-libcddb - --enable-zvbi --disable-telx - --enable-nls" + --enable-zvbi --disable-telx" sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"