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 <kaduk@mit.edu>
Reviewed-by: Daria Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 347ffc2..c6c0eb0 100644 (file)
--- 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