diff --git a/configure.ac b/configure.ac index d70a429cd..d5c067420 100644 --- a/configure.ac +++ b/configure.ac @@ -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], diff --git a/dev-docs/INSTALL.md b/dev-docs/INSTALL.md index ea747a09a..457d456d2 100644 --- a/dev-docs/INSTALL.md +++ b/dev-docs/INSTALL.md @@ -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) @@ -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. diff --git a/fvwm/Makefile.am b/fvwm/Makefile.am index e2911995f..a4bb6a0b1 100644 --- a/fvwm/Makefile.am +++ b/fvwm/Makefile.am @@ -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)\" \ diff --git a/fvwm/builtins.h b/fvwm/builtins.h index fa1444330..489c63595 100644 --- a/fvwm/builtins.h +++ b/fvwm/builtins.h @@ -3,7 +3,6 @@ #ifndef FVWM_BUILTINS_H #define FVWM_BUILTINS_H -#include #include "fvwm.h" #include "screen.h" diff --git a/libs/Makefile.am b/libs/Makefile.am index 0cea15f24..6e0bb21a2 100644 --- a/libs/Makefile.am +++ b/libs/Makefile.am @@ -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) diff --git a/modules/FvwmMFL/Makefile.am b/modules/FvwmMFL/Makefile.am index 1e37bc41e..ba1884ddf 100644 --- a/modules/FvwmMFL/Makefile.am +++ b/modules/FvwmMFL/Makefile.am @@ -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)