Alexandre Julliard : configure: Remove no longer needed check for libsane.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: edae7a0a5ca4a2420163a5c9c7ad41544d59269d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=edae7a0a5ca4a2420163a5c9c7...

Author: Alexandre Julliard 
Date:   Thu Mar 15 13:51:16 2007 +0100

configure: Remove no longer needed check for libsane.

---

configure    |   80 +--------------------------------------------------------
 configure.ac |   13 +--------
 2 files changed, 4 insertions(+), 89 deletions(-)

diff --git a/configure b/configure
index 81ea302..e95dec5 100755
--- a/configure
+++ b/configure
@@ -717,7 +717,6 @@ XSLTLIBS
 XSLTINCL
 HALINCL
 sane_devel
-SANELIBS
 SANEINCL
 gphoto2_devel
 gphoto2port_devel
@@ -9837,18 +9836,13 @@ echo "${ECHO_T}no" >&6; }
 fi

-SANELIBS=""
-
 SANEINCL=""

if test "$sane_devel" != "no"
 then
-    SANELIBS="`$sane_devel --libs`"
     SANEINCL="`$sane_devel --cflags`"
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $SANEINCL"
-    LIBS="$LIBS $SANELIBS"
     if test "${ac_cv_header_sane_sane_h+set}" = set; then
   { echo "$as_me:$LINENO: checking for sane/sane.h" >&5
 echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6; }
@@ -9980,85 +9974,16 @@ echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6; }

fi
 if test $ac_cv_header_sane_sane_h = yes; then
-  { echo "$as_me:$LINENO: checking for sane_open in -lsane" >&5
-echo $ECHO_N "checking for sane_open in -lsane... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sane_sane_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsane  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sane_open ();
-int
-main ()
-{
-return sane_open ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *"* | *`* | *\*) ac_try_echo=$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo "$as_me:$LINENO: $ac_try_echo"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: $? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_sane_sane_open=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sane_sane_open=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sane_sane_open" >&5
-echo "${ECHO_T}$ac_cv_lib_sane_sane_open" >&6; }
-if test $ac_cv_lib_sane_sane_open = yes; then

cat >>confdefs.h <<_ACEOF
 #define HAVE_SANE 1
 _ACEOF

else
-  SANELIBS=""
-                                  SANEINCL=""
-fi
-
-else
-  SANELIBS=""
-                    SANEINCL=""
+  SANEINCL=""
 fi

-    LIBS="$ac_save_LIBS"
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi

@@ -22073,7 +21998,6 @@ XSLTLIBS!$XSLTLIBS$ac_delim
 XSLTINCL!$XSLTINCL$ac_delim
 HALINCL!$HALINCL$ac_delim
 sane_devel!$sane_devel$ac_delim
-SANELIBS!$SANELIBS$ac_delim
 SANEINCL!$SANEINCL$ac_delim
 gphoto2_devel!$gphoto2_devel$ac_delim
 gphoto2port_devel!$gphoto2port_devel$ac_delim
@@ -22130,7 +22054,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF

-  if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 75; then
+  if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 74; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index ec4616d..95b3b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -541,24 +541,15 @@ LIBS="$ac_save_LIBS"

dnl **** Check for SANE ****
 AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
-AC_SUBST(SANELIBS,"")
 AC_SUBST(SANEINCL,"")
 if test "$sane_devel" != "no"
 then
-    SANELIBS="`$sane_devel --libs`"
     SANEINCL="`$sane_devel --cflags`"
     ac_save_CPPFLAGS="$CPPFLAGS"
-    ac_save_LIBS="$LIBS"
     CPPFLAGS="$CPPFLAGS $SANEINCL"
-    LIBS="$LIBS $SANELIBS"
     AC_CHECK_HEADER(sane/sane.h,
-                    [AC_CHECK_LIB(sane,sane_open,
-                                  [AC_DEFINE(HAVE_SANE, 1, [Define if we have SANE development environment])],
-                                  [SANELIBS=""
-                                  SANEINCL=""])],
-                    [SANELIBS=""
-                    SANEINCL=""])
-    LIBS="$ac_save_LIBS"
+                    [AC_DEFINE(HAVE_SANE, 1, [Define if we have SANE development environment])],
+                    [SANEINCL=""])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi