fix system png include path

This commit is contained in:
wilfried 2005-01-13 15:57:26 +00:00
parent e0a5e48ef9
commit 1be340ee85
3 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure_in,v 1.4 2005/01/13 15:57:26 wilfried Exp $
--- configure.in.orig Sun Oct 31 08:17:58 2004
+++ configure.in Fri Jan 7 11:26:09 2005
@@ -3103,7 +3103,7 @@ _SAVE_LIBS=$LIBS
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
if test -n "${PNG_DIR}"; then
- CFLAGS="-I${PNG_DIR}/include $CFLAGS"
+ CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
fi
if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
@@ -3133,7 +3133,7 @@ LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
- PNG_CFLAGS="-I${PNG_DIR}/include"
+ PNG_CFLAGS="-I${PNG_DIR}/include/libpng"
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
fi

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2005/01/10 14:39:22 wilfried Exp $
# $OpenBSD: Makefile,v 1.19 2005/01/13 15:57:26 wilfried Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64 amd64 powerpc
@ -6,7 +6,7 @@ COMMENT= "redesign of Mozilla's browser component"
VER= 1.0
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}p0
PKGNAME= mozilla-firefox-${VER}p1
CATEGORIES= www

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure_in,v 1.3 2005/01/13 15:57:26 wilfried Exp $
--- configure.in.orig Sun Oct 31 08:17:58 2004
+++ configure.in Fri Jan 7 11:44:14 2005
@@ -3103,7 +3103,7 @@ _SAVE_LIBS=$LIBS
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
if test -n "${PNG_DIR}"; then
- CFLAGS="-I${PNG_DIR}/include $CFLAGS"
+ CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS"
LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
fi
if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
@@ -3133,7 +3133,7 @@ LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
- PNG_CFLAGS="-I${PNG_DIR}/include"
+ PNG_CFLAGS="-I${PNG_DIR}/include/libpng"
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
fi