Merge commit 'upstream/1.4.8'

Conflicts:
	debian/changelog
	debian/control
	debian/libconfig++9-dev.install
	debian/libconfig8.install
	debian/libconfig9-dev.install
	debian/rules

3 files changed, 82 insertions, 0 deletions

diff --git a/contrib/cmake/cmake_work/FindConfig++.cmake b/contrib/cmake/cmake_work/FindConfig++.cmake
new file mode 100644
index 0000000..f6d11a3
--- /dev/null
+++ b/contrib/cmake/cmake_work/FindConfig++.cmake
@@ -0,0 +1,23 @@
+FIND_PATH(CONFIG++_INCLUDE_DIR libconfig.h++ /usr/include /usr/local/include)
+
+FIND_LIBRARY(CONFIG++_LIBRARY NAMES config++ PATH /usr/lib /usr/local/lib) 
+
+IF (CONFIG++_INCLUDE_DIR AND CONFIG++_LIBRARY)
+    SET(CONFIG++_FOUND TRUE)
+ENDIF ( CONFIG++_INCLUDE_DIR AND CONFIG++_LIBRARY)
+
+IF (CONFIG++_FOUND)
+    IF (NOT CONFIG++_FIND_QUIETLY)
+	MESSAGE(STATUS "Found Config++: ${CONFIG++_LIBRARY}")
+    ENDIF (NOT  CONFIG++_FIND_QUIETLY)
+ELSE(CONFIG++_FOUND)
+    IF (Config++_FIND_REQUIRED)
+	IF(NOT CONFIG++_INCLUDE_DIR)
+	    MESSAGE(FATAL_ERROR "Could not find LibConfig++ header file!")
+	ENDIF(NOT CONFIG++_INCLUDE_DIR)
+
+	IF(NOT CONFIG++_LIBRARY)
+	    MESSAGE(FATAL_ERROR "Could not find LibConfig++ library file!")
+	ENDIF(NOT CONFIG++_LIBRARY)
+    ENDIF (Config++_FIND_REQUIRED)
+ENDIF (CONFIG++_FOUND)
\ No newline at end of file
diff --git a/contrib/cmake/cmake_work/FindConfig.cmake b/contrib/cmake/cmake_work/FindConfig.cmake
new file mode 100644
index 0000000..5361d96
--- /dev/null
+++ b/contrib/cmake/cmake_work/FindConfig.cmake
@@ -0,0 +1,23 @@
+FIND_PATH(CONFIG_INCLUDE_DIR libconfig.h /usr/include /usr/local/include)
+
+FIND_LIBRARY(CONFIG_LIBRARY NAMES config PATH /usr/lib /usr/local/lib) 
+
+IF (CONFIG_INCLUDE_DIR AND CONFIG_LIBRARY)
+    SET(CONFIG_FOUND TRUE)
+ENDIF ( CONFIG_INCLUDE_DIR AND CONFIG_LIBRARY)
+
+IF (CONFIG_FOUND)
+    IF (NOT CONFIG_FIND_QUIETLY)
+	MESSAGE(STATUS "Found Config: ${CONFIG_LIBRARY}")
+    ENDIF (NOT  CONFIG_FIND_QUIETLY)
+ELSE(CONFIG_FOUND)
+    IF (Config_FIND_REQUIRED)
+	IF(NOT CONFIG_INCLUDE_DIR)
+	    MESSAGE(FATAL_ERROR "Could not find LibConfig header file!")
+	ENDIF(NOT CONFIG_INCLUDE_DIR)
+
+	IF(NOT CONFIG_LIBRARY)
+	    MESSAGE(FATAL_ERROR "Could not find LibConfig library file!")
+	ENDIF(NOT CONFIG_LIBRARY)
+    ENDIF (Config_FIND_REQUIRED)
+ENDIF (CONFIG_FOUND)
\ No newline at end of file
diff --git a/contrib/cmake/cmake_work/cmake_uninstall.cmake.in b/contrib/cmake/cmake_work/cmake_uninstall.cmake.in
new file mode 100644
index 0000000..10a2937
--- /dev/null
+++ b/contrib/cmake/cmake_work/cmake_uninstall.cmake.in
@@ -0,0 +1,36 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")                                        
+  MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")                                     
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)                                      
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+  MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")                                               
+  IF(EXISTS "$ENV{DESTDIR}${file}")
+  EXEC_PROGRAM(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""                                       
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval                                                                            
+      )
+  IF("${rm_retval}" STREQUAL 0)                                                                       
+  ELSE("${rm_retval}" STREQUAL 0)                                                                     
+    MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")                             
+  ENDIF("${rm_retval}" STREQUAL 0)
+  ELSE(EXISTS "$ENV{DESTDIR}${file}")                                                                   
+  MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)