--- ./configure.ac	2018-12-24 21:10:20.099551360 +0100
+++ ./configure.ac	2018-12-24 21:21:03.721601440 +0100
@@ -77,7 +77,7 @@ 
 
 # Check gcc release
 	 
- if test "$CXX" = "c++" -o "$CXX" = "g++"
+ if test "${CXX:0-3:3}" = "c++" -o "${CXX:0-3:3}" = "g++"
  then
      gcc_AC_HAVE_GCC_VERSION(3,2,0)
      if test "x$ac_cv_gcc_version_3_2_0" = "xno"; then
@@ -95,7 +95,7 @@ 
 [],[enable_java=yes])
 
 AC_ARG_ENABLE([mariadb],AC_HELP_STRING([--enable-mariadb],[enable mariadb instead of mysql]),
-[enable_mariadb=yes],[enable_mariadb=no])
+[],[enable_mariadb=no])
 
 AC_ARG_WITH([java], 
 	AC_HELP_STRING([--with-java],[path to java interpreter]),
@@ -140,6 +140,11 @@ 
 	[DOXYGEN=${with_doxygen}],
 	[AC_PATH_PROG(DOXYGEN,doxygen)])
 	
+if test ${with_doxygen} = "yes" ; then
+	AC_PATH_PROG(DOXYGEN,doxygen)
+elif test ${with_doxygen} = "no" ; then
+	DOXYGEN=
+fi
 if test -z "$DOXYGEN"; then
 	DOXYGEN=NOT_INSTALLED
 fi
@@ -511,7 +516,7 @@ 
 
 	Source code location:   ${srcdir}
 	Version:                ${VERSION}
-	Compiler:               ${ac_ct_CC},${ac_ct_CXX}
+	Compiler:               ${CC},${CXX}
 
 	OMNIORB PATH:           ${OMNI_ROOT} 
 	OMNIORB VERSION:        ${OMNI_VERSION}