$OpenBSD: patch-configure_in,v 1.11 2005/04/11 15:03:18 kurt Exp $ --- configure.in.orig Tue Oct 12 00:13:29 2004 +++ configure.in Tue Apr 5 14:50:29 2005 @@ -1346,10 +1346,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 @@ -3100,7 +3104,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 @@ -3130,7 +3134,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