Francois Gouget : sane.ds: Use 'sane-config --ldflags'.
Alexandre Julliard
julliard at winehq.org
Mon Jul 21 08:51:42 CDT 2008
Module: wine
Branch: master
Commit: a9d7babd991d2d145f68a8c41ab900213b382ee4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d7babd991d2d145f68a8c41ab900213b382ee4
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Sun Jul 20 22:41:41 2008 +0200
sane.ds: Use 'sane-config --ldflags'.
---
configure | 3 ++-
configure.ac | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 5baf8dc..20b9b40 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.ac b/configure.ac
index a32bb73..23cff81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"],
More information about the wine-cvs
mailing list