dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: fix --with-gifincludedir

Browse Source 
GIF_INCLUDES were not being used by examples/Makefile.am

Change-Id: I981ad473f6efe24f095e2b9cc8b133d6ae3658b6
This commit is contained in:
James Zern 2013-01-08 12:39:43 -08:00
parent 476e293fe8
commit 03c749ebb8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -153,10 +153,13 @@ LIBS=$SAVED_LIBS
dnl === check for GIF support === dnl === check for GIF support ===
GIF_INCLUDES=""
GIF_LIBS="" GIF_LIBS=""
WITHLIB_OPTION([gif], [GIF]) WITHLIB_OPTION([gif], [GIF])
SAVED_CPPFLAGS=$CPPFLAGS
SAVED_LIBS=$LIBS SAVED_LIBS=$LIBS
CPPFLAGS="$GIF_INCLUDES $CPPFLAGS"
LIBS="$GIF_LIBS $LIBS" LIBS="$GIF_LIBS $LIBS"
AC_CHECK_HEADER(gif_lib.h, 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_MSG_WARN(gif library not available - no gif_lib.h)
) )
AC_SUBST(GIF_LIBS) AC_SUBST(GIF_LIBS)
AC_SUBST(GIF_INCLUDES)
CPPFLAGS=$SAVED_CPPFLAGS CPPFLAGS=$SAVED_CPPFLAGS
LIBS=$SAVED_LIBS LIBS=$SAVED_LIBS

2
examples/Makefile.am
View File

@ -29,7 +29,7 @@ cwebp_CPPFLAGS += $(JPEG_INCLUDES) $(PNG_INCLUDES) $(TIFF_INCLUDES)
cwebp_LDADD = ../src/libwebp.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) cwebp_LDADD = ../src/libwebp.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS)
gif2webp_SOURCES = gif2webp.c 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 = libexampleutil.la ../src/mux/libwebpmux.la ../src/libwebp.la
gif2webp_LDADD += $(GIF_LIBS) gif2webp_LDADD += $(GIF_LIBS)