AC_DEFINE(MOZ_PHOENIX)
;;
---- mozilla/extensions/tidy/spvalid/Makefile.in 2007-06-04 18:14:33.784020668 +0300
-+++ mozilla/extensions/tidy/spvalid/Makefile.in 2007-06-04 19:23:03.277335685 +0300
-@@ -49,7 +49,7 @@
- EXTRA_DSO_LDOPTS = \
- $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+--- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:38:53.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:49:39.434545403 +0300
+@@ -104,7 +104,7 @@
+
+ EXTRA_DSO_LDOPTS += \
$(NSPR_LIBS) \
- $(LIB_PREFIX)osp.$(LIB_SUFFIX) \
+ -losp \
$(NULL)
- LIBS = \
-@@ -64 +64 @@
+ include $(topsrcdir)/config/rules.mk
+--- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-04 23:49:39.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in 2007-09-04 23:50:13.205311926 +0300
+@@ -111,6 +111,6 @@
+
+ INCLUDES += -I$(srcdir)/../tidy/include
+ INCLUDES += -I$(srcdir)/../tidy/src
-INCLUDES += -I$(srcdir)/../opensp/include
-\ No newline at end of file
+INCLUDES += -I/usr/include/OpenSP
---- mozilla/extensions/tidy/spvalid/SpValid.cpp 2007-06-04 18:16:55.107230927 +0300
-+++ mozilla/extensions/tidy/spvalid/SpValid.cpp 2007-06-04 19:30:11.547080063 +0300
+ INCLUDES += -I$(srcdir)/.
+
+--- mozilla/extensions/tidy/src/Makefile.in~ 2007-09-05 01:41:08.000000000 +0300
++++ mozilla/extensions/tidy/src/Makefile.in 2007-09-05 12:21:13.420348101 +0300
+@@ -103,6 +103,7 @@
+ endif
+
+ EXTRA_DSO_LDOPTS += \
++ $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xpcom.so \
+ $(NSPR_LIBS) \
+ -losp \
+ $(NULL)
+--- mozilla/extensions/tidy/src/SpValid.cpp~ 2007-08-27 10:38:12.000000000 +0300
++++ mozilla/extensions/tidy/src/SpValid.cpp 2007-09-04 23:53:25.049666582 +0300
@@ -9,7 +9,7 @@
#ifdef WIN32
#include "../opensp/include/config.h"
#include <stdlib.h>
--#include "MessageEventHandler.h"\r
+-#include "../opensp/include/MessageEventHandler.h"
-#include "NsgmlsMessages.h"
--#include "sptchar.h"\r
+-#include "../opensp/include/sptchar.h"
+#include <OpenSP/MessageEventHandler.h>
+#include <OpenSP/nsgmls/NsgmlsMessages.h>
+#include <OpenSP/sptchar.h>
#include "SpValid.h"
- #include "InternalInputSource.h"\r
+-#include "../opensp/include/InternalInputSource.h"
++#include <OpenSP/InternalInputSource.h>
--#include "../lib/Parser.h"\r
+-#include "../opensp/include/Parser.h"
+#include <OpenSP/lib/Parser.h>
- ;\r
- #ifdef SP_NAMESPACE\r
- using namespace SP_NAMESPACE;\r
---- mozilla/extensions/tidy/src/Makefile.in 2007-06-04 18:19:42.941042959 +0300
-+++ mozilla/extensions/tidy/src/Makefile.in 2007-06-04 23:29:29.111109183 +0300
-@@ -82,8 +82,9 @@
- # separate libraries linked in.
- EXTRA_DSO_LDOPTS = \
- $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
-+ $(DIST)/lib/libxpcom_core.so \
- $(NSPR_LIBS) \
-- ../spvalid/$(LIB_PREFIX)osp.$(LIB_SUFFIX) \
-+ -losp \
- $(NULL)
-
- LIBS = \
---- mozilla/extensions/tidy/spvalid/SpValid.h~ 2007-06-04 19:30:14.137138981 +0300
-+++ mozilla/extensions/tidy/spvalid/SpValid.h 2007-06-04 19:30:15.877178562 +0300
-@@ -5,8 +5,8 @@
- #define Nsgmls_INCLUDED 1\r
- \r
- #include "SpResult.h"\r
--#include "ParserApp.h"\r
--#include "Boolean.h"\r
-+#include <OpenSP/ParserApp.h>\r
-+#include <OpenSP/Boolean.h>\r
#ifdef SP_NAMESPACE
using namespace SP_NAMESPACE;