From 65b716ab9526650b07f926e56f82a358d9406694 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Thu, 27 Oct 2016 11:10:02 +0200
Subject: [PATCH] Rename config.h to nlopt_config.h

---
 .gitignore                             | 2 +-
 CMakeLists.txt                         | 4 ++--
 cmake/FindOctave.cmake                 | 2 +-
 config.cmake.h.in => nlopt_config.h.in | 0
 test/testfuncs.c                       | 2 +-
 test/testopt.cpp                       | 2 +-
 util/nlopt-util.h                      | 2 +-
 util/redblack_test.c                   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename config.cmake.h.in => nlopt_config.h.in (100%)

diff --git a/.gitignore b/.gitignore
index 86d4bae..af661cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@
 *.zip
 
 # generated code
-config.h
+nlopt_config.h
 nlopt.pc
 api/nlopt.f
 api/nlopt.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75d6029..e6b63c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,10 +142,10 @@ set (NLOPT_VERSION_STRING ${NLOPT_MAJOR_VERSION}.${NLOPT_MINOR_VERSION}.${NLOPT_
 message (STATUS "NLopt version ${NLOPT_VERSION_STRING}")
 
 #==============================================================================
-# CREATE config.h
+# CREATE nlopt_config.h
 #==============================================================================
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h IMMEDIATE)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/nlopt_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/nlopt_config.h IMMEDIATE)
 
 # pkgconfig file
 if (UNIX OR MINGW)
diff --git a/cmake/FindOctave.cmake b/cmake/FindOctave.cmake
index 2363f1c..31d4337 100644
--- a/cmake/FindOctave.cmake
+++ b/cmake/FindOctave.cmake
@@ -146,7 +146,7 @@ find_path (OCTAVE_INCLUDE_DIR
             PATHS "${OCTAVE_INCLUDE_PATHS}/.."
         )
 
-set (OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR})
+set (OCTAVE_INCLUDE_DIRS ${OCTAVE_INCLUDE_DIR} ${OCTAVE_INCLUDE_DIR}/octave)
 
 
 macro (octave_add_oct FUNCTIONNAME)
diff --git a/config.cmake.h.in b/nlopt_config.h.in
similarity index 100%
rename from config.cmake.h.in
rename to nlopt_config.h.in
diff --git a/test/testfuncs.c b/test/testfuncs.c
index 7e498fe..ec6908a 100644
--- a/test/testfuncs.c
+++ b/test/testfuncs.c
@@ -2,7 +2,7 @@
 #include <math.h>
 
 #include "testfuncs.h"
-#include "config.h"
+#include "nlopt_config.h"
 
 #define UNUSED(x) (void) x
 
diff --git a/test/testopt.cpp b/test/testopt.cpp
index cfef0e0..c3c145f 100644
--- a/test/testopt.cpp
+++ b/test/testopt.cpp
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "config.h"
+#include "nlopt_config.h"
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/util/nlopt-util.h b/util/nlopt-util.h
index 5df932e..89740c4 100644
--- a/util/nlopt-util.h
+++ b/util/nlopt-util.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <math.h>
-#include "config.h"
+#include "nlopt_config.h"
 
 #include "nlopt.h"
 
diff --git a/util/redblack_test.c b/util/redblack_test.c
index 6f1b35b..beed5b2 100644
--- a/util/redblack_test.c
+++ b/util/redblack_test.c
@@ -26,7 +26,7 @@
 #include <time.h>
 #include "redblack.h"
 
-#include "config.h"
+#include "nlopt_config.h"
 /* workaround for Solaris + gcc 3.4.x bug (see configure.ac) */
 #if defined(__GNUC__) && defined(REPLACEMENT_HUGE_VAL)
 #  undef HUGE_VAL
-- 
2.30.2