mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Now project don't compile if version of glib less than 2.14 and no have pcre library 

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-06-19 16:34:34 +03:00
parent 38601bd224
commit fbcacf4044
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -1,6 +1,7 @@
m4_include([m4.include/ac_onceonly.m4])
m4_include([m4.include/ax_path_lib_pcre.m4])
m4_include([m4.include/dx_doxygen.m4])
m4_include([m4.include/mc-check-search-type.m4])
m4_include([m4.include/mc-mcserver.m4])
m4_include([m4.include/ac-get-fs-info.m4])
m4_include([m4.include/mc-use-termcap.m4])

7
configure.ac
View File

@ -327,11 +327,7 @@ linux*)
;;
esac
$PKG_CONFIG --max-version 2.14 glib-2.0
if test $? -eq 0
then
AX_PATH_LIB_PCRE
fi
MC_CHECK_SEARCH_TYPE
dnl
dnl Check nroff and the options it supports
@ -636,4 +632,5 @@ Configuration:
With subshell support: ${subshell}
Internal editor: ${edit_msg}
Support for charset: ${charset_msg}
Search type: ${SEARCH_TYPE}
"

22
m4.include/mc-check-search-type.m4 Normal file
View File

@ -0,0 +1,22 @@
dnl @synopsis MC_VERSION
dnl
dnl Check search type in mc. Currently used glib-regexp or pcre
dnl
dnl @author Slava Zanko <slavazanko@gmail.com>
dnl @version 2009-06-19
dnl @license GPL
dnl @copyright Free Software Foundation, Inc.
AC_DEFUN([MC_CHECK_SEARCH_TYPE],[
$PKG_CONFIG --max-version 2.14 glib-2.0
if test $? -eq 0; then
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
SEARCH_TYPE="pcre"
else
SEARCH_TYPE="glib-regexp"
fi
])