Merge branch 'stable'

cmake/FindPostgreSQL.cmake

@@ -85,6 +85,10 @@ foreach (root ${PostgreSQL_KNOWN_ROOTS} )
     endforeach()
 endforeach()
 
+foreach (version ${PostgreSQL_KNOWN_VERSIONS} )
+    list(APPEND PostgreSQL_ROOT_DIRECTORIES "/usr/pgsql-${version}" )
+endforeach()
+
 #
 # Look for an installation.
 #

src/module/pg/CMakeLists.txt

@@ -2,6 +2,7 @@ find_optional_package(PostgreSQL)
 
 if (PostgreSQL_FOUND)
 	include_directories(${PostgreSQL_INCLUDE_DIRS})
+	link_directories(${PostgreSQL_LIBRARY_DIRS})
 	add_library(pg SHARED pg.cc)
 	target_link_libraries(pg ${PostgreSQL_LIBRARIES} -rdynamic)
 	set_target_properties(pg PROPERTIES PREFIX "")