diff --git a/configure b/configure index 874ebae..8a9ec9b 100755 --- a/configure +++ b/configure @@ -1,10 +1,10 @@ #!/bin/sh -LIBS="x11 xft freetype2" +LIBS="x11" USE_XINERAMA="xinerama" USE_XRANDR="xrandr" USE_IMLIB2="imlib2" -USE_XFT="xft" +USE_XFT="xft freetype2" OS=`uname -s` PREFIX=/usr/local MANPREFIX="$PREFIX/man" @@ -72,12 +72,12 @@ else exit 1;; esac - LDFLAGS="$LDFLAGS -lX11 -lfreetype" + LDFLAGS="$LDFLAGS -lX11" [ -n "$USE_XINERAMA" ] && LDFLAGS="$LDFLAGS -lXinerama" [ -n "$USE_XRANDR" ] && LDFLAGS="$LDFLAGS -lXrandr" [ -n "$USE_IMLIB2" ] && LDFLAGS="$LDFLAGS -lImlib2" - [ -n "$USE_XFT" ] && LDFLAGS="$LDFLAGS -lXft" + [ -n "$USE_XFT" ] && LDFLAGS="$LDFLAGS -lXft -lfreetype" fi [ -n "$USE_XINERAMA" ] && CFLAGS="$CFLAGS -DHAVE_XINERAMA" diff --git a/src/infobar.c b/src/infobar.c index 1a9aa7b..9e24267 100644 --- a/src/infobar.c +++ b/src/infobar.c @@ -350,7 +350,9 @@ infobar_destroy(void) barwin_delete_subwin(infobar[sc].tags_board); barwin_delete(infobar[sc].tags_board); - barwin_delete(infobar[sc].selbar); + if(conf.bars.selbar) + barwin_delete(infobar[sc].selbar); + barwin_delete_subwin(infobar[sc].bar); barwin_delete(infobar[sc].bar); }