From 9de36a0398a53fffd7bde8ed9e57573bed3b669d Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 23 Dec 2013 17:27:05 -0500 Subject: [PATCH] RedHat: Update configure options, again Commit 83f85c9ad6c439eb9676436a3e09c40c2813f1c1 updated the arguments we give to configure, since --enable-disconnected and --with-krb5-conf no longer exist. But, it only updated the configure options for the userspace configure, and did not update the configure invocation for building kmod kernel modules. Update the other configure invocation, so they match and both of them avoid using outdated configure options. Change-Id: Ia7fe16a373b5feabd4060bd85fbf9220407082f5 Reviewed-on: http://gerrit.openafs.org/10623 Reviewed-by: Benjamin Kaduk Reviewed-by: Daria Brashear Tested-by: BuildBot --- src/packaging/RedHat/openafs.spec.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 347ffc2a8..c6c0eb0b8 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -895,6 +895,13 @@ export KRB5_CONFIG # Build the libafs tree make only_libafs_tree || exit 1 +%if %{krb5support} +%if %{?krb5config:1}%{!?krb5config:0} +KRB5_CONFIG="%{krb5config}" +export KRB5_CONFIG +%endif +%endif + # Configure each of our kernel modules %if %{fedorakmod} && %{build_modules} @@ -923,9 +930,8 @@ for kvariant in %{kvariants} ; do --sbindir=%{_sbindir} \ --with-linux-kernel-packaging \ --with-linux-kernel-headers=${ksrc} \ - --enable-disconnected \ %if %{krb5support} - --with-krb5-conf=/usr/kerberos/bin/krb5-config \ + --with-krb5 \ %endif $config_opts \ || exit 1 -- 2.39.5