From 68a80aca21ec95ee7c81506fd2f4d85813a73bcd Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 3 Dec 2002 19:59:34 +0000 Subject: [PATCH] link in xft only where appropriate --- configure.in | 2 ++ src/Makefile.am | 6 ++++-- util/Makefile.am | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 8d46a8d9..117a7445 100644 --- a/configure.in +++ b/configure.in @@ -143,6 +143,8 @@ fi dnl Check for Xft extension support and proper library files. XFT="" XFT2="" +XFT_CFLAGS="" +XFT_LIBS="" AC_MSG_CHECKING([whether to build support for the Xft extension]) AC_ARG_ENABLE( xft, [ --enable-xft enable support of the Xft extension @<:@default=yes@:>@]) diff --git a/src/Makefile.am b/src/Makefile.am index ee5774b2..7edd93e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ DEFAULT_MENU=$(pkgdatadir)/menu DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex -CPPFLAGS=@CPPFLAGS@ @DEBUG@ \ +CPPFLAGS=@CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@ \ -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ -DBUTTONSDIR=\"$(pkgdatadir)/buttons\" \ -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ @@ -30,7 +30,9 @@ CPPFLAGS=@CPPFLAGS@ @DEBUG@ \ bin_PROGRAMS= openbox -openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Color.cc Configmenu.cc Configuration.cc Font.cc GCCache.cc Iconmenu.cc Image.cc ImageControl.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Texture.cc Timer.cc Toolbar.cc Util.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc XAtom.cc blackbox.cc i18n.cc main.cc +openbox_SOURCES=BaseDisplay.cc Basemenu.cc Clientmenu.cc Color.cc Configmenu.cc Configuration.cc Font.cc GCCache.cc Iconmenu.cc Image.cc ImageControl.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Texture.cc Timer.cc Toolbar.cc Util.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc XAtom.cc blackbox.cc i18n.cc main.cc + +openbox_LDFLAGS=@XFT_LIBS@ EXTRA_DIST = BaseDisplay.hh Basemenu.hh Clientmenu.hh Color.hh Configmenu.hh Configuration.hh Font.hh GCCache.hh Iconmenu.hh Image.hh Netizen.hh Rootmenu.hh Screen.hh Slit.hh Texture.hh Timer.hh Toolbar.hh Util.hh Window.hh Windowmenu.hh Workspace.hh Workspacemenu.hh XAtom.hh blackbox.hh i18n.hh diff --git a/util/Makefile.am b/util/Makefile.am index 766731ae..611ff27b 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -8,8 +8,10 @@ bin_SCRIPTS = bsetbg if XFT if XFT2 else -TMP_PROGS = xftlsfonts +TMP_PROGS = xftlsfonts xftlsfonts_SOURCES = xftlsfonts.cc +xftlsfonts_CPPFLAGS= @CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@ +xftlsfonts_LDFLAGS = @XFT_LIBS@ endif endif -- 2.39.2