From 03c749ebb8da5a4a956f7d35fbee5d5cfea3d79c Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 8 Jan 2013 12:39:43 -0800
Subject: [PATCH] configure: fix --with-gifincludedir

GIF_INCLUDES were not being used by examples/Makefile.am

Change-Id: I981ad473f6efe24f095e2b9cc8b133d6ae3658b6
---
 configure.ac         | 4 ++++
 examples/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 10e110fa..a8b12e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,10 +153,13 @@ LIBS=$SAVED_LIBS
 
 dnl === check for GIF support ===
 
+GIF_INCLUDES=""
 GIF_LIBS=""
 WITHLIB_OPTION([gif], [GIF])
 
+SAVED_CPPFLAGS=$CPPFLAGS
 SAVED_LIBS=$LIBS
+CPPFLAGS="$GIF_INCLUDES $CPPFLAGS"
 LIBS="$GIF_LIBS $LIBS"
 
 AC_CHECK_HEADER(gif_lib.h,
@@ -169,6 +172,7 @@ AC_CHECK_HEADER(gif_lib.h,
   AC_MSG_WARN(gif library not available - no gif_lib.h)
 )
 AC_SUBST(GIF_LIBS)
+AC_SUBST(GIF_INCLUDES)
 
 CPPFLAGS=$SAVED_CPPFLAGS
 LIBS=$SAVED_LIBS
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5e71b112..202f9c4e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -29,7 +29,7 @@ cwebp_CPPFLAGS += $(JPEG_INCLUDES) $(PNG_INCLUDES) $(TIFF_INCLUDES)
 cwebp_LDADD = ../src/libwebp.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS)
 
 gif2webp_SOURCES = gif2webp.c
-gif2webp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)
+gif2webp_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) $(GIF_INCLUDES)
 gif2webp_LDADD  = libexampleutil.la ../src/mux/libwebpmux.la ../src/libwebp.la
 gif2webp_LDADD += $(GIF_LIBS)