which included commits to RCS files with non-trunk default branches.
git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@146
cbed1d16-5ef5-0310-b6a1-
d4a37b08ba1f
[com_err="$withval"], [com_err=yes])
if test "$com_err" != no; then
if test "$com_err" != yes; then
[com_err="$withval"], [com_err=yes])
if test "$com_err" != no; then
if test "$com_err" != yes; then
- CPPFLAGS="$CPPFLAGS -I$com_err/include"
+ if test -f $com_err/include/krb5/com_right.h; then
+ CPPFLAGS="$CPPFLAGS -I$com_err/include/krb5"
+ else
+ CPPFLAGS="$CPPFLAGS -I$com_err/include"
+ fi
LDFLAGS="$LDFLAGS -L$com_err/lib"
LDFLAGS="$LDFLAGS -L$com_err/lib"
+ else
+ if test -f /usr/include/krb5/com_right.h; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/krb5"
+ fi
fi
AC_CHECK_LIB(com_err, com_err, :,
[AC_MSG_ERROR(com_err library not found)])
fi
AC_CHECK_LIB(com_err, com_err, :,
[AC_MSG_ERROR(com_err library not found)])
[AC_ARG_WITH(ss,
[ --with-ss=PREFIX Specify location of ss (requires com_err)],
[ss="$withval"], [ss=yes])
[AC_ARG_WITH(ss,
[ --with-ss=PREFIX Specify location of ss (requires com_err)],
[ss="$withval"], [ss=yes])
-if test "$ss" != no; then
- if test "$ss" != yes; then
- CPPFLAGS="$CPPFLAGS -I$ss/include"
- LDFLAGS="$LDFLAGS -L$ss/lib"
+if test "$ss" = no; then
+ AC_MSG_ERROR(This package requires ss.)
+fi
+if test "$ss" != yes; then
+ CPPFLAGS="$CPPFLAGS -I$ss/include"
+ if test -f $ss/include/krb5/sl.h; then
+ CPPFLAGS="$CPPFLAGS -I$ss/include/krb5"
- AC_CHECK_LIB(ss, ss_perror, :,
- [unset ac_cv_lib_ss_ss_perror
- AC_CHECK_LIB(ss, ss_perror, :,
- [AC_MSG_ERROR(ss library not found)],
- -ledit -lroken -ltermcap -lcom_err)],
- -lcom_err)
+ LDFLAGS="$LDFLAGS -L$ss/lib"
- AC_MSG_ERROR(This package requires ss.)
-fi])
+ if test -f /usr/include/krb5/sl.h; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/krb5"
+ fi
+fi
+AC_CHECK_HEADERS(ss/ss.h krb5/ss.h)
+
+AC_CHECK_LIB(ss, ss_perror, [SS_LIBS="-lss"],
+ [unset ac_cv_lib_ss_ss_perror
+ S="-ledit -lroken -ltermcap -lcom_err -lcrypt"
+ AC_CHECK_LIB(ss, ss_perror,
+ [SS_LIBS="-lss $S"],
+ [AC_MSG_ERROR(ss library not found)],
+ $S)],
+ -lcom_err)
+AC_SUBST(SS_LIBS)])
dnl ----- Regular expressions -----
dnl ----- Regular expressions -----
#include <sysdep.h>
#include <zephyr/zephyr.h>
#include <sysdep.h>
#include <zephyr/zephyr.h>
+#else
+# ifdef HAVE_KRB5_SS_H
+# include <krb5/ss.h>
+# endif
+#endif
#include <com_err.h>
#include <pwd.h>
#include <netdb.h>
#include <com_err.h>
#include <pwd.h>
#include <netdb.h>
char *krealm, *cksum_start, *cstart, *cend;
ZChecksum_t checksum;
CREDENTIALS cred;
char *krealm, *cksum_start, *cstart, *cend;
ZChecksum_t checksum;
CREDENTIALS cred;
- extern unsigned long des_quad_cksum();
if (notice->z_dest_galaxy && *notice->z_dest_galaxy) {
for (i=0; i<__ngalaxies; i++) {
if (notice->z_dest_galaxy && *notice->z_dest_galaxy) {
for (i=0; i<__ngalaxies; i++) {