38 lines
1.2 KiB
Plaintext
38 lines
1.2 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.3 2005/08/04 05:06:54 jolan Exp $
|
|
--- configure.in.orig Tue Aug 2 14:26:29 2005
|
|
+++ configure.in Tue Aug 2 14:40:57 2005
|
|
@@ -1799,10 +1799,14 @@ case "$target" in
|
|
;;
|
|
|
|
*-openbsd*)
|
|
- DLL_SUFFIX=".so.1.0"
|
|
+ DLL_SUFFIX=".so.${SO_VERSION}"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
DSO_LDOPTS='-shared -fPIC'
|
|
+ MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
|
|
+ MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
|
+ MKSHLIB_FORCE_ALL=''
|
|
+ MKSHLIB_UNFORCE_ALL=''
|
|
if test "$LIBRUNPATH"; then
|
|
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
|
|
fi
|
|
@@ -3580,7 +3584,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
|
|
@@ -3610,7 +3614,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
|
|
|