[Scummvm-git-logs] scummvm master -> e6fdfb1628c4ae6b1f9149692a3ef3295f4f71fb

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
e6fdfb1628 CONFIGURE: Don't define empty plugin prefix/suffix in config.h


Commit: e6fdfb1628c4ae6b1f9149692a3ef3295f4f71fb
    https://github.com/scummvm/scummvm/commit/e6fdfb1628c4ae6b1f9149692a3ef3295f4f71fb
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-04-06T20:53:07+02:00

Commit Message:
CONFIGURE: Don't define empty plugin prefix/suffix in config.h

If PLUGIN_PREFIX or PLUGIN_SUFFIX is an empty value, `#undef` it,
instead of defining it to an empty string.

This avoids ending up doing a `filename.hasPrefix("")` check in
FilePluginProvider::isPluginFilename().

Changed paths:
    configure


diff --git a/configure b/configure
index ad6347c7ce4..33e8fda1622 100755
--- a/configure
+++ b/configure
@@ -5280,8 +5280,16 @@ fi
 define_in_config_if_yes "$_dynamic_modules" 'DYNAMIC_MODULES'
 
 if test "$_dynamic_modules" = yes ; then
-	add_line_to_config_h "#define PLUGIN_PREFIX	\"$_plugin_prefix\""
-	add_line_to_config_h "#define PLUGIN_SUFFIX	\"$_plugin_suffix\""
+	if test ! -z "$_plugin_prefix" ; then
+		add_line_to_config_h "#define PLUGIN_PREFIX	\"$_plugin_prefix\""
+	else
+		add_line_to_config_h "#undef PLUGIN_PREFIX"
+	fi
+	if test ! -z "$_plugin_suffix" ; then
+		add_line_to_config_h "#define PLUGIN_SUFFIX	\"$_plugin_suffix\""
+	else
+		add_line_to_config_h "#undef PLUGIN_SUFFIX"
+	fi
 	add_line_to_config_mk "PLUGIN_PREFIX := $_plugin_prefix"
 	add_line_to_config_mk "PLUGIN_SUFFIX := $_plugin_suffix"
 fi