Get the correct png and zlib includes.

This commit is contained in:
espie 2003-12-20 01:17:43 +00:00
parent b8820db3d0
commit 6517e9c3cb
2 changed files with 16 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2003/06/17 15:03:54 avsm Exp $
# $OpenBSD: Makefile,v 1.11 2003/12/20 01:17:43 espie Exp $
#
# Many variables moved to ../Makefile.inc
@ -42,7 +42,7 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf dest
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/../libwww/config
CONFIGURE_SCRIPT= ../configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --without-graphic-libs

View File

@ -1,6 +1,17 @@
$OpenBSD: patch-Amaya_configure_in,v 1.1 2001/10/02 20:18:59 heko Exp $
--- Amaya/configure.in.orig Tue Jul 3 14:23:50 2001
+++ Amaya/configure.in Fri Sep 14 07:06:06 2001
$OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
--- Amaya/configure.in.orig 2001-07-03 13:23:50.000000000 +0200
+++ Amaya/configure.in 2003-12-20 02:05:54.000000000 +0100
@@ -69,8 +69,8 @@ dnl
)
dnl
dnl
- AC_MSG_CHECKING([for libpng version = 1.0.x])
- AC_EGREP_CPP([x \"1.0\..*\" *x],
+ AC_MSG_CHECKING([for libpng version = 1.2.x])
+ AC_EGREP_CPP([x \"1.2\..*\" *x],
[#include <png.h>
x PNG_LIBPNG_VER_STRING x],
dnl
@@ -232,43 +232,32 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS(getcwd gethostname gettimeofday getwd mkdir mktime putenv select socket strdup strerror strftime strstr strtod strtol uname lstat strcasecmp strncasecmp strchr memcpy)