~ubuntu-branches/ubuntu/oneiric/openafs/oneiric-201305130334

« back to all changes in this revision

Viewing changes to src/packaging/RedHat/afs-krb5-2.0-com_err.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hartman
  • Date: 2006-10-21 20:57:09 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061021205709-y5keam1v20qxjwwo
Tags: 1.4.2-2
Upstream fix to prevent butc segfaulting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff -uNr afs-krb5.orig/src/configure.in afs-krb5/src/configure.in
 
2
--- afs-krb5.orig/src/configure.in      2005-04-14 16:06:15.597138000 -0400
 
3
+++ afs-krb5/src/configure.in   2005-04-14 16:06:44.201789856 -0400
 
4
@@ -143,7 +143,19 @@
 
5
 LIBS="$ac_save_LIBS"])
 
6
 if test "x$afs_cv_func_getDirPath" = "xyes"; then
 
7
        AC_MSG_RESULT([Setting compilation parameters for AFS 3.5 and later])
 
8
-       AKLOG_EXTRA_OBJ=adderrtable.o
 
9
+       AC_MSG_CHECKING([for add_to_error_table])
 
10
+dnl
 
11
+dnl We may be using libcom_err from Kerberos (shared libraries), and
 
12
+dnl already have add_to_error_table
 
13
+dnl
 
14
+       AC_TRY_LINK_FUNC(add_to_error_table, have_adderr=yes, have_adderr=no)
 
15
+       if test $have_adderr != yes; then
 
16
+               AC_MSG_RESULT([no, adding adderrtable.o])
 
17
+               AKLOG_EXTRA_OBJ=adderrtable.o
 
18
+       else
 
19
+               AC_MSG_RESULT([yes])
 
20
+               AKLOG_EXTRA_OBJ=
 
21
+       fi
 
22
 else
 
23
        AC_MSG_RESULT([Setting compilation parameters for pre-AFS 3.5])
 
24
        AC_DEFINE(PRE_AFS35)