diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2018-02-16 15:53:48 +0100 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2018-02-16 15:53:48 +0100 |
| commit | a57a5c01229f0035b6ad1e566f9d5dde39650be7 (patch) | |
| tree | aaed0ee9c17add0100b9e5c588a5439b001c4f6c /src | |
| parent | 56f07a473d403a84afcf1e639d499eeacda0952a (diff) | |
Improving and cleaning configure script
Diffstat (limited to 'src')
| -rw-r--r-- | src/libimage/Makefile.am | 6 | ||||
| -rwxr-xr-x | src/libimage/img.c | 4 | ||||
| -rw-r--r-- | src/tv/Makefile.am | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libimage/Makefile.am b/src/libimage/Makefile.am index ed9041c..0d36ccd 100644 --- a/src/libimage/Makefile.am +++ b/src/libimage/Makefile.am @@ -1,11 +1,11 @@ -AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) +AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) $(IMAGEMAGICK_CFLAGS) noinst_LIBRARIES = libimage.a libimage_a_SOURCES = \ img.c -if ENABLE_MAGICK -AM_CPPFLAGS += -DWITH_MAGICK +if HAVE_MAGICK +AM_CPPFLAGS += -DHAVE_MAGICK endif diff --git a/src/libimage/img.c b/src/libimage/img.c index 8a7f5a4..ccc79bb 100755 --- a/src/libimage/img.c +++ b/src/libimage/img.c @@ -5,7 +5,7 @@ int save_depth = 16; -#ifdef WITH_MAGICK +#ifdef HAVE_MAGICK #include <magick/api.h> /* load given image to memory. return short RGB values */ @@ -256,7 +256,7 @@ int save_img_array(double *array, int width, int height, int alpha, const char * unsigned short *img = NULL; int components; -#ifndef WITH_MAGICK +#ifndef HAVE_MAGICK if (alpha) { printf("%s:warning, cannot save alpha component with PPM support only\n", __func__); alpha = 0; diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am index e812342..733541a 100644 --- a/src/tv/Makefile.am +++ b/src/tv/Makefile.am @@ -44,7 +44,7 @@ if HAVE_SDR AM_CPPFLAGS += -DHAVE_SDR endif -if ENABLE_MAGICK -AM_CPPFLAGS += -DWITH_MAGICK +if HAVE_MAGICK +AM_CPPFLAGS += -DHAVE_MAGICK endif |