Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
74c0da2d
Commit
74c0da2d
authored
Mar 05, 2021
by
Francois Gouget
Committed by
Alexandre Julliard
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Fix the libsane pkg-config name.
Signed-off-by:
Francois Gouget
<
fgouget@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2cb681e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
configure
configure
+6
-6
configure.ac
configure.ac
+1
-1
No files found.
configure
View file @
74c0da2d
...
@@ -2685,8 +2685,8 @@ Some influential environment variables:
...
@@ -2685,8 +2685,8 @@ Some influential environment variables:
GNUTLS_CFLAGS
GNUTLS_CFLAGS
C compiler flags for gnutls, overriding pkg-config
C compiler flags for gnutls, overriding pkg-config
GNUTLS_LIBS Linker 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_CFLAGS C compiler flags for
sane-backends
, overriding pkg-config
SANE_LIBS Linker flags for
libsane
, 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_CFLAGS C compiler flags for libusb-1.0, overriding pkg-config
USB_LIBS Linker flags for libusb-1.0, overriding pkg-config
USB_LIBS Linker flags for libusb-1.0, overriding pkg-config
GPHOTO2_CFLAGS
GPHOTO2_CFLAGS
...
@@ -13684,19 +13684,19 @@ if test "x$with_sane" != "xno"
...
@@ -13684,19 +13684,19 @@ if test "x$with_sane" != "xno"
then
then
if
${
SANE_CFLAGS
:+false
}
:
;
then
:
if
${
SANE_CFLAGS
:+false
}
:
;
then
:
if
${
PKG_CONFIG
+
:
}
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
fi
fi
test
"
$cross_compiling
"
=
yes
||
SANE_CFLAGS
=
${
SANE_CFLAGS
:-
`
${
SANE_CONFIG
:-
sane
-config
}
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
SANE_CFLAGS
=
${
SANE_CFLAGS
:-
`
${
SANE_CONFIG
:-
sane
-config
}
--cflags
2>/dev/null
`
}
if
${
SANE_LIBS
:+false
}
:
;
then
:
if
${
SANE_LIBS
:+false
}
:
;
then
:
if
${
PKG_CONFIG
+
:
}
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
fi
fi
test
"
$cross_compiling
"
=
yes
||
SANE_LIBS
=
${
SANE_LIBS
:-
`
${
SANE_CONFIG
:-
sane
-config
}
--ldflags
2>/dev/null
`
}
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
}
:
sane-backends
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
libs:
$SANE_LIBS
"
>
&5
ac_save_CPPFLAGS
=
$CPPFLAGS
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$SANE_CFLAGS
"
CPPFLAGS
=
"
$CPPFLAGS
$SANE_CFLAGS
"
ac_fn_c_check_header_mongrel
"
$LINENO
"
"sane/sane.h"
"ac_cv_header_sane_sane_h"
"
$ac_includes_default
"
ac_fn_c_check_header_mongrel
"
$LINENO
"
"sane/sane.h"
"ac_cv_header_sane_sane_h"
"
$ac_includes_default
"
...
...
configure.ac
View file @
74c0da2d
...
@@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
...
@@ -1435,7 +1435,7 @@ WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
dnl **** Check for SANE ****
dnl **** Check for SANE ****
if test "x$with_sane" != "xno"
if test "x$with_sane" != "xno"
then
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,
[AC_CHECK_HEADER(sane/sane.h,
[WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])],
[WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])],
[SANE_CFLAGS=""])])
[SANE_CFLAGS=""])])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment