Merge pull request #49 from tango-controls/fix-9

Fix incorrect comparison brackets in configure script

Author: t-b

assets/m4/ac_path_mariadb.m4

@@ -44,7 +44,7 @@ AC_ARG_WITH(mariadbclient-lib,AC_HELP_STRING([--with-mariadbclient-lib=LIB],[Dir
 			fi
 		done
 
-		for iloc in include/mariadb include; do
+		for iloc in include/mariadb include include/mysql; do
 			if test -f "$tryprefix/$iloc/mysql.h"; then
                 MARIADBCLIENT_CFLAGS="-I$tryprefix/$iloc"
             fi

assets/m4/mysql_release.m4

@@ -7,34 +7,37 @@ dnl                           MINOR_VERSION)
 dnl   
 
 AC_DEFUN([mysql_AC_HAVE_MYSQL_VERSION],
-	 [AC_CACHE_CHECK([for mysql release (at least version $2.$3)],
-	                 ac_cv_mysql_version_$2_$3,
-           [            
-			  if test -x $1; then
-			 		VERS=`$1 --version 2>&1 | cut -d ' ' -f 6 | cut -d ',' -f 1`
+	[AC_CACHE_CHECK([for mysql release (at least version $2.$3)],
+	                ac_cv_mysql_version_$2_$3,
+			[
+				if test -x $1; then
+					VERS=`$1 --version 2>&1 | cut -d ' ' -f 6 | cut -d ',' -f 1`
 					MYSQL_VERSION=$VERS
-					
-	         		MYSQL_MAJOR=`echo $VERS | cut -d '.' -f 1`
-			 		MYSQL_MINOR=`echo $VERS | cut -d '.' -f 2`
-			 		MYSQL_MICRO=`echo $VERS | cut -d '.' -f 3`
+
+					MYSQL_MAJOR=`echo $VERS | cut -d '.' -f 1`
+					MYSQL_MINOR=`echo $VERS | cut -d '.' -f 2`
+					MYSQL_MICRO=`echo $VERS | cut -d '.' -f 3`
 					MARIA=`echo $MYSQL_MICRO | cut -d '-' -f 2`
 
-					if [[ "$MARIA" == *aria* ]]; then
+					case "$MARIA" in
+					*aria*)
 						MYSQL_VERSION=not_found
 						ac_cv_mysql_version_$2_$3=no
-					else
-				 		if test $MYSQL_MAJOR -lt $2; then
+						;;
+					*)
+						if test $MYSQL_MAJOR -lt $2; then
 							ac_cv_mysql_version_$2_$3=no
-				 		else
+						else
 							if test $MYSQL_MINOR -lt $3; then
-					    		ac_cv_mysql_version_$2_$3=no
-				    	 	else
-					    		ac_cv_mysql_version_$2_$3=yes
-							fi			        
+								ac_cv_mysql_version_$2_$3=no
+							else
+								ac_cv_mysql_version_$2_$3=yes
+							fi
 						fi
-					fi
+						;;
+					esac
 				else
 					ac_cv_mysql_version_$2_$3=no	
 				fi
-			])     
-     ])
+			])
+	])