From 687fc2785e881e74bc79aabc525d2ff67df4f76b Mon Sep 17 00:00:00 2001 From: Manuel Gunther <siebenkopf@googlemail.com> Date: Tue, 24 May 2016 18:20:30 -0600 Subject: [PATCH] Fixed get_macros --- bob/io/image/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bob/io/image/__init__.py b/bob/io/image/__init__.py index 89e02a3..ef1b771 100644 --- a/bob/io/image/__init__.py +++ b/bob/io/image/__init__.py @@ -69,12 +69,12 @@ def get_macros(): from bob.extension.utils import find_header, uniq_paths from bob.extension import pkgconfig macros = [] - for define, header in (('LIBJPEG', 'jpeglib.h'), ('LIBTIFF', 'tiff.h'), ('GIFLIB', 'gif_lib.h')): + for define, header in (('HAVE_LIBJPEG', 'jpeglib.h'), ('HAVE_LIBTIFF', 'tiff.h'), ('HAVE_GIFLIB', 'gif_lib.h')): # locate pkg-config on our own candidates = find_header(header) if candidates: macros.append((define, '1')) - for define, name in (("LIBPNG", "libpng"),): + for define, name in (("HAVE_LIBPNG", "libpng"),): try: pkg = pkgconfig(name) macros.append((define, '1')) -- GitLab