Ken Thomases : configure: Use the discovered LCMS2_LIBS when testing linking against lcms2.

Alexandre Julliard julliard at winehq.org
Thu May 1 14:39:59 CDT 2014


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

Author: Ken Thomases <ken at codeweavers.com>
Date:   Wed Apr 30 17:48:09 2014 -0500

configure: Use the discovered LCMS2_LIBS when testing linking against lcms2.

---

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

diff --git a/configure b/configure
index 1bca827..0db221c 100755
--- a/configure
+++ b/configure
@@ -11755,7 +11755,7 @@ if ${ac_cv_lib_lcms2_cmsOpenProfileFromFile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-llcms2  $LIBS"
+LIBS="-llcms2 $LCMS2_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/configure.ac b/configure.ac
index 46602d6..673323a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1442,7 +1442,7 @@ then
         if test "$ac_cv_header_lcms2_h" = "yes"
         then
             AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile,
-                [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""])
+                [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""],[$LCMS2_LIBS])
         else
             LCMS2_CFLAGS=""
             LCMS2_LIBS=""




More information about the wine-cvs mailing list