From 469cc14bd16b9e1a7ed8404224de63862c1f52f5 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 1 Sep 2010 11:14:37 -0500 Subject: [PATCH] RedHat: Do not force krb5-config path If the %krb5config macro is not defined, do not force using /usr/kerbers/bin/krb5-config, since sometimes that is not where it is (RHEL6 puts it in /usr/bin). Instead only specify KRB5_CONFIG if krb5config is defined; otherwise let configure find krb5-config for us. Change-Id: I35cc03ddbba7edd2c03d8f72b9636d4a7f6e64c0 Reviewed-on: http://gerrit.openafs.org/2642 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/packaging/RedHat/openafs.spec.in | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index d64eba1..d25f344 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -99,12 +99,6 @@ # to distribute aklog and asetkey %define krb5support %{?_without_krb5:0}%{!?_without_krb5:1} -%if %{krb5support} -%if %{?krb5config:0}%{!?krb5config:1} -%define krb5config /usr/kerberos/bin/krb5-config -%endif -%endif - # Set 'bootkernelsupport' to 1 if you want to build the # kernel module for Red Hat BOOT Kernels on x86. %define bootkernelsupport %{?_with_bootkernel:1}%{!?_with_bootkernel:0} @@ -853,9 +847,11 @@ fi CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS %if %{krb5support} +%if %{?krb5config:1}%{!?krb5config:0} KRB5_CONFIG="%{krb5config}" export KRB5_CONFIG %endif +%endif ./configure --with-afs-sysname=${sysname} \ --prefix=%{_prefix} \ -- 1.9.4