ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Francois Gouget 2008-07-20 22:41:41 +02:00 committed by Alexandre Julliard
parent 32974e25a2
commit a9d7babd99
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -13031,6 +13031,7 @@ fi
if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then
ac_sane_incl="`$sane_devel --cflags`"
ac_sane_libs="`$sane_devel --ldflags`"
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ac_sane_incl"
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
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-lsane $LIBS"
LIBS="-lsane $ac_sane_libs $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF

3
configure.ac
View File

@ -920,10 +920,11 @@ AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
if test "$sane_devel" != "no" -a "x$with_sane" != "xno"
then
ac_sane_incl="`$sane_devel --cflags`"
ac_sane_libs="`$sane_devel --ldflags`"
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ac_sane_incl"
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"
fi
WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],