fixed --with-mysql-includes/libs (they conflicted with wellknown paths)

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@477 406a0c4d-033a-0410-8de8-e80135713968

acinclude.m4

@@ -16,7 +16,7 @@ do
 done
 
 # check well-known library paths
-for MYSQL_LIB in "/usr/local/mysql/lib" "/usr/local/mysql/lib/mysql" "/usr/lib/mysql"
+for MYSQL_LIB in "/usr/local/mysql/lib" "/usr/local/lib/mysql" "/usr/local/mysql/lib/mysql" "/usr/lib/mysql"
 do
 	if test [ -d "$MYSQL_LIB" ]
 	then
@@ -54,12 +54,9 @@ then
 fi
 
 # check for custom includes path
-if test [ -z "$ac_cv_mysql_includes" ] 
-then 
-	AC_ARG_WITH([mysql-includes], 
-		AC_HELP_STRING([--with-mysql-includes], [path to MySQL header files]),
-		[ac_cv_mysql_includes=$withval])
-fi
+AC_ARG_WITH([mysql-includes], 
+	AC_HELP_STRING([--with-mysql-includes], [path to MySQL header files]),
+	[ac_cv_mysql_includes=$withval])
 if test [ -n "$ac_cv_mysql_includes" ]
 then
 	AC_CACHE_CHECK([MySQL includes], [ac_cv_mysql_includes], [ac_cv_mysql_includes=""])
@@ -67,12 +64,9 @@ then
 fi
 
 # check for custom library path
-if test [ -z "$ac_cv_mysql_libs" ]
-then
-	AC_ARG_WITH([mysql-libs], 
-		AC_HELP_STRING([--with-mysql-libs], [path to MySQL libraries]),
-		[ac_cv_mysql_libs=$withval])
-fi
+AC_ARG_WITH([mysql-libs], 
+	AC_HELP_STRING([--with-mysql-libs], [path to MySQL libraries]),
+	[ac_cv_mysql_libs=$withval])
 if test [ -n "$ac_cv_mysql_libs" ]
 then
 	# Trim trailing '.libs' if user passed it in --with-mysql-libs option

configure

@@ -1880,7 +1880,7 @@ do
 done
 
 # check well-known library paths
-for MYSQL_LIB in "/usr/local/mysql/lib" "/usr/local/mysql/lib/mysql" "/usr/lib/mysql"
+for MYSQL_LIB in "/usr/local/mysql/lib" "/usr/local/lib/mysql" "/usr/local/mysql/lib/mysql" "/usr/lib/mysql"
 do
 	if test  -d "$MYSQL_LIB"
 	then
@@ -1920,15 +1920,12 @@ echo "$as_me: error: invalid MySQL root directory: $ac_cv_mysql_root" >&2;}
 fi
 
 # check for custom includes path
-if test  -z "$ac_cv_mysql_includes"
-then
 
 # Check whether --with-mysql-includes or --without-mysql-includes was given.
 if test "${with_mysql_includes+set}" = set; then
   withval="$with_mysql_includes"
   ac_cv_mysql_includes=$withval
 fi;
-fi
 if test  -n "$ac_cv_mysql_includes"
 then
 	echo "$as_me:$LINENO: checking MySQL includes" >&5
@@ -1944,15 +1941,12 @@ echo "${ECHO_T}$ac_cv_mysql_includes" >&6
 fi
 
 # check for custom library path
-if test  -z "$ac_cv_mysql_libs"
-then
 
 # Check whether --with-mysql-libs or --without-mysql-libs was given.
 if test "${with_mysql_libs+set}" = set; then
   withval="$with_mysql_libs"
   ac_cv_mysql_libs=$withval
 fi;
-fi
 if test  -n "$ac_cv_mysql_libs"
 then
 	# Trim trailing '.libs' if user passed it in --with-mysql-libs option