diff options
| author | Sergio Durigan Junior <sergiosdj@gmail.com> | 2009-11-23 21:45:26 (GMT) |
|---|---|---|
| committer | Sergio Durigan Junior <sergiosdj@gmail.com> | 2009-11-23 21:45:26 (GMT) |
| commit | c0aabaec8d9de414119fd1a43e754feb5a880103 (patch) | |
| tree | 6c068f5d2a03b83fdf8526cae92743cbfeabeee6 | |
| parent | bffa4323df9c327f4d242778b627c17b0275a8cb (diff) | |
Adding verification of libcolorblind.
This commit adds the verification support of libcolorblind on
configure.in and Makefile.am. When the lib is present,
HAVE_LIBCOLORBLIND is defined.
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | src/gcompris/Makefile.am | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 0f2c860..4233af1 100644 --- a/configure.in +++ b/configure.in @@ -229,6 +229,13 @@ else CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror" fi +dnl Checking for the presence of the colorblind library. +AC_CHECK_LIB(colorblind, colorblind_create, COLORBLIND_LIBS=-lcolorblind, have_colorblind=no) +if test "x$COLORBLIND_LIBS" != "x" ; then + AC_CHECK_HEADERS([colorblind.h], have_colorblind=yes, have_colorblind=no) +dnl AC_DEFINE(HAVE_LIBCOLORBLIND, 1, [The colorblind library is present.]) +fi + dnl WIN32 Specifics AC_MSG_CHECKING([for Win32 platform in general]) case "$host" in @@ -824,6 +831,7 @@ echo "DBUS Support (OLPC XO Sugar) = $with_dbus" echo "GNET Networking (--enable-gnet) = $with_gnet (networking depends on this)" echo "BINRELOC (--enable-binreloc) = $br_cv_binreloc" echo "NSBundle (--enable-nsbundle) = $nsbundle" +echo "Colorblind support = $have_colorblind" echo diff --git a/src/gcompris/Makefile.am b/src/gcompris/Makefile.am index b99903c..81cc1e5 100644 --- a/src/gcompris/Makefile.am +++ b/src/gcompris/Makefile.am @@ -119,7 +119,7 @@ gcompris_LDADD = \ $(top_builddir)/src/goocanvas/src/libgoocanvas.la \ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \ $(DBUS_LIBS) \ - $(INTLLIBS) $(NSBUNDLE_LDFLAGS) + $(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(COLORBLIND_LIBS) marshal_sources = \ gc-marshal.c \ |