qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 13:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

if pkg-config is available, use it for getting libs needed by libpng. should fix Hikaru's build issues.

Browse source
This commit is contained in:
Bill Currie 2005-10-27 14:23:00 +00:00 committed by Jeff Teunissen
parent bb852eba75
commit b43b44e556
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure.ac
View file

@ -93,6 +93,8 @@ AC_PROG_RANLIB
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
AC_PROG_YACC
if echo $YACC | grep -v bison > /dev/null; then
AC_MSG_ERROR(GNU bison is required but wasn't found)
@ -603,13 +605,17 @@ AC_ARG_ENABLE(png,
)
HAVE_PNG=no
PNG_LIBS=""
if test "x$enable_zlib" != "xno"; then
AC_CHECK_LIB(png, png_set_read_fn, HAVE_PNG=yes, HAVE_PNG=no, [$LIBS])
if test "x$HAVE_PNG" = "xyes"; then
AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no)
if test "x$enable_png" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([PNG], [libpng], HAVE_PNG=yes, HAVE_PNG=no)
else
AC_CHECK_LIB(png, png_set_read_fn, HAVE_PNG=yes, HAVE_PNG=no, [$LIBS])
if test "x$HAVE_PNG" = "xyes"; then
PNG_LIBS="-lpng"
AC_DEFINE(HAVE_PNG, 1, [Define if you have libpng])
AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no)
if test "x$HAVE_PNG" = "xyes"; then
PNG_LIBS="-lpng"
AC_DEFINE(HAVE_PNG, 1, [Define if you have libpng])
fi
fi
fi
fi