ticket-applet ./configure.in src/Makefile.am sr...

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    ticket-applet
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/09/30 18:20:42

Modified files:
        .              : configure.in 
        src            : Makefile.am krb-util.c krb-util.h 

Log message:
        Shishi port.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/ticket-applet/configure.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/ticket-applet/src/Makefile.am.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/ticket-applet/src/krb-util.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/ticket-applet/src/krb-util.h.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: ticket-applet/configure.in
diff -u ticket-applet/configure.in:1.1 ticket-applet/configure.in:1.2
--- ticket-applet/configure.in:1.1      Tue Sep 30 18:10:44 2003
+++ ticket-applet/configure.in  Tue Sep 30 18:20:42 2003
@@ -55,6 +55,20 @@
 PACKAGE_PIXMAPS_DIR=${prefix}/${DATADIRNAME}/pixmaps
 AC_SUBST(PACKAGE_PIXMAPS_DIR)
 
+AC_ARG_WITH(shishi,
+       AC_HELP_STRING([--without-shishi], [Disable Shishi unconditionally]),
+       shishi=$withval, shishi=yes)
+if test x$shishi != xno ; then
+  PKG_CHECK_MODULES(SHISHI, shishi >= 0.0.7, shishi=yes, shishi=no)
+fi
+AM_CONDITIONAL(SHISHI, test x$shishi = xyes)
+
+if test x$shishi = xyes ; then
+  CPPFLAGS="$SHISHI_CFLAGS $CPPFLAGS"
+  CFLAGS="$SHISHI_CFLAGS $CFLAGS"
+  LDFLAGS="$SHISHI_LIBS $LDFLAGS"
+else
+
 default_krb="/usr/kerberos"
 
 AC_ARG_WITH(krb5,
@@ -97,6 +111,7 @@
 
 AC_SUBST(KRB5)
 AC_SUBST(KRBAFS)
+fi
 
 AC_OUTPUT([
 Makefile
Index: ticket-applet/src/Makefile.am
diff -u ticket-applet/src/Makefile.am:1.1 ticket-applet/src/Makefile.am:1.2
--- ticket-applet/src/Makefile.am:1.1   Tue Sep 30 18:10:44 2003
+++ ticket-applet/src/Makefile.am       Tue Sep 30 18:20:42 2003
@@ -4,7 +4,6 @@
 ticket_applet_2_SOURCES =         \
        ticket_applet.c \
        ticket_applet.h \
-       krb-util.c      \
        krb-util.h      \
        properties.c    \
        properties.h    \
@@ -17,6 +16,11 @@
        egg-screen-url.c        \
        egg-screen-url.h
 
+if SHISHI
+ticket_applet_2_SOURCES += shishi-util.c
+else
+ticket_applet_2_SOURCES += krb-util.c
+endif
 
 uidir           = $(datadir)/gnome-2.0/ui
 ui_DATA         = GNOME_TicketApplet.xml
Index: ticket-applet/src/krb-util.c
diff -u ticket-applet/src/krb-util.c:1.1 ticket-applet/src/krb-util.c:1.2
--- ticket-applet/src/krb-util.c:1.1    Tue Sep 30 18:10:44 2003
+++ ticket-applet/src/krb-util.c        Tue Sep 30 18:20:42 2003
@@ -25,6 +25,8 @@
 
 #include "krb-util.h"
 
+#include <krb5.h>
+
 #ifdef DO_KRB524
 #include <kerberosIV/krb.h>
 #endif
Index: ticket-applet/src/krb-util.h
diff -u ticket-applet/src/krb-util.h:1.1 ticket-applet/src/krb-util.h:1.2
--- ticket-applet/src/krb-util.h:1.1    Tue Sep 30 18:10:44 2003
+++ ticket-applet/src/krb-util.h        Tue Sep 30 18:20:42 2003
@@ -21,11 +21,10 @@
 #ifndef KRB_UTIL_H_
 #define KRB_UTIL_H_
 
-#include <krb5.h>
 #include <string.h>
 
 typedef struct _krb_error {
-  krb5_error_code code;
+  int code;
   char message[255];
 } krb_error;