fix build:

- explicitly choose the xml library you want.
- give enough details so that libintl is found, *even if xml2 is not used*.

No package change.
This commit is contained in:
espie 2007-10-20 13:05:35 +00:00
parent 5dd62992eb
commit 50232f1030
2 changed files with 19 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2007/09/15 22:36:55 merdely Exp $ # $OpenBSD: Makefile,v 1.20 2007/10/20 13:05:35 espie Exp $
COMMENT= HTTP and WebDAV client library, with C interface COMMENT= HTTP and WebDAV client library, with C interface
@ -24,7 +24,12 @@ MODULES= devel/gettext
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --with-ssl --with-xml2 --enable-nls CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-ssl --enable-nls \
--with-xml2 --without-expat
post-install: post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/neon/macros ${INSTALL_DATA_DIR} ${PREFIX}/share/neon/macros

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.3 2007/10/20 13:05:35 espie Exp $
--- configure.orig Sat Oct 20 14:57:47 2007
+++ configure Sat Oct 20 14:58:26 2007
@@ -30308,7 +30308,7 @@ for lib in intl; do
*) ne__code="bindtextdomain();" ;;
esac
- LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"
+ LIBS="$ne_sl_save_LIBS -l$lib -liconv $NEON_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF