Rename SettingsConfusePath.h to config.h so it can be used by other configurable options

telldus-core/service/CMakeLists.txt

@@ -158,9 +158,6 @@ ELSE (APPLE) #### Linux ####
 		main_unix.cpp
 		SettingsConfuse.cpp
 	)
-	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SettingsConfusePaths.h.in
-		${CMAKE_CURRENT_BINARY_DIR}/service/SettingsConfusePaths.h)
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 	LIST(APPEND telldus-service_LIBRARIES
 		${CONFUSE_LIBRARY}
@@ -188,6 +185,10 @@ ENDIF (FTDI_ENGINE STREQUAL "ftd2xx")
 
 SOURCE_GROUP("Protocol Files" FILES ${telldus-service_protocol_SRCS})
 
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+	${CMAKE_CURRENT_BINARY_DIR}/service/config.h)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
 SET(telldus-service_TARGET ${telldus-service_TARGET} PARENT_SCOPE)
 ADD_EXECUTABLE(${telldus-service_TARGET}
 	${telldus-service_SRCS}

telldus-core/service/SettingsConfuse.cpp

@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <string>
 #include "service/Settings.h"
-#include "service/SettingsConfusePaths.h"
+#include "service/config.h"
 #include "client/telldus-core.h"
 #include "common/Strings.h"
 

telldus-core/service/config.h.in

@@ -1,7 +1,7 @@
-#ifndef SETTINGSCONFUSEPATHS_H
-#define SETTINGSCONFUSEPATHS_H
+#ifndef CONFIG_H
+#define CONFIG_H
 
 #define CONFIG_PATH "@SYSCONF_INSTALL_DIR@"
 #define VAR_CONFIG_PATH "@STATE_INSTALL_DIR@"
 
-#endif
+#endif  // CONFIG_H