# Stop aclocal moaning about invalid header names. Was surprised
# that Linux wasn't moaning about the same thing. SunFreeware provides
# autoconf 2.63, which is more recent than the 2.59 shipped with SLES10.
#
diff -udNr cyrus-imapd-2.3.14/cmulocal/cyrus.m4 cyrus-imapd/cmulocal/cyrus.m4
--- cyrus-imapd-2.3.14/cmulocal/cyrus.m4	2003-10-08 21:35:24.000000000 +0100
+++ cyrus-imapd/cmulocal/cyrus.m4	2009-03-26 20:17:45.000000000 +0000
@@ -11,10 +11,10 @@
 dnl (so the runpath for shared libraries is set).
 AC_DEFUN([CMU_ADD_LIBPATH], [
   # this is CMU ADD LIBPATH
-  if test "$andrew_runpath_switch" = "none" ; then
+  if test "$andrew_cv_runpath_switch" = "none" ; then
 	LDFLAGS="-L$1 ${LDFLAGS}"
   else
-	LDFLAGS="-L$1 $andrew_runpath_switch$1 ${LDFLAGS}"
+	LDFLAGS="-L$1 $andrew_cv_runpath_switch$1 ${LDFLAGS}"
   fi
 ])
 
@@ -22,24 +22,24 @@
 dnl (so the runpath for shared libraries is set).
 AC_DEFUN([CMU_ADD_LIBPATH_TO], [
   # this is CMU ADD LIBPATH TO
-  if test "$andrew_runpath_switch" = "none" ; then
+  if test "$andrew_cv_runpath_switch" = "none" ; then
 	$2="-L$1 ${$2}"
   else
-	$2="-L$1 ${$2} $andrew_runpath_switch$1"
+	$2="-L$1 ${$2} $andrew_cv_runpath_switch$1"
   fi
 ])
 
 dnl runpath initialization
 AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
    # CMU GUESS RUNPATH SWITCH
-  AC_CACHE_CHECK(for runpath switch, andrew_runpath_switch, [
+  AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [
     # first, try -R
     SAVE_LDFLAGS="${LDFLAGS}"
     LDFLAGS="-R /usr/lib"
-    AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
+    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
   	LDFLAGS="-Wl,-rpath,/usr/lib"
-    AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
-    [andrew_runpath_switch="none"])
+    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
+    [andrew_cv_runpath_switch="none"])
     ])
   LDFLAGS="${SAVE_LDFLAGS}"
   ])])
diff -udNr cyrus-imapd-2.3.14/configure.in cyrus-imapd/configure.in
--- cyrus-imapd-2.3.14/configure.in	2008-10-09 00:28:58.000000000 +0100
+++ cyrus-imapd/configure.in	2009-03-26 20:17:16.000000000 +0000
@@ -653,25 +653,25 @@
 
 dnl for makedepend and AFS.
 cant_find_sigvec=no
-AC_CACHE_VAL(cyrus_sigveclib,[
+AC_CACHE_VAL(cyrus_cv_sigveclib,[
  dnl bsd classic flavor
  AC_CHECK_FUNC(sigvec, [
-	cyrus_sigveclib=""
+	cyrus_cv_sigveclib=""
   ], [
   dnl hp flavor
-  AC_CHECK_LIB(BSD, sigvec, cyrus_sigveclib="-lBSD", [
+  AC_CHECK_LIB(BSD, sigvec, cyrus_cv_sigveclib="-lBSD", [
     dnl not hp flavor
     SAVE_LDFLAGS="$LDFLAGS"
     dnl solaris flavor
     LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
     AC_CHECK_LIB(ucb, sigvec, [
       dnl more solaris flavor
-      cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
+      cyrus_cv_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"],
       [ cant_find_sigvec=yes ])
     LDFLAGS="$SAVE_LDFLAGS"])
   ])
 ])
-AC_SUBST(cyrus_sigveclib)
+AC_SUBST(cyrus_cv_sigveclib)
 
 # ok, we still look for this stuff because of checking groups, but
 # all authentication goes through SASL
@@ -701,7 +701,7 @@
       AFS_LIBS="$AFS_LIBS -lc -lucb"
     fi
 
-    AC_CACHE_VAL(cyrus_afs_sigvec,[
+    AC_CACHE_VAL(cyrus_cv_afs_sigvec,[
         SAVE_LIBS="$LIBS"
         LIBS="${with_afs}/lib/liblwp.a"
         AC_MSG_CHECKING(if AFS libraries need sigvec)
@@ -712,18 +712,18 @@
                 [
                         dnl it linked; don't need it
                         AC_MSG_RESULT(no)
-                        cyrus_afs_sigvec="no"
+                        cyrus_cv_afs_sigvec="no"
                 ], [
                         dnl didn't link; pick up sigvec
                         AC_MSG_RESULT(yes)
-                        cyrus_afs_sigvec="yes"
+                        cyrus_cv_afs_sigvec="yes"
                 ])
         ])
-    if test "$cyrus_afs_sigvec" = yes; then
+    if test "$cyrus_cv_afs_sigvec" = yes; then
       if test "$cant_find_sigvec" = yes; then
         AC_MSG_WARN([Can't find a sigvec for AFS libraries which seem to need one.])
       else
-        AFS_LIBS="${AFS_LIBS} $cyrus_sigveclib"
+        AFS_LIBS="${AFS_LIBS} $cyrus_cv_sigveclib"
         AC_SUBST(AFS_LIBS)
         AC_SUBST(AFS_LDFLAGS)
         AC_DEFINE(HAVE_AFSKRB,[],[Should we build afskrb pts module?])
@@ -833,18 +833,18 @@
 dnl if we were ambitious, we'd look more aggressively for the
 dnl krb4 install
 if test -d ${with_krb}; then
-   AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [
+   AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [
      for krbhloc in include/kerberosIV include
      do
        if test -f ${with_krb}/${krbhloc}/krb.h ; then
-         cyrus_krbinclude=${with_krb}/${krbhloc}
+         cyrus_cv_krbinclude=${with_krb}/${krbhloc}
          break
        fi
      done
      ])
 
-   if test -n "${cyrus_krbinclude}"; then
-     CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
+   if test -n "${cyrus_cv_krbinclude}"; then
+     CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}"
    fi
    CMU_ADD_LIBPATH(${with_krb}/lib)
 fi