Commit 4a40933b authored by Matthias Clasen's avatar Matthias Clasen

Try to find libpng via pkg-config first, since libpng-1.2.2 will come with

	* configure.in: Try to find libpng via pkg-config first,
	since libpng-1.2.2 will come with a .pc file.
parent ec35e811
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
2002-03-27 Matthias Clasen <maclas@gmx.de>
* configure.in: Try to find libpng via pkg-config first,
since libpng-1.2.2 will come with a .pc file.
Wed Mar 27 11:10:39 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_real_remove): Set
......
......@@ -697,25 +697,34 @@ dnl Test for libjpeg
dnl Test for libpng
if test x$with_libpng != xno && test -z "$LIBPNG"; then
AC_CHECK_LIB(png, png_read_info,
[AC_CHECK_HEADER(png.h,
png_ok=yes,
png_ok=no)],
AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
if test "$png_ok" = yes; then
AC_MSG_CHECKING([for png_structp in png.h])
AC_TRY_COMPILE([#include <png.h>],
[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
png_ok=yes,
png_ok=no)
AC_MSG_RESULT($png_ok)
AC_MSG_CHECKING(for libpng12)
if $PKG_CONFIG --exists libpng12 ; then
AC_MSG_RESULT(yes)
PNG='png'
PNG_DEP_CFLAGS_PACKAGES=libpng12
LIBPNG=`$PKG_CONFIG --libs libpng12`
else
AC_MSG_RESULT(no)
AC_CHECK_LIB(png, png_read_info,
[AC_CHECK_HEADER(png.h,
png_ok=yes,
png_ok=no)],
AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
if test "$png_ok" = yes; then
PNG='png'; LIBPNG='-lpng -lz'
AC_MSG_CHECKING([for png_structp in png.h])
AC_TRY_COMPILE([#include <png.h>],
[png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
png_ok=yes,
png_ok=no)
AC_MSG_RESULT($png_ok)
if test "$png_ok" = yes; then
PNG='png'; LIBPNG='-lpng -lz'
else
AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
fi
else
AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
fi
else
AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
fi
fi
......@@ -846,7 +855,7 @@ GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
GDK_PIXBUF_EXTRA_CFLAGS=
GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
AC_SUBST(GDK_PIXBUF_PACKAGES)
AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment