build-sys: use pkg-config to locate dependencies

This commit alters XRANDR (X Resize And Rotate) extension dependency,
which is expected to have at least version 1.4.  Earlier old versions of
xrandr were supported, at least to some extent.

5 files changed, 38 insertions, 12 deletions

diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc
index 5577f32..2bc7516 100644
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@@ -55,7 +55,7 @@ typedef int iconv_t;
 #endif // HAVE_ICONV
 
 #ifdef HAVE_FRIBIDI
-  #include <fribidi/fribidi.h>
+  #include <fribidi.h>
 #endif
 
 #ifdef DEBUG
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 3c34b22..983f923 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -3,7 +3,7 @@ noinst_LIBRARIES = libFbTk.a
 AM_CPPFLAGS=-include $(top_builddir)/config.h
 
 if XFT
-xft_SOURCE= XftFontImp.hh XftFontImp.cc
+xft_SOURCE = XftFontImp.hh XftFontImp.cc
 endif
 if MULTIBYTE
 xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
@@ -15,6 +15,8 @@ if IMLIB2
 imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
 endif
 
+libFbTk_a_CPPFLAGS = $(FREETYPE2_CFLAGS) $(FRIBIDI_CFLAGS) $(AM_CPPFLAGS)
+
 libFbTk_a_SOURCES = App.hh App.cc \
         Color.cc Color.hh Command.hh \
         ColorLUT.cc ColorLUT.hh \
diff --git a/src/Makefile.am b/src/Makefile.am
index 966546c..283e01d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,27 @@ if SLIT_SRC
 SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
 endif
 
+fluxbox_CPPFLAGS = \
+        $(XRANDR_CFLAGS) \
+        $(FRIBIDI_CFLAGS) \
+        $(AM_CPPFLAGS)
+
+fluxbox_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FREETYPE2_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(IMLIB2_LIBS) \
+        $(RANDR_LIBS) \
+        $(X11_LIBS) \
+        $(XEXT_LIBS) \
+        $(XFT_LIBS) \
+        $(XINERAMA_LIBS) \
+        $(XPM_LIBS) \
+        $(XRENDER_LIBS) \
+        $(X_EXTRA_LIBS) \
+        $(X_LIBS) \
+        $(X_PRE_LIBS)
+
 fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
         FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
         FbWinFrameTheme.hh FbWinFrameTheme.cc \
diff --git a/src/Screen.cc b/src/Screen.cc
index 05d274a..7cdf150 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -392,21 +392,18 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
 
 
 // setup RANDR for this screens root window
-#if defined(HAVE_RANDR1_2)
+#if defined(HAVE_RANDR)
     int randr_mask = RRScreenChangeNotifyMask;
-#ifdef RRCrtcChangeNotifyMask
+# ifdef RRCrtcChangeNotifyMask
     randr_mask |= RRCrtcChangeNotifyMask;
-#endif
-#ifdef RROutputChangeNotifyMask
+# endif
+# ifdef RROutputChangeNotifyMask
     randr_mask |= RROutputChangeNotifyMask;
-#endif
-#ifdef RROutputPropertyNotifyMask
+# endif
+# ifdef RROutputPropertyNotifyMask
     randr_mask |= RROutputPropertyNotifyMask;
-#endif
+# endif
     XRRSelectInput(disp, rootWindow().window(), randr_mask);
-
-#elif defined(HAVE_RANDR)
-    XRRScreenChangeSelectInput(disp, rootWindow().window(), True);
 #endif // HAVE_RANDR
 
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 62d7604..73f269f 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -11,12 +11,18 @@ noinst_PROGRAMS= \
          testRectangleUtil
 
 testTexture_SOURCES         = texturetest.cc
+testTexture_LDFLAGS         = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(IMLIB2_LIBS) $(XPM_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
 testFont_SOURCES            = testFont.cc
+testFont_LDFLAGS            = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
 testSignals_SOURCES         = testSignals.cc
+testSignals_LDFLAGS         = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS)
 testKeys_SOURCES            = testKeys.cc
+testKeys_LDFLAGS            = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
 testDemandAttention_SOURCES = testDemandAttention.cc
+testDemandAttention_LDFLAGS = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
 #testResource_SOURCES        = Resourcetest.cc
 testFullscreen_SOURCES      = fullscreentest.cc
+testFullscreen_LDFLAGS      = $(X_LIBS) $(X11_LIBS) $(FRIBIDI_LIBS) $(XRENDER_LIBS) $(XFT_LIBS) $(FONTCONFIG_LIBS)
 testStringUtil_SOURCES      = StringUtiltest.cc
 testRectangleUtil_SOURCES   = testRectangleUtil.cc