Francois Gouget : gphoto2.ds: Make use of `gphoto2-config --libs` for the configure check.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Mon Jul 21 17:10:45 2008 +0200

gphoto2.ds: Make use of `gphoto2-config --libs` for the configure check.

---

configure    |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 20b9b40..3096dc8 100755
--- a/configure
+++ b/configure
@@ -13488,7 +13488,7 @@ if test "${ac_cv_lib_gphoto2_gp_camera_new+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgphoto2 $GPHOTO2LIBS $LIBS"
+LIBS="-lgphoto2 $ac_gphoto2_libs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
diff --git a/configure.ac b/configure.ac
index 23cff81..5b12d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -951,7 +951,7 @@ then
                                   [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment])
                                    AC_SUBST(GPHOTO2LIBS,"$ac_gphoto2_libs")
                                    AC_SUBST(GPHOTO2INCL,"$ac_gphoto2_incl")],,
-                                  [$GPHOTO2LIBS])])
+                                  [$ac_gphoto2_libs])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
 WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],