Francois Gouget : configure: Fix the libsane pkg-config name.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 74c0da2d71e95f3e6bd6c8b440652933771b27d7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=74c0da2d71e95f3e6bd6c8b44...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Mar  5 17:53:31 2021 +0100

configure: Fix the libsane pkg-config name.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure    | 12 ++++++------
 configure.ac |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 13eecaf05d7..3b5a50cef53 100755
--- a/configure
+++ b/configure
@@ -2685,8 +2685,8 @@ Some influential environment variables:
   GNUTLS_CFLAGS
               C compiler flags for gnutls, overriding pkg-config
   GNUTLS_LIBS Linker flags for gnutls, overriding pkg-config
-  SANE_CFLAGS C compiler flags for libsane, overriding pkg-config
-  SANE_LIBS   Linker flags for libsane, overriding pkg-config
+  SANE_CFLAGS C compiler flags for sane-backends, overriding pkg-config
+  SANE_LIBS   Linker flags for sane-backends, overriding pkg-config
   USB_CFLAGS  C compiler flags for libusb-1.0, overriding pkg-config
   USB_LIBS    Linker flags for libusb-1.0, overriding pkg-config
   GPHOTO2_CFLAGS
@@ -13684,19 +13684,19 @@ if test "x$with_sane" != "xno"
 then
     if ${SANE_CFLAGS:+false} :; then :
   if ${PKG_CONFIG+:} false; then :
-  SANE_CFLAGS=`$PKG_CONFIG --cflags libsane 2>/dev/null`
+  SANE_CFLAGS=`$PKG_CONFIG --cflags sane-backends 2>/dev/null`
 fi
 fi
 test "$cross_compiling" = yes || SANE_CFLAGS=${SANE_CFLAGS:-`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`}
 if ${SANE_LIBS:+false} :; then :
   if ${PKG_CONFIG+:} false; then :
-  SANE_LIBS=`$PKG_CONFIG --libs libsane 2>/dev/null`
+  SANE_LIBS=`$PKG_CONFIG --libs sane-backends 2>/dev/null`
 fi
 fi
 test "$cross_compiling" = yes || SANE_LIBS=${SANE_LIBS:-`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`}
 
-$as_echo "$as_me:${as_lineno-$LINENO}: libsane cflags: $SANE_CFLAGS" >&5
-$as_echo "$as_me:${as_lineno-$LINENO}: libsane libs: $SANE_LIBS" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends cflags: $SANE_CFLAGS" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: sane-backends libs: $SANE_LIBS" >&5
 ac_save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $SANE_CFLAGS"
 ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default"
diff --git a/configure.ac b/configure.ac
index 6a4e9568c40..8ed3b0c2669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
 dnl **** Check for SANE ****
 if test "x$with_sane" != "xno"
 then
-    WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`],
+    WINE_PACKAGE_FLAGS(SANE,[sane-backends],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`],
         [AC_CHECK_HEADER(sane/sane.h,
             [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])],
             [SANE_CFLAGS=""])])