jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

RedHat: Do not force krb5-config path

Browse Source 
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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Andrew Deason 2010-09-01 11:14:37 -05:00 committed by Derrick Brashear
parent 83f85c9ad6
commit 469cc14bd1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/packaging/RedHat/openafs.spec.in
View File

@ -99,12 +99,6 @@
# to distribute aklog and asetkey # to distribute aklog and asetkey
%define krb5support %{?_without_krb5:0}%{!?_without_krb5:1} %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 # Set 'bootkernelsupport' to 1 if you want to build the
# kernel module for Red Hat BOOT Kernels on x86. # kernel module for Red Hat BOOT Kernels on x86.
%define bootkernelsupport %{?_with_bootkernel:1}%{!?_with_bootkernel:0} %define bootkernelsupport %{?_with_bootkernel:1}%{!?_with_bootkernel:0}
@ -853,9 +847,11 @@ fi
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
%if %{krb5support} %if %{krb5support}
%if %{?krb5config:1}%{!?krb5config:0}
KRB5_CONFIG="%{krb5config}" KRB5_CONFIG="%{krb5config}"
export KRB5_CONFIG export KRB5_CONFIG
%endif %endif
%endif
./configure --with-afs-sysname=${sysname} \ ./configure --with-afs-sysname=${sysname} \
--prefix=%{_prefix} \ --prefix=%{_prefix} \