gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 20:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use libpng-config to determine the correct includes and libraries

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@32015 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2011-02-08 16:15:22 +00:00
parent 14328a34f3
commit f8b66d1ab3
3 changed files with 2058 additions and 4291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2011-02-08 Riccardo Mottola <rm@gnu.org>
* Source/NSBitmapImageRep+PNG.m:
Cleaned up includes so that compilation without PNG works again.
* configure.ac:
Use libpng-config to determine the correct includes and libraries.
* configure: regenerated.
2011-02-07 Fred Kiefer <FredKiefer@gmx.de>
* Printing/*: Clean up all the header includes.

6303
configure vendored
View file

File diff suppressed because it is too large Load diff

36
configure.ac
View file

@ -1,7 +1,7 @@
# configure.in for GNUstep GUI library
# Process this file with autoconf to produce a configure script.
#
# Copyright (C) 1996 Free Software Foundation, Inc.
# Copyright (C) 1996-2011 Free Software Foundation, Inc.
#
# Author: Adam Fedor <fedor@gnu.org>
#
@ -229,27 +229,47 @@ if test "$have_tiff" = no; then
fi
#--------------------------------------------------------------------
# Find additional image libs
# Find PNG
#--------------------------------------------------------------------
AC_ARG_ENABLE(png,
[ --disable-png Disable PNG support],,
enable_png=yes)
if test $enable_png = yes; then
AC_CHECK_LIB(png, png_sig_cmp)
AC_CHECK_HEADERS(libpng/png.h)
# use libpng-config if available
AC_CHECK_PROG(HAVE_LIBPNG_CONFIG, [libpng-config], yes)
if test "$HAVE_LIBPNG_CONFIG" = "yes"; then
PNG_CFLAGS="`libpng-config --cflags`"
PNG_LDFLAGS="`libpng-config --ldflags`"
CFLAGS="$PNG_CFLAGS ${CFLAGS}"
LDFLAGS="$PNG_LDFLAGS ${LDFLAGS}"
AC_CHECK_HEADERS(png.h)
AC_SEARCH_LIBS(png_sig_cmp)
if test "$ac_cv_search_png_sig_cmp" != no; then
GRAPHIC_CFLAGS="$PNG_CFLAGS $GRAPHIC_CFLAGS"
GRAPHIC_LFLAGS="$PNG_LDFLAGS $GRAPHIC_LFLAGS"
AC_DEFINE([HAVE_LIBPNG], [1])
fi
else
AC_MSG_WARN([Can't find libpng-config, guessing required headers and libraries.])
AC_CHECK_HEADERS(png.h)
AC_CHECK_LIB(png, png_sig_cmp)
fi
if test "$ac_cv_lib_png_png_sig_cmp" = no; then
if test "$ac_cv_lib_png_png_sig_cmp" = no && test "$ac_cv_search_png_sig_cmp" = no; then
echo "GNUstep requires libpng to support PNG images, but this library"
echo "can't be found. If you really want to compile GNUstep without"
echo "PNG support, pass the --disable-png option to ./configure."
echo "Note that this isn't recommended. For more information, see:"
echo "http://gnustep.made-it.com/BuildGuide/index.html#PNG"
echo "Note that this isn't recommended."
AC_MSG_ERROR([libpng not found.])
fi
fi
#--------------------------------------------------------------------
# Find additional image libs
#--------------------------------------------------------------------
AC_ARG_ENABLE(ungif,
[ --disable-ungif Disable libungif-based GIF support],,
enable_ungif=yes)