From 363a0bf02cf20592b2f9f034de1c5f54c8922b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Thu, 29 Sep 2016 20:11:35 +0200
Subject: Look for uuid/uuid.h instead of just uuid.h

Avoids a conflict between /usr/include/uuid.h and
/usr/local/include/uuid/uuid.h on freebsd
---
 louloulibs/cmake/Modules/FindLIBUUID.cmake | 2 +-
 louloulibs/xmpp/xmpp_component.cpp         | 2 +-
 src/database/database.cpp                  | 2 +-
 src/xmpp/biboumi_component.cpp             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/louloulibs/cmake/Modules/FindLIBUUID.cmake b/louloulibs/cmake/Modules/FindLIBUUID.cmake
index 17d3c42..f344249 100644
--- a/louloulibs/cmake/Modules/FindLIBUUID.cmake
+++ b/louloulibs/cmake/Modules/FindLIBUUID.cmake
@@ -19,7 +19,7 @@ include(FindPkgConfig)
 pkg_check_modules(LIBUUID uuid)
 
 if(NOT LIBUUID_FOUND)
-  find_path(LIBUUID_INCLUDE_DIRS NAMES uuid.h
+  find_path(LIBUUID_INCLUDE_DIRS NAMES uuid/uuid.h
     PATH_SUFFIXES uuid
     DOC "The libuuid include directory")
 
diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index f437a15..b10479a 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -14,7 +14,7 @@
 #include <set>
 
 #include <stdio.h>
-#include <uuid.h>
+#include <uuid/uuid.h>
 
 #include <cstdlib>
 #include <set>
diff --git a/src/database/database.cpp b/src/database/database.cpp
index e995d95..f7d309b 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -4,7 +4,7 @@
 #include <database/database.hpp>
 #include <logger/logger.hpp>
 #include <irc/iid.hpp>
-#include <uuid.h>
+#include <uuid/uuid.h>
 #include <utils/get_first_non_empty.hpp>
 #include <utils/time.hpp>
 
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 4a741f3..c810ce3 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -20,7 +20,7 @@
 #include <louloulibs.h>
 #include <biboumi.h>
 
-#include <uuid.h>
+#include <uuid/uuid.h>
 
 #ifdef SYSTEMD_FOUND
 # include <systemd/sd-daemon.h>
-- 
cgit v1.2.3