Added explicit configuration header macro.

README.md

@@ -33,6 +33,8 @@ guide in the GLFW documentation.
 
  - Added the `GLFW_BUILD_DOCS` CMake option for controlling whether the
    documentation is built
+ - Added the `_GLFW_USE_CONFIG_H` configuration macro for controlling whether to
+   include the configuration header
  - Renamed configuration header to `glfw_config.h` to avoid conflicts
  - Bugfix: The `glfw3.pc` file did not respect the `LIB_SUFFIX` CMake option
  - Bugfix: The `joysticks` test would segfault if a controller had no axes

src/CMakeLists.txt

@@ -3,6 +3,8 @@ include_directories(${GLFW_SOURCE_DIR}/src
                     ${GLFW_BINARY_DIR}/src
                     ${glfw_INCLUDE_DIRS})
 
+add_definitions(-D_GLFW_USE_CONFIG_H)
+
 set(common_HEADERS ${GLFW_BINARY_DIR}/src/glfw_config.h internal.h
                    ${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h
                    ${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h)

src/internal.h

@@ -29,7 +29,9 @@
 #define _internal_h_
 
 
-#include "glfw_config.h"
+#if defined(_GLFW_USE_CONFIG_H)
+ #include "glfw_config.h"
+#endif
 
 #if defined(_GLFW_USE_OPENGL)
  // This is the default for glfw3.h