Rename config.h to nlopt_config.h

diff --git a/.gitignore b/.gitignore
index 86d4bae226d58444ea55d5d8a207fb7048300ee0..af661cb3a8e70fd5331843b52d539ebfb26013a5 100644 (file)
--- 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 75d6029c93b7961323281e4ac50dc34c44bca792..e6b63c7b8058d274dbe0afefdb51277125eaf6ae 100644 (file)
--- 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}")\r
 \r
 #==============================================================================\r
-# CREATE config.h\r
+# CREATE nlopt_config.h\r
 #==============================================================================\r
 \r
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h IMMEDIATE)\r
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/nlopt_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/nlopt_config.h IMMEDIATE)\r
 \r
 # pkgconfig file\r
 if (UNIX OR MINGW)\r

diff --git a/cmake/FindOctave.cmake b/cmake/FindOctave.cmake
index 2363f1c709204e61fdce0107074dbb99e7b9f3d4..31d4337a6cb7a96f0d04156c6dba2efc8f6b1f12 100644 (file)
--- 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 7e498fe27abdca25a54a374ce35407f9eadc17f1..ec6908a73cedb7628246be8cc7aced0a7fd1390d 100644 (file)
--- 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 cfef0e0382d9fa69f5557bbb9ad8db63581ccff6..c3c145fcd9888a5ac4b4a07d686a14d07e4879fc 100644 (file)
--- 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 5df932eb0a911b5c47f63b921cf594b6f0c5f58d..89740c4a0ab592bc964b8b70af602733d0ed43e9 100644 (file)
--- 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 6f1b35b2f4fed2d546c6420f6944e7ac30a69627..beed5b21f48d0d08d0a7cb9625df88f2f793dfe2 100644 (file)
--- 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