diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-13 15:04:32 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-10-13 15:04:32 +0200 |
| commit | 763a8f9648ce77a75b1a2db9f4e15151abc390f6 (patch) | |
| tree | ab7c86ff2ec7e03018890c1410b5c48c616aaabb | |
| parent | 761e24b17d333141ae508662f2e952c765a9ee55 (diff) | |
macOS: restore "configure --enable-x11 --enable-usecairo"
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cd6745c39..06940ae8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1208,21 +1208,38 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [ AS_IF([test x$PKGCONFIG != x], [ dnl pkg-config is available, use it... dnl AC_MSG_NOTICE([--enable-pango: using pkg-config ...]) - CXXFLAGS="$($PKGCONFIG --cflags pangoxft pangocairo) $CXXFLAGS" - LIBS="$($PKGCONFIG --libs pangoxft pangocairo) $LIBS" + CXXFLAGS="$($PKGCONFIG --cflags pangocairo) $CXXFLAGS" + AS_CASE([$host_os], [darwin*], [], [*], [ + CXXFLAGS="$($PKGCONFIG --cflags pangoxft) $CXXFLAGS" + ]) + LIBS="$($PKGCONFIG --libs pangocairo) $LIBS" + AS_CASE([$host_os], [darwin*], [ + LIBS="/opt/homebrew/lib/libcairo.dylib $LIBS" + ], [*], [ + LIBS="$($PKGCONFIG --libs pangoxft) $LIBS" + ]) ], [ dnl pkg-config is not available, issue warning and continue... AC_MSG_WARN([--enable-pango: please install pkg-config. Continuing anyway.]) ]) CPPFLAGS="$CXXFLAGS" - AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h], [ + AS_CASE([$host_os], [darwin*], + [AC_CHECK_HEADERS([pango/pango.h], [ + AC_CHECK_LIB([pango-1.0], [pango_layout_new], [ + AC_DEFINE([USE_PANGO]) + pango_found=yes + ]) + ]) + ],[*], [ + AC_CHECK_HEADERS([pango/pango.h pango/pangoxft.h], [ AC_CHECK_LIB([pango-1.0], [pango_layout_new], [ AC_CHECK_LIB([pangoxft-1.0], [pango_xft_render_layout], [ AC_DEFINE([USE_PANGO]) pango_found=yes ]) ]) + ]) ]) dnl Early abort if --enable-pango was requested but Pango could not be found |