Merge branch '1396_with_search_engine'

* 1396_with_search_engine:
  Fixed incorrect showing name of search library in summary screen
  Ticket #1396: Fixed logic of processing '--with-search-engine' configure option.

m4.include/mc-check-search-type.m4

@@ -7,6 +7,28 @@ dnl @version 2009-06-19
 dnl @license GPL
 dnl @copyright Free Software Foundation, Inc.
 
+AC_DEFUN([MC_CHECK_SEARCH_TYPE_PCRE],[
+    AX_PATH_LIB_PCRE
+    if test x"${PCRE_LIBS}" = x; then
+	AC_MSG_ERROR([Your system don't have pcre library (or pcre devel stuff)])
+    else
+	SEARCH_TYPE="pcre"
+	AC_DEFINE(SEARCH_TYPE_PCRE, 1, [Define to select 'pcre' search type])
+    fi
+])
+
+
+AC_DEFUN([MC_CHECK_SEARCH_TYPE_GLIB],[
+    $PKG_CONFIG --max-version 2.14 glib-2.0
+    if test $? -eq 0; then
+	AC_MSG_RESULT([[Selected 'glib' search engine, but you don't have glib >= 2.14. Trying to use 'pcre' engine], (WARNING)])
+	MC_CHECK_SEARCH_TYPE_PCRE
+    else
+	AC_DEFINE(SEARCH_TYPE_GLIB, 1, [Define to select 'glib-regexp' search type])
+    fi
+])
+
+
 AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
 
     AC_ARG_WITH([search-engine],
@@ -18,7 +40,7 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
 	SEARCH_TYPE="glib-regexp"
 	;;
     xpcre)
-	SEARCH_TYPE="pcre"
+	MC_CHECK_SEARCH_TYPE_PCRE
 	;;
     x)
 	SEARCH_TYPE="glib-regexp"
@@ -28,25 +50,7 @@ AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
 	;;
     esac
 
-    $PKG_CONFIG --max-version 2.14 glib-2.0
-    if test $? -eq 0; then
-	if test ! x"$with_search_engine" = x -a x"$SEARCH_TYPE" = xglib; then
-	    AC_MSG_ERROR([Selected 'glib' search engine, but you don't have glib >= 2.14])
-	fi
-	AX_PATH_LIB_PCRE
-	if test x"${PCRE_LIBS}" = x; then
-	    AC_MSG_ERROR([Your system have glib < 2.14 and don't have pcre library (or pcre devel stuff)])
-	fi
-	AC_DEFINE(SEARCH_TYPE_PCRE, 1, [Define to select 'pcre' search type])
-    else
-	if test x"$SEARCH_TYPE" = xpcre; then
-	    AX_PATH_LIB_PCRE
-	    if test x"${PCRE_LIBS}" = x; then
-		AC_MSG_ERROR([Your system don't have pcre library (or pcre devel stuff)])
-	    fi
-	    AC_DEFINE(SEARCH_TYPE_PCRE, 1, [Define to select 'pcre' search type])
-	else
-	    AC_DEFINE(SEARCH_TYPE_GLIB, 1, [Define to select 'glib-regexp' search type])
-	fi
+    if test x"$SEARCH_TYPE" = x"glib-regexp"; then
+	MC_CHECK_SEARCH_TYPE_GLIB
     fi
 ])