From 49a78bc482bc112248a05f0b1ea78bcf80403efa Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 28 Feb 2021 14:56:19 +0100 Subject: Fix cairo build (autoconf + CMake) + README's - rewrite to use pkg-config with both autoconf + CMake - remove hardcoded library names - fix build dependencies and search directories - remove or replace old and unused variables - update README files To be done: - implement fallback for autoconf/configure if pkg-config is missing - fix pango build (uses cairo internally) --- configure.ac | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index af4e6bd66..265598bb4 100644 --- a/configure.ac +++ b/configure.ac @@ -211,8 +211,7 @@ AS_IF([test x$enable_cairoext = xyes], [ AC_DEFINE([FLTK_HAVE_CAIRO]) CAIRODIR="cairo" CAIROFLAGS="$($PKGCONFIG --cflags cairo)" - # TODO: Use pkg-config to get cairo libraries - CAIROLIBS="-lcairo -lpixman-1" + CAIROLIBS="$($PKGCONFIG --libs cairo)" CXXFLAGS="$CAIROFLAGS $CXXFLAGS" LINKFLTKCAIRO="../lib/libfltk_cairo.a" FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" @@ -226,8 +225,7 @@ AS_IF([test x$enable_cairoext = xyes], [ AC_DEFINE(FLTK_HAVE_CAIRO) CAIRODIR="cairo" CAIROFLAGS="$($PKGCONFIG --cflags cairo)" - # TODO: Use pkg-config to get cairo libraries - CAIROLIBS="-lcairo -lpixman-1" + CAIROLIBS="$($PKGCONFIG --libs cairo)" CXXFLAGS="$CAIROFLAGS $CXXFLAGS" LINKFLTKCAIRO="../lib/libfltk_cairo.a" FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" -- cgit v1.2.3