krbVmodule autogen.sh, 1.4, 1.5 configure.in, 1.18, 1.19 python-krbV.spec, 1.8, 1.9

[Mike Bonnet (mikeb)]

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227

Modified Files:
	autogen.sh configure.in python-krbV.spec 
Log Message:
find headers under /usr/include/krb5 (krb5-devel >= 1.5) or /usr/include


Index: autogen.sh
===================================================================
RCS file: /cvs/devel/krbVmodule/autogen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- autogen.sh	24 Apr 2006 15:27:32 -0000	1.4
+++ autogen.sh	13 Sep 2006 21:45:42 -0000	1.5
@@ -48,21 +48,21 @@
 fi
 
 TOPDIR=`pwd`
-for I in .; do
-	echo "processing $I"
-	(cd $I
-	libtoolize --force
-	aclocal -I $TOPDIR
-	autoheader
-	automake --add-missing
-	autoconf
-	)
-done
+
+libtoolize --force
+aclocal -I $TOPDIR
+autoheader
+automake --add-missing
+autoconf
 
 cd $ORIGDIR
 
 echo "Running $srcdir/configure --enable-maintainer-mode" "$@"
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure --enable-maintainer-mode "$@" || DIE=1
+
+if test "$DIE" -eq 1; then
+	exit 1
+fi
 
 echo 
 echo "Now type 'make' to compile krb5module."


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.in	27 Apr 2006 19:52:36 -0000	1.18
+++ configure.in	13 Sep 2006 21:45:42 -0000	1.19
@@ -14,14 +14,18 @@
 AC_SUBST(LIBNAME)
 
 krb5_prefix=
+krb5_includedir=
 for I in /usr /usr/kerberos /usr/athena; do
-	if test -f ${I}/include/krb5.h; then
-		krb5_prefix=$I
-		break
-	fi
+	for J in include/krb5 include; do
+		if test -f ${I}/${J}/krb5.h; then
+			krb5_prefix=$I
+			krb5_includedir=$J
+			break
+		fi
+	done
 done
-if test -n "$krb5_prefix"; then
-	KRB5_HEADERDIR=${krb5_prefix}/include
+if test -n "$krb5_prefix" && test -n "$krb5_includedir"; then
+	KRB5_HEADERDIR=${krb5_prefix}/${krb5_includedir}
 	KRB5_LIBS="-L${krb5_prefix}/$LIBNAME -lkrb5"
 	AC_SUBST(KRB5_HEADERDIR)
 	AC_SUBST(KRB5_LIBS)


Index: python-krbV.spec
===================================================================
RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-krbV.spec	13 Sep 2006 20:09:05 -0000	1.8
+++ python-krbV.spec	13 Sep 2006 21:45:42 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name: python-krbV
 Version: 1.0.13
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Python extension module for Kerberos 5
 
 Group: Development/Languages
@@ -45,6 +45,9 @@
 %{python_sitelib}/krbVmodule.so
 
 %changelog
+* Wed Sep 13 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.13-4
+- support building against krb-1.5, where the headers have been moved to /usr/include/krb5
+
 * Mon Sep 11 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.13-3
 - rebuild for FC6