diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/libtirpc | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/libtirpc')
| -rw-r--r-- | package/libtirpc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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) |