Skip to content

Commit

Permalink
build: remove references to libbson
Browse files Browse the repository at this point in the history
libbson has been replaced with a dedicated JSON C API (cJSON), so
there's no longer a requirement to check for libbson any longer.

Fixes #408
  • Loading branch information
ThomasAdam committed Jul 8, 2021
1 parent 2f44787 commit 0be3910
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 23 deletions.
13 changes: 0 additions & 13 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -460,19 +460,6 @@ AC_CHECK_HEADER(X11/XKBlib.h, AC_DEFINE(HAVE_X11_XKBLIB_H))
AH_TEMPLATE([HAVE_TAILQ],[Check if tailq is present.])
AC_CHECK_HEADER(queue.h, AC_DEFINE(HAVE_TAILQ))

# libbson
AH_TEMPLATE([HAVE_LIBBSON],[Define if libbson is used.])
PKG_CHECK_MODULES([libbson], [libbson-1.0],
[
AC_DEFINE(HAVE_LIBBSON)
libbson_LIBS=-lbson-1.0
],
[
AC_MSG_ERROR([*** libbson not found. Install its header files. ***])
])
AC_SUBST(libbson_LIBS)
AC_SUBST(libbson_CFLAGS)

# libevent
AH_TEMPLATE([HAVE_LIBEVENT],[Define if libevent is used.])
PKG_CHECK_MODULES([libevent], [libevent >= 2.0],
Expand Down
3 changes: 1 addition & 2 deletions dev-docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ FVWM3 has the following dependencies.

## Core dependencies

* libbson-dev (>= 1.16.2)
* libevent-dev (>= 2.0)
* libx11-dev
* libxrandr-dev (>= 1.5)
Expand Down Expand Up @@ -50,7 +49,7 @@ Generating documentation
To generate `fvwm3`'s documentation:

1. Install `asciidoctor`
2. Pass `--enable-mandoc` to `./configure` (see below(
2. Pass `--enable-mandoc` to `./configure` (see below)

`fvwm3` won't compile documentation by default, so it's opt-in.

Expand Down
6 changes: 2 additions & 4 deletions fvwm/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@ LDADD = \
-L$(top_builddir)/libs -lfvwm3 $(Xft_LIBS) $(X_LIBS) $(xpm_LIBS) \
$(X_PRE_LIBS) -lXext -lX11 \
$(X_EXTRA_LIBS) -lm $(iconv_LIBS) $(Xrender_LIBS) $(Xcursor_LIBS) \
$(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) $(XRandR_LIBS) \
$(libbson_LIBS)
$(Bidi_LIBS) $(png_LIBS) $(rsvg_LIBS) $(intl_LIBS) $(XRandR_LIBS)

AM_CPPFLAGS = \
-I$(top_srcdir) $(Xft_CFLAGS) \
$(xpm_CFLAGS) $(X_CFLAGS) $(iconv_CFLAGS) $(Xrender_CFLAGS) \
$(Bidi_CFLAGS) $(png_CFLAGS) $(rsvg_CFLAGS) $(intl_CFLAGS) \
$(libbson_CFLAGS)
$(Bidi_CFLAGS) $(png_CFLAGS) $(rsvg_CFLAGS) $(intl_CFLAGS)

AM_CFLAGS = \
-DFVWM_MODULEDIR=\"$(FVWM_MODULEDIR)\" \
Expand Down
1 change: 0 additions & 1 deletion fvwm/builtins.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#ifndef FVWM_BUILTINS_H
#define FVWM_BUILTINS_H

#include <bson.h>
#include "fvwm.h"
#include "screen.h"

Expand Down
2 changes: 1 addition & 1 deletion libs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ libfvwm3_a_LIBADD = @LIBOBJS@

AM_CPPFLAGS = -I$(top_srcdir) $(xpm_CFLAGS) $(Xft_CFLAGS) $(X_CFLAGS) \
$(iconv_CFLAGS) $(Xrender_CFLAGS) $(Bidi_CFLAGS) $(png_CFLAGS) \
$(rsvg_CFLAGS) $(intl_CFLAGS) $(XRandR_CFLAGS) $(libbson_CFLAGS)
$(rsvg_CFLAGS) $(intl_CFLAGS) $(XRandR_CFLAGS)
4 changes: 2 additions & 2 deletions modules/FvwmMFL/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CLEANFILES = $(module_SCRIPTS)

LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 \
$(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS) $(XRandR_LIBS) \
$(libevent_LIBS) $(libbson_LIBS) $(Xft_LIBS)
$(libevent_LIBS) $(Xft_LIBS)

AM_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS) $(libbson_CFLAGS) $(Xft_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS) $(Xft_CFLAGS)

0 comments on commit 0be3910

Please sign in to comment.