Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sun, 09 Nov 2014 16:40:03 UTC Commit: 1dc09597b24d19683abc597d45d7c28d37c199f0 https://github.com/geany/geany/commit/1dc09597b24d19683abc597d45d7c28d37c199...
Log Message: ----------- Fix check for fnmatch and remove strict dependency on it for Windows
Strict dependency on fnmatch was removed in 52076d19e8fe7ab41ebc92928e.
We still have an optional dependency on it from CTags, but I don't think we use this code, and anyways the checks we had for the optional path to be taken were incorrect, so it was never actually used.
So, drop the dependency on libibrety for Windows builds, and fix the remaining checks for an optional fnmatch so if it is found it can actually be used.
Modified Paths: -------------- configure.ac m4/geany-mingw.m4 src/Makefile.am wscript
Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -49,7 +49,7 @@ AC_TYPE_SIZE_T AC_STRUCT_TM
# Checks for library functions. -AC_CHECK_FUNCS([ftruncate fgetpos mkstemp strerror strstr]) +AC_CHECK_FUNCS([ftruncate fgetpos fnmatch mkstemp strerror strstr])
# autoscan end
Modified: m4/geany-mingw.m4 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -6,8 +6,6 @@ AC_DEFUN([GEANY_CHECK_MINGW], [ case "${host}" in *mingw*) - AC_CHECK_LIB([iberty], [fnmatch], [], - [AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])]) AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32]) GEANY_CHECK_VTE([no]) GEANY_CHECK_SOCKET([yes])
Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -108,7 +108,7 @@ geany_LDADD = \ @GTK_LIBS@ \ @GTHREAD_LIBS@ \ $(INTLLIBS) \ - -lole32 -luuid -liberty -lwsock32 \ + -lole32 -luuid -lwsock32 \ geany_private.res
AM_CFLAGS = -DGEANY_DATADIR="data" \
Modified: wscript 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -193,6 +193,7 @@ def configure(conf): _add_to_env_and_define(conf, 'HAVE_REGCOMP', 1) # needed for CTags
conf.check_cc(function_name='fgetpos', header_name='stdio.h', mandatory=False) + conf.check_cc(function_name='fnmatch', header_name='fnmatch.h', mandatory=False) conf.check_cc(function_name='ftruncate', header_name='unistd.h', mandatory=False) conf.check_cc(function_name='mkstemp', header_name='stdlib.h', mandatory=False) conf.check_cc(function_name='strstr', header_name='string.h') @@ -259,7 +260,7 @@ but you then may not have a local copy of the HTML manual.''' '-mwindows', '-static-libgcc', '-static-libstdc++']) - conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32', 'iberty']) + conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32']) # explicitly define Windows version for older Mingw environments conf.define('WINVER', '0x0501', quote=False) # for SHGetFolderPathAndSubDirW conf.define('_WIN32_IE', '0x0500', quote=False) # for SHGFP_TYPE
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).