Skip to content

Commit

Permalink
build: fix Xft/Freetype/Fontconfig check
Browse files Browse the repository at this point in the history
Now that XFT2 has been made mandatory, ensure we bail out of any
./configure checks if this is not found, rather than trying to compile
without xft.

Additionally, update the INSTALL.md instructions with those mandatory
packages.

Fixes #667
  • Loading branch information
ThomasAdam committed Mar 8, 2024
1 parent 403bae7 commit 4475bcc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,11 @@ AH_TEMPLATE([HAVE_XFT_UTF8],[Define if Xft library can handle utf8 encoding])
AC_SUBST(Xft_LIBS)
AC_SUBST(Xft_CFLAGS)

if test x"$with_xft" = "no" || test x"$with_fontconfig" = "xno" || \
test x"$have_freetype" = "xno"; then
AC_MSG_ERROR(["*** XFT/Fontconfig/Freetype not found. ***])
fi

# ********* xpm
problem_xpm=": Xpm library or header not found"

Expand Down
10 changes: 5 additions & 5 deletions dev-docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ system in use.
## Core dependencies

* libevent-dev (>= 2.0)
* libfontconfig-dev
* libfreetype6-dev
* libx11-dev
* libxext-dev
* libxft-dev
* libxrandr-dev (>= 1.5)
* libxrender-dev
* libxt-dev
* libxft-dev

## Optional dependencies

* asciidoctor
* libfontconfig-dev
* libfreetype6-dev
* libfribidi-dev
* libncurses5-dev
* libpng-dev
* libreadline-dev
* librsvg-dev
* libsm-dev
* libxcursor-dev
* libxext-dev
* libxi-dev
* libxpm-dev
* sharutils
Expand Down Expand Up @@ -77,4 +77,4 @@ Release tarballs will come bundled with `./configure` already, hence:
```

As with most things, if the default options `./configure` chooses isn't
appropriate for your needs, see `./configure --help` for appropriate options.
appropriate for your needs, see `./configure --help` for appropriate options.

0 comments on commit 4475bcc

Please sign in to comment.