From bf8185390fc6f076f5ce9344c02e2e623e49f67d Mon Sep 17 00:00:00 2001
From: "Ignacio R. Morelle" <shadowm@wesnoth.org>
Date: Fri, 10 Apr 2015 18:27:06 -0300
Subject: [PATCH] cmake: Fix regression in FindFriBiDi, take 2

Applying commit fb0151072642ffe39508b6e4dd569504bd0f6228 doesn't fix
this for Ivanovic, so I'm reverting both that and the original commit
651344ee1be08eeeddccf04b9f7d19a6a0f3e2c2.
---
 cmake/FindFriBiDi.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/FindFriBiDi.cmake b/cmake/FindFriBiDi.cmake
index c802071cc424..f980dad45528 100644
--- a/cmake/FindFriBiDi.cmake
+++ b/cmake/FindFriBiDi.cmake
@@ -19,13 +19,15 @@ SET(FRIBIDI_FOUND "NO")
 # Set variable in temp var, otherwise FIND_PATH might fail
 # unset isn't present in the required version of cmake.
 FIND_PATH(xFRIBIDI_INCLUDE_DIR fribidi.h
-  PATH_SUFFIXES fribidi
+  /usr/local/include/fribidi
+  /usr/include/fribidi
   )
 set(FRIBIDI_INCLUDE_DIR ${xFRIBIDI_INCLUDE_DIR})
 
 SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
 FIND_LIBRARY(FRIBIDI_LIBRARY
   NAMES ${FRIBIDI_NAMES}
+  PATHS /usr/lib /usr/local/lib
   )
 
 IF (FRIBIDI_LIBRARY AND FRIBIDI_INCLUDE_DIR)