This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git.
The branch, master has been updated via acd8e4467957c330d8585838a54a054b58f24aca (commit) from 1176d24e31d0d820628edf8b4d5ba74db4d51cb5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/acd8e4467957c330d8585838a54a054b58f24...
commit acd8e4467957c330d8585838a54a054b58f24aca Author: Cyril Hrubis metan@ucw.cz Date: Sun Nov 23 09:50:55 2014 +0100
configure: Check for both ft2build.h and freetype2/ft2build.h
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/configure b/configure index 4208355a..708233fb 100755 --- a/configure +++ b/configure @@ -7,18 +7,19 @@ import sys from optparse import OptionParser import subprocess
-def header_exists(cfg, filename): - fpath = cfg['include_path'][0] + '/' + filename +def header_exists(cfg, *filenames): + for filename in filenames: + fpath = cfg['include_path'][0] + '/' + filename
- sys.stderr.write("Checking for '%s' ... " % fpath) + sys.stderr.write("Checking for '%s' ... " % fpath)
- try: - st = os.stat(fpath) - sys.stderr.write("Yesn") - return True - except os.error: - sys.stderr.write("Non") - return False + try: + st = os.stat(fpath) + sys.stderr.write("Yesn") + return True + except os.error: + sys.stderr.write("Non") + return False
def c_try_compile(cfg, code, msg): sys.stderr.write(msg) @@ -411,7 +412,8 @@ if __name__ == '__main__': [header_exists, "aalib.h"], "", "-laa", ["backends"]], ["freetype", "A high-quality and portable font engine", - [header_exists, "ft2build.h"], "", "`freetype-config --libs`", ["core"]], + [header_exists, "ft2build.h", "freetype2/ft2build.h"], + "", "`freetype-config --libs`", ["core"]], ["dl", "Dynamic linker", [header_exists, "dlfcn.h"], "", "-ldl", ["core"]],
-----------------------------------------------------------------------
Summary of changes: configure | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-)
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.