diff -urN pwlib/make/unix.mak pwlib-modified/make/unix.mak
--- pwlib/make/unix.mak	2002-10-02 23:12:45.000000000 -0500
+++ pwlib-modified/make/unix.mak	2002-11-05 00:03:52.000000000 -0600
@@ -652,8 +652,6 @@
 ifeq ($(CPUTYPE),crusoe)
 STDCCFLAGS	+= -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -malign-functions=0 
 STDCCFLAGS      += -malign-jumps=0 -malign-loops=0
-else
-STDCCFLAGS	+= -mcpu=$(CPUTYPE)
 endif
 endif
 endif
@@ -1250,7 +1248,7 @@
 
 else
 
-OPTCCFLAGS	+= -O3 -DNDEBUG
+OPTCCFLAGS	+= -DNDEBUG
 #OPTCCFLAGS	+= -DP_USE_INLINES=1
 #OPTCCFLAGS	+= -fconserve-space
 ifneq ($(OSTYPE),Carbon)
@@ -1262,26 +1260,9 @@
 
 endif # DEBUG
 
-
-# define OpenSSL variables if installed
-ifndef OPENSSLDIR
-
-ifneq (,$(wildcard $(SYSINCDIR)/openssl))
-OPENSSLDIR := $(SYSINCDIR)
-export OPENSSLDIR
-endif
-
-ifneq (,$(wildcard /usr/local/ssl))
-OPENSSLDIR := /usr/local/ssl
-export OPENSSLDIR
-endif
-
-endif
-
 ifdef  OPENSSLDIR
 ifneq (,$(wildcard $(OPENSSLDIR)))
-STDCCFLAGS	+= -DP_SSL -I$(OPENSSLDIR)/include -I$(OPENSSLDIR)/crypto
-LDFLAGS		+= -L$(OPENSSLDIR)/lib -L$(OPENSSLDIR)
+STDCCFLAGS	+= -DP_SSL
 ENDLDLIBS	+= -lssl -lcrypto
 HAS_OPENSSL	= 1
 endif
@@ -1295,18 +1276,9 @@
 STDCCFLAGS	+= -DP_EXPAT
 endif
 
-ifneq (,$(wildcard /usr/local/include/expat.h))
-HAS_EXPAT	= 1
-ENDLDLIBS	+= -lexpat
-STDCCFLAGS	+= -DP_EXPAT -I /usr/local/include
-LDFLAGS		+= -L /usr/local/lib
-endif
-
-
 # define ESDDIR variables if installed
 ifdef  ESDDIR
-STDCCFLAGS	+= -I$(ESDDIR)/include
-ENDLDLIBS	+= $(ESDDIR)/lib/libesd.a  # to avoid name conflicts
+ENDLDLIBS	+= -lesd  # to avoid name conflicts
 HAS_ESD		= 1
 endif
 
@@ -1328,8 +1300,7 @@
 #STDCCFLAGS     += -fno-implement-inlines
 
 # add OS directory to include path
-STDCCFLAGS	+= -I$(UNIX_INC_DIR)
-
+STDCCFLAGS     += -I$(UNIX_INC_DIR)
 
 # add library directory to library path and include the library
 LDFLAGS		+= -L$(PW_LIBDIR)
diff -urN pwlib/src/ptclib/pxmlrpcs.cxx pwlib-modified/src/ptclib/pxmlrpcs.cxx
--- pwlib/src/ptclib/pxmlrpcs.cxx	2002-10-02 03:54:01.000000000 -0500
+++ pwlib-modified/src/ptclib/pxmlrpcs.cxx	2002-11-05 00:12:30.000000000 -0600
@@ -195,4 +195,5 @@
   return reply;
 }
 
-#endif
\ No newline at end of file
+#endif
+