From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 13 May 2014 13:44:08 +0200
Subject: resolve merge conflict

---
 package/libtirpc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/libtirpc/Makefile')

diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 486e2a08b..a22b89c6a 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -29,9 +29,9 @@ $(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG
 AUTOTOOL_STYLE:=	autoreconf
 
 ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_GSS},y)
-CONFIGURE_ARGS+=	--enable-gss
+CONFIGURE_ARGS+=	--enable-gssapi
 else
-CONFIGURE_ARGS+=	--disable-gss
+CONFIGURE_ARGS+=	--disable-gssapi
 endif
 
 ifeq (${ADK_PACKAGE_LIBTIRPC_WITH_IPV6},y)
-- 
cgit v1.2.3