Skip to content

W
wine-winehq
Commit a9d7babd authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

sane.ds: Use 'sane-config --ldflags'.

parent 32974e25
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
configure
View file @ a9d7babd
...@@ -13031,6 +13031,7 @@ fi ...@@ -13031,6 +13031,7 @@ fi
if test "$sane_devel" != "no" -a "x$with_sane" != "xno" if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then then
ac_sane_incl="`$sane_devel --cflags`" ac_sane_incl="`$sane_devel --cflags`"
ac_sane_libs="`$sane_devel --ldflags`"
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ac_sane_incl" CPPFLAGS="$CPPFLAGS $ac_sane_incl"
if test "${ac_cv_header_sane_sane_h+set}" = set; then if test "${ac_cv_header_sane_sane_h+set}" = set; then
...@@ -13170,7 +13171,7 @@ if test "${ac_cv_lib_soname_sane+set}" = set; then ...@@ -13170,7 +13171,7 @@ if test "${ac_cv_lib_soname_sane+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_soname_save_LIBS=$LIBS ac_check_soname_save_LIBS=$LIBS
LIBS="-lsane $LIBS" LIBS="-lsane $ac_sane_libs $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
......
configure.ac
View file @ a9d7babd
...@@ -920,10 +920,11 @@ AC_CHECK_PROG(sane_devel,sane-config,sane-config,no) ...@@ -920,10 +920,11 @@ AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
if test "$sane_devel" != "no" -a "x$with_sane" != "xno" if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then then
ac_sane_incl="`$sane_devel --cflags`" ac_sane_incl="`$sane_devel --cflags`"
ac_sane_libs="`$sane_devel --ldflags`"
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ac_sane_incl" CPPFLAGS="$CPPFLAGS $ac_sane_incl"
AC_CHECK_HEADER(sane/sane.h, AC_CHECK_HEADER(sane/sane.h,
[WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")])]) [WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")],,[$ac_sane_libs])])
CPPFLAGS="$ac_save_CPPFLAGS" CPPFLAGS="$ac_save_CPPFLAGS"
fi fi
WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment