diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-02-28 14:56:19 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-03-01 10:45:59 +0100 |
| commit | 49a78bc482bc112248a05f0b1ea78bcf80403efa (patch) | |
| tree | f57c0c1a98e240a64cb2a05fdea19d6781a5ab87 /configure.ac | |
| parent | 266b5e7cddaaca312b77abd5696e0281af3251c9 (diff) | |
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)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 2 insertions, 4 deletions
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" |