Patches for OpenJade for Mac OS X

configure.patch

--- configure.orig	Fri Jan 25 10:36:25 2002
+++ configure	Tue Jun 11 15:59:35 2002
@@ -2877,8 +2877,8 @@
 test "$INSTALL" = "./config/install-sh -c" && INSTALL=`pwd`"/config/install-sh -c"
 
 case "${host}" in
-  *-*-darwin*)
-    LINKFLAGS="-no-undefined"
+  *darwin*)
+    LINKFLAGS="-allow-undefined"
     ;;
   *)
     if test "$GXX"
@@ -7835,11 +7835,11 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-undefined suppress -flat_namespace'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+    archive_cmds='$CXX $(test .$module = .yes && echo -bundle || echo  -dynamiclib) $allow_undefined_flag -o $lib $libs $libobjs $deplibs$linkopts -install_name $rpath/$soname $tmp_verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -9286,6 +9286,10 @@
 
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
+
+# The c++ compiler
+
+CXX=$ac_ct_CXX
 
 # The linker used to build libraries.
 LD=$lt_LD

GroveApp.h.patch

--- spgrove/GroveApp.h.orig	Sun May  2 21:57:37 1999
+++ spgrove/GroveApp.h	Tue Aug  5 11:27:44 2003
@@ -7,9 +7,9 @@
 #pragma interface
 #endif
 
-#include "ParserApp.h"
+#include <OpenSP/ParserApp.h>
 #include "GroveBuilder.h"
-#include "HashTable.h"
+#include <OpenSP/HashTable.h>
 
 #ifdef SP_NAMESPACE
 namespace SP_NAMESPACE {

GroveBuilder.cxx.patch

--- spgrove/GroveBuilder.cxx.orig	Sun Nov 17 03:01:12 2002
+++ spgrove/GroveBuilder.cxx	Tue Aug  5 11:27:44 2003
@@ -4,26 +4,24 @@
 // FIXME location for SgmlDocument node.
 
 #include "config.h"
-#include "Boolean.h"
+#include <OpenSP/Boolean.h>
 #include "Node.h"
-#include "Resource.h"
-#include "Ptr.h"
-#include "xnew.h"
-#include "Event.h"
+#include <OpenSP/Resource.h>
+#include <OpenSP/Ptr.h>
+#include <OpenSP/xnew.h>
+#include <OpenSP/Event.h>
 #include "GroveBuilder.h"
-#include "ErrorCountEventHandler.h"
-#include "OutputCharStream.h"
-#include "MessageFormatter.h"
-#include "Dtd.h"
-#include "Syntax.h"
-#include "Attribute.h"
-#include "Vector.h"
+#include <OpenSP/ErrorCountEventHandler.h>
+#include <OpenSP/OutputCharStream.h>
+#include <OpenSP/MessageFormatter.h>
+#include <OpenSP/Dtd.h>
+#include <OpenSP/Syntax.h>
+#include <OpenSP/Attribute.h>
+#include <OpenSP/Vector.h>
 #include "LocNode.h"
 #include "SdNode.h"
 #include "threads.h"
-#include "macros.h"
-#include <assert.h>
-#include <stdio.h>
+#include <OpenSP/macros.h>
 
 #ifdef _MSC_VER
 #pragma warning ( disable : 4250 ) // inherits via dominance

ltmain.sh.patch

--- config/ltmain.sh.orig	Thu Jan 17 08:45:52 2002
+++ config/ltmain.sh	Tue Jun 11 15:58:17 2002
@@ -2858,6 +2858,11 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+          if test "x$verstring" = "x0.0"; then
+            tmp_verstring=
+          else
+            tmp_verstring="$verstring"
+          fi
 	  eval cmds=\"$archive_cmds\"
 	fi
 	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
@@ -3913,10 +3918,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test $need_relink = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#	  if test "$installed" = no && test $need_relink = yes; then
+#	    $echo >> $output "\
+#relink_command=\"$relink_command\""
+#	  fi
 	done
       fi

Makefile.lib.in.patch

--- Makefile.lib.in.orig	Tue Jan 22 06:57:53 2002
+++ Makefile.lib.in	Tue Jun 11 15:54:36 2002
@@ -23,7 +23,7 @@
 	echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
 
 lib$(LIB).la: $(LT_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
 	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
 
 install:

Makefile.prog.in.patch

--- Makefile.prog.in.orig	Tue Jan 22 06:57:53 2002
+++ Makefile.prog.in	Tue Jun 11 15:54:36 2002
@@ -12,14 +12,14 @@
 
 ALL_LIBS = $(XLIBS) $(LIBS)
 Makefile.lt:
-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+	echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
 
 PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
 
 all: $(PROG)
 
 $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
-	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
+	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(LIBS)
 
 install: $(PROG)
 	-test -d $(DESTDIR)$(bindir) || \

Node.h.patch

--- grove/Node.h.orig	Mon Oct 21 06:47:24 2002
+++ grove/Node.h	Tue Aug  5 11:27:44 2003
@@ -8,7 +8,8 @@
 #endif
 
 #include <stddef.h>
-#include "IList.h"
+#include <limits.h>
+#include <OpenSP/IList.h>
 
 #ifdef SP_USE_DLL
 #ifdef BUILD_LIBGROVE
@@ -34,10 +35,10 @@
 #endif
 
 #ifdef SP_MULTI_BYTE
-#ifdef SP_WCHAR_T_USHORT
-typedef wchar_t GroveChar;
-#else
+#if UINT_MAX >= 0xffffffffL /* 2^32 - 1 */
 typedef unsigned int GroveChar;
+#else
+typedef unsigned long GroveChar;
 #endif
 #else /* not SP_MULTI_BYTE */
 typedef unsigned char GroveChar;