diff --git a/acinclude.m4 b/acinclude.m4
index 5e9600bc29..767fbf89da 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,6 +9,17 @@
 #
 #######################################################################
 
+#################################
+# Check there is a C++ compiler #
+#################################
+
+AC_DEFUN([CHECK_CPP_COMPILER],
+[
+	if test "$ac_cv_prog_cxx_g" == no; then
+		AC_MSG_ERROR([could not find a suitable C++ to build pgAdmin])
+	fi
+])
+
 #############################
 # Override wxWidgets version #
 #############################
@@ -407,6 +418,12 @@ AC_DEFUN([SUMMARY],
 	echo "PostgreSQL directory:			$PG_HOME"
 	echo "PostgreSQL pg_config binary:		$PG_CONFIG"
 	echo "PostgreSQL version:			$PG_VERSION"
+        if test "$PG_SSL" == yes
+        then
+                echo "PostgreSQL SSL support:                 Present"
+        else
+                echo "PostgreSQL SSL support:                 Missing"
+        fi
 	echo
 	echo "wxWidgets directory:			$WX_HOME"
 	echo "wxWidgets wx-config binary:		$WX_CONFIG"
diff --git a/configure.ac.in b/configure.ac.in
index 89d8a15998..e507bf94a7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,6 +12,7 @@ AC_PREFIX_DEFAULT([/usr/local/pgadmin3])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
+CHECK_CPP_COMPILER
 
 # Checks for header files.
 AC_HEADER_STDC