From 15c00bc9970d0c350f3b6c19131b219db2b162f6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 31 Aug 2015 18:07:38 +0200
Subject: [PATCH] Move zconf.h to libretro-common/include/compat

---
 {deps/zlib => libretro-common/include/compat}/zconf.h | 10 ++++++++++
 libretro-common/include/compat/zlib.h                 |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 rename {deps/zlib => libretro-common/include/compat}/zconf.h (99%)

diff --git a/deps/zlib/zconf.h b/libretro-common/include/compat/zconf.h
similarity index 99%
rename from deps/zlib/zconf.h
rename to libretro-common/include/compat/zconf.h
index 9987a77553..8aaa8157e4 100644
--- a/deps/zlib/zconf.h
+++ b/libretro-common/include/compat/zconf.h
@@ -1,3 +1,7 @@
+#ifndef _COMPAT_ZLIB_H
+#define _COMPAT_ZLIB_H
+
+#ifdef WANT_ZLIB
 /* zconf.h -- configuration of the zlib compression library
  * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -509,3 +513,9 @@ typedef uLong FAR uLongf;
 #endif
 
 #endif /* ZCONF_H */
+
+#else
+#include <zconf.h>
+#endif
+
+#endif
diff --git a/libretro-common/include/compat/zlib.h b/libretro-common/include/compat/zlib.h
index bf3d53db40..d210c8af71 100644
--- a/libretro-common/include/compat/zlib.h
+++ b/libretro-common/include/compat/zlib.h
@@ -36,7 +36,7 @@
 #ifndef ZLIB_H
 #define ZLIB_H
 
-#include "zconf.h"
+#include <compat/zconf.h>
 
 #ifdef __cplusplus
 extern "C" {