Unbreak after libgnutls-config removal.

ok sthen@ (maintainer)
This commit is contained in:
ajacoutot 2015-09-14 07:02:44 +00:00
parent 045f47dfc1
commit 75ac9f57a9
2 changed files with 33 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2015/05/05 17:00:19 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2015/09/14 07:02:44 ajacoutot Exp $
COMMENT= XML parser designed for Jabber applications
DISTNAME= iksemel-1.4
@ -27,4 +27,16 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
pre-configure:
cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -fi
.include <bsd.port.mk>

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure_ac,v 1.1 2015/09/14 07:02:44 ajacoutot Exp $
--- configure.ac.orig Thu Jul 23 13:16:36 2009
+++ configure.ac Sun Sep 13 09:30:19 2015
@@ -45,7 +45,15 @@ AC_SEARCH_LIBS(recv,socket)
AC_CHECK_FUNCS(getopt_long)
AC_CHECK_FUNCS(getaddrinfo)
-AM_PATH_LIBGNUTLS(,AC_DEFINE(HAVE_GNUTLS,,"Use libgnutls"))
+dnl Check GNU TLS
+PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
+if test "x$have_gnutls" = "xyes"; then
+ LIBGNUTLS_CFLAGS="$GNUTLS_CFLAGS"
+ LIBGNUTLS_LIBS="$GNUTLS_LIBS"
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTLS support.])
+fi
dnl Check -Wall flag of GCC
if test "x$GCC" = "xyes"; then