# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1277177065 25200
# Node ID 0893fdbb3c0380cf0fdc8a05204f154bac76a8a1
# Parent  85d77d7b034b50d8af1de38fac0d7dba13e1a7fc
patch from Kenneth Berland for solaris

diff -r 85d77d7b034b -r 0893fdbb3c03 regression/regression-tests.bash
--- a/regression/regression-tests.bash	Fri May 07 12:07:46 2010 -0700
+++ b/regression/regression-tests.bash	Mon Jun 21 20:24:25 2010 -0700
@@ -68,10 +68,10 @@
             #$val ../src/readpst $jobs     -r    -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## separate mode with filename extensions
-            #$val ../src/readpst $jobs     -r -e -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+            $val ../src/readpst $jobs     -r -e -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## separate mode where we decode all attachments to binary files
-            $val ../src/readpst $jobs     -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
+            #$val ../src/readpst $jobs     -r -S -D -cv -o output$n -d $ba.log $fn >$ba.err 2>&1
 
             ## testing idblock
             #../src/getidblock -p $fn 0 >$ba.fulldump
@@ -101,6 +101,8 @@
 [ "$2" == "reg" ] && regression="yes"
 [ "$regression" == "yes" ] && val=""
 
+$func  24 paul.sheer.pst    # embedded rfc822 attachment
+exit
 $func   1 ams.pst
 $func   2 sample_64.pst
 $func   3 test.pst
@@ -124,6 +126,7 @@
 $func  21 rendgen3.pst      # mime signed email
 $func  22 rendgen4.pst      # appointment test cases
 $func  23 rendgen5.pst      # appointment test cases
+$func  24 paul.sheer.pst    # embedded rfc822 attachment
 
 [ -n "$val" ] && grep 'lost:' *err | grep -v 'lost: 0 '
 
diff -r 85d77d7b034b -r 0893fdbb3c03 src/Makefile.am
--- a/src/Makefile.am	Fri May 07 12:07:46 2010 -0700
+++ b/src/Makefile.am	Mon Jun 21 20:24:25 2010 -0700
@@ -6,12 +6,11 @@
 
 
 if OS_SOLARIS
-	POSIX_SEMANTICS = -D_POSIX_PTHREAD_SEMANTICS
-else
-	POSIX_SEMANTICS =
+    AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 endif
 
 
+
 if STATIC_TOOLS
     PSTLIB = @PST_OBJDIR@/libpst.a
 else
@@ -53,13 +52,6 @@
 dumpblocks_SOURCES  = dumpblocks.c     $(common_header)
 getidblock_SOURCES  = getidblock.c     $(common_header)
 
-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
@@ -82,7 +74,6 @@
         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)