diff -up hplip-3.21.2/scan/sane/escl.c.libm hplip-3.21.2/scan/sane/escl.c --- hplip-3.21.2/scan/sane/escl.c.libm 2021-06-23 12:00:15.203400524 +0200 +++ hplip-3.21.2/scan/sane/escl.c 2021-06-23 12:00:47.963241996 +0200 @@ -25,6 +25,7 @@ # include "escli.h" # include "io.h" #include "utils.h" +#include # define DEBUG_DECLARE_ONLY # include "sanei_debug.h" @@ -44,10 +45,9 @@ static int bb_load(struct escl_session * } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ - if ((ps->math_handle = load_library("libm.so")) == NULL) + if ((ps->math_handle = load_library(LIBM_SO)) == NULL) { - if ((ps->math_handle = load_library("libm.so.6")) == NULL) - goto bugout; + goto bugout; } if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL) { diff -up hplip-3.21.2/scan/sane/marvell.c.libm hplip-3.21.2/scan/sane/marvell.c --- hplip-3.21.2/scan/sane/marvell.c.libm 2021-06-23 11:58:15.853685079 +0200 +++ hplip-3.21.2/scan/sane/marvell.c 2021-06-23 11:58:41.751142811 +0200 @@ -49,6 +49,7 @@ #include "marvelli.h" #include "io.h" #include "utils.h" +#include #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -67,10 +68,9 @@ static int bb_load(struct marvell_sessio } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ - if ((ps->math_handle = load_library("libm.so")) == NULL) + if ((ps->math_handle = load_library(LIBM_SO)) == NULL) { - if ((ps->math_handle = load_library("libm.so.6")) == NULL) - goto bugout; + goto bugout; } if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL) diff -up hplip-3.21.2/scan/sane/soap.c.libm hplip-3.21.2/scan/sane/soap.c --- hplip-3.21.2/scan/sane/soap.c.libm 2021-06-23 11:59:33.701066446 +0200 +++ hplip-3.21.2/scan/sane/soap.c 2021-06-23 12:00:04.895821112 +0200 @@ -57,6 +57,7 @@ #include "soapi.h" #include "io.h" #include "utils.h" +#include #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -75,10 +76,9 @@ static int bb_load(struct soap_session * } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ - if ((ps->math_handle = load_library("libm.so")) == NULL) + if ((ps->math_handle = load_library(LIBM_SO)) == NULL) { - if ((ps->math_handle = load_library("libm.so.6")) == NULL) - goto bugout; + goto bugout; } if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL) diff -up hplip-3.21.2/scan/sane/soapht.c.libm hplip-3.21.2/scan/sane/soapht.c --- hplip-3.21.2/scan/sane/soapht.c.libm 2021-06-23 11:56:04.539300991 +0200 +++ hplip-3.21.2/scan/sane/soapht.c 2021-06-23 11:57:57.233636985 +0200 @@ -51,6 +51,7 @@ #include "soaphti.h" #include "io.h" #include "utils.h" +#include #define DEBUG_DECLARE_ONLY #include "sanei_debug.h" @@ -69,10 +70,9 @@ static int bb_load(struct soap_session * } /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ - if ((ps->math_handle = load_library("libm.so")) == NULL) + if ((ps->math_handle = load_library(LIBM_SO)) == NULL) { - if ((ps->math_handle = load_library("libm.so.6")) == NULL) - goto bugout; + goto bugout; } if ((ps->bb_handle = load_plugin_library(UTILS_SCAN_PLUGIN_LIBRARY, so)) == NULL)