b558b3ba1e
2008-56; MFSA 2008-55; MFSA 2008-52; MFSA 2008-50; MFSA 2008-48. ok naddy@
31 lines
977 B
Plaintext
31 lines
977 B
Plaintext
$OpenBSD: patch-configure_in,v 1.15 2008/12/19 11:42:35 martynas Exp $
|
|
--- configure.in.orig Sun Oct 19 19:14:06 2008
|
|
+++ configure.in Wed Dec 17 21:34:06 2008
|
|
@@ -2030,7 +2030,7 @@ case "$target" in
|
|
;;
|
|
|
|
*-openbsd*)
|
|
- DLL_SUFFIX=".so.1.0"
|
|
+ DLL_SUFFIX=".so.${SO_VERSION}"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
DSO_LDOPTS='-shared -fPIC'
|
|
@@ -3880,7 +3880,7 @@ _SAVE_LIBS=$LIBS
|
|
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
|
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
|
|
if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; 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
|
|
@@ -3910,7 +3910,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
|
|
|