# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1273259266 25200
# Node ID 85d77d7b034b50d8af1de38fac0d7dba13e1a7fc
# Parent  5a82d41c883da01af9074dbaa68c35c85611e9da
another patche from Kenneth Berland for solaris

diff -r 5a82d41c883d -r 85d77d7b034b ChangeLog
--- a/ChangeLog	Thu May 06 15:28:46 2010 -0700
+++ b/ChangeLog	Fri May 07 12:07:46 2010 -0700
@@ -1,4 +1,4 @@
-LibPST 0.6.47 (2010-05-06)
+LibPST 0.6.47 (2010-05-07)
 ===============================
     * patches from Kenneth Berland for solaris.
     * fix output file name numbering to start at 1 rather than 2.
diff -r 5a82d41c883d -r 85d77d7b034b configure.in
--- a/configure.in	Thu May 06 15:28:46 2010 -0700
+++ b/configure.in	Fri May 07 12:07:46 2010 -0700
@@ -35,6 +35,20 @@
 
 
 
+# Check for solaris
+AC_MSG_CHECKING([for Solaris])
+case "$host" in
+    *solaris*)
+        os_solaris=yes
+        ;;
+    *)
+        os_solaris=no
+        ;;
+esac
+AC_MSG_RESULT($os_solaris)
+AM_CONDITIONAL(OS_SOLARIS, [test "$os_solaris" = "yes"])
+
+
 # Check for win32
 AC_MSG_CHECKING([for Win32])
 case "$host" in
diff -r 5a82d41c883d -r 85d77d7b034b libpst.spec.in
--- a/libpst.spec.in	Thu May 06 15:28:46 2010 -0700
+++ b/libpst.spec.in	Fri May 07 12:07:46 2010 -0700
@@ -146,7 +146,7 @@
 
 
 %changelog
-* Thu May 06 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.47-1
+* Fri May 07 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.47-1
 - patches from Kenneth Berland for solaris
 
 * Thu Jan 21 2010 Carl Byington <carl@five-ten-sg.com> - 0.6.46-1
diff -r 5a82d41c883d -r 85d77d7b034b src/Makefile.am
--- a/src/Makefile.am	Thu May 06 15:28:46 2010 -0700
+++ b/src/Makefile.am	Fri May 07 12:07:46 2010 -0700
@@ -4,12 +4,21 @@
     NO_UNDEFINED =
 endif
 
+
+if OS_SOLARIS
+	POSIX_SEMANTICS = -D_POSIX_PTHREAD_SEMANTICS
+else
+	POSIX_SEMANTICS =
+endif
+
+
 if STATIC_TOOLS
     PSTLIB = @PST_OBJDIR@/libpst.a
 else
     PSTLIB = libpst.la
 endif
 
+
 common_header = common.h        \
                 define.h        \
                 libpst.h        \
@@ -44,13 +53,13 @@
 dumpblocks_SOURCES  = dumpblocks.c     $(common_header)
 getidblock_SOURCES  = getidblock.c     $(common_header)
 
-lspst_CFLAGS        = $(AM_CFLAGS)
-readpst_CFLAGS      = $(AM_CFLAGS)
-pst2ldif_CFLAGS     = $(AM_CFLAGS)
-pst2dii_CFLAGS      = $(AM_CFLAGS)
-deltasearch_CFLAGS  = $(AM_CFLAGS)
-dumpblocks_CFLAGS   = $(AM_CFLAGS)
-getidblock_CFLAGS   = $(AM_CFLAGS)
+lspst_CFLAGS        = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+readpst_CFLAGS      = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+pst2ldif_CFLAGS     = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+pst2dii_CFLAGS      = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+deltasearch_CFLAGS  = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+dumpblocks_CFLAGS   = $(AM_CFLAGS) $(POSIX_SEMANTICS)
+getidblock_CFLAGS   = $(AM_CFLAGS) $(POSIX_SEMANTICS)
 
 lspst_DEPENDENCIES        = libpst.la
 readpst_DEPENDENCIES      = libpst.la
@@ -73,6 +82,7 @@
         timeconv.h  \
         vbuf.h
     libpst_la_LDFLAGS     = $(NO_UNDEFINED) -version-info @LIBPST_VERSION_INFO@
+	libpst_la_CFLAGS      = $(AM_CFLAGS) $(POSIX_SEMANTICS)
 endif
 
 libpst_la_SOURCES     = $(common_source) $(common_header)
diff -r 5a82d41c883d -r 85d77d7b034b src/readpst.c
--- a/src/readpst.c	Thu May 06 15:28:46 2010 -0700
+++ b/src/readpst.c	Fri May 07 12:07:46 2010 -0700
@@ -1278,7 +1278,13 @@
     fprintf(f_output, "PRODID:LibPST v%s\n", VERSION);
     if (method) fprintf(f_output, "METHOD:%s\n", method);
     fprintf(f_output, "BEGIN:VEVENT\n");
-    if (sender) fprintf(f_output, "ORGANIZER;CN=\"%s\":MAILTO:%s\n", item->email->outlook_sender_name.str, sender);
+    if (sender) {
+        if (item->email->outlook_sender_name.str) {
+	    fprintf(f_output, "ORGANIZER;CN=\"%s\":MAILTO:%s\n", item->email->outlook_sender_name.str, sender);
+	} else {
+	    fprintf(f_output, "ORGANIZER;CN=\"\":MAILTO:%s\n", sender);
+	}
+    }
     write_appointment(f_output, item);
     fprintf(f_output, "END:VCALENDAR\n");
 }