Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
9ddd30d1
Commit
9ddd30d1
authored
11 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
configure: Add a pkg-config check for liblcms.
parent
2a897ef2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
configure
+46
-9
46 additions, 9 deletions
configure
configure.ac
+14
-9
14 additions, 9 deletions
configure.ac
dlls/mscms/Makefile.in
+2
-1
2 additions, 1 deletion
dlls/mscms/Makefile.in
with
62 additions
and
19 deletions
configure
+
46
−
9
View file @
9ddd30d1
...
...
@@ -652,7 +652,8 @@ LIBGETTEXTPO
ZLIB
FREETYPE_LIBS
FREETYPE_CFLAGS
LCMSLIBS
LCMS_LIBS
LCMS_CFLAGS
RESOLVLIBS
GPHOTO2_PORT_LIBS
GPHOTO2_PORT_CFLAGS
...
...
@@ -878,6 +879,8 @@ GPHOTO2_CFLAGS
GPHOTO2_LIBS
GPHOTO2_PORT_CFLAGS
GPHOTO2_PORT_LIBS
LCMS_CFLAGS
LCMS_LIBS
FREETYPE_CFLAGS
FREETYPE_LIBS
GSTREAMER_CFLAGS
...
...
@@ -1590,6 +1593,8 @@ Some influential environment variables:
C compiler flags for libgphoto2_port, overriding pkg-config
GPHOTO2_PORT_LIBS
Linker flags for libgphoto2_port, overriding pkg-config
LCMS_CFLAGS C compiler flags for lcms, overriding pkg-config
LCMS_LIBS Linker flags for lcms, overriding pkg-config
FREETYPE_CFLAGS
C compiler flags for freetype2, overriding pkg-config
FREETYPE_LIBS
...
...
@@ -2603,7 +2608,7 @@ fi
# Check whether --with-cms was given.
if test "${with_cms+set}" = set; then :
withval=$with_cms;
if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi
withval=$with_cms;
fi
...
...
@@ -5851,8 +5856,6 @@ for ac_header in \
jpeglib.h \
kstat.h \
lber.h \
lcms.h \
lcms/lcms.h \
ldap.h \
link.h \
linux/cdrom.h \
...
...
@@ -10843,11 +10846,39 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS="$ac_save_LIBS"
fi
LCMSLIBS=""
if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
if test "x$with_lcms" != "xno"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5
ac_save_CPPFLAGS="$CPPFLAGS"
if test -n "$LCMS_CFLAGS"; then :
elif test -n "$PKG_CONFIG"; then :
LCMS_CFLAGS=`$PKG_CONFIG --cflags lcms 2>/dev/null`
fi
CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS"
if test -n "$LCMS_LIBS"; then :
elif test -n "$PKG_CONFIG"; then :
LCMS_LIBS=`$PKG_CONFIG --libs lcms 2>/dev/null`
fi
LCMS_LIBS=${LCMS_LIBS:-"-llcms"}
for ac_header in lcms.h lcms/lcms.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5
$as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; }
if ${ac_cv_lib_lcms_cmsOpenProfileFromFile+:} false; then :
$as_echo_n "(cached) " >&6
...
...
@@ -10887,9 +10918,15 @@ if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = xyes; then :
$as_echo "#define HAVE_LCMS 1" >>confdefs.h
LCMSLIBS="-llcms"
else
LCMS_LIBS=""
fi
else
LCMS_CFLAGS=""
LCMS_LIBS=""
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then :
case "x$with_cms" in
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
14
−
9
View file @
9ddd30d1
...
...
@@ -35,8 +35,7 @@ AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa soun
[if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]),
[if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi])
AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]),
[if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi])
AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]))
AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]),
[if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi])
AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS]))
...
...
@@ -434,8 +433,6 @@ AC_CHECK_HEADERS(\
jpeglib.h \
kstat.h \
lber.h \
lcms.h \
lcms/lcms.h \
ldap.h \
link.h \
linux/cdrom.h \
...
...
@@ -1445,12 +1442,20 @@ then
fi
dnl **** Check for LittleCMS ***
AC_SUBST(LCMSLIBS,"")
if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
if test "x$with_lcms" != "xno"
then
AC_CHECK_LIB(lcms, cmsOpenProfileFromFile,
[AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment])
LCMSLIBS="-llcms"])
ac_save_CPPFLAGS="$CPPFLAGS"
WINE_PACKAGE_FLAGS(LCMS,[lcms],[-llcms])
AC_CHECK_HEADERS([lcms.h lcms/lcms.h])
if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
then
AC_CHECK_LIB(lcms, cmsOpenProfileFromFile,
[AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment])],[LCMS_LIBS=""])
else
LCMS_CFLAGS=""
LCMS_LIBS=""
fi
CPPFLAGS="$ac_save_CPPFLAGS"
fi
WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],
[liblcms ${notice_platform}development files not found, Color Management won't be supported.])
...
...
This diff is collapsed.
Click to expand it.
dlls/mscms/Makefile.in
+
2
−
1
View file @
9ddd30d1
MODULE
=
mscms.dll
IMPORTLIB
=
mscms
IMPORTS
=
shlwapi advapi32
EXTRALIBS
=
@LCMSLIBS@
EXTRAINCL
=
@LCMS_CFLAGS@
EXTRALIBS
=
@LCMS_LIBS@
C_SRCS
=
\
handle.c
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment