- solved build with external expat

Changed files:
    audacity-system-expat.patch -> 1.3

diff --git a/audacity-system-expat.patch b/audacity-system-expat.patch
index 9dedb1176d63dff5279bd64c33c1b9cc81fdbeab..6fc333cad51fd1d2202cdacec47cb170312e9690 100644 (file)
--- a/audacity-system-expat.patch
+++ b/audacity-system-expat.patch
@@ -1,17 +1,7 @@
---- audacity-src-1.1.3/src/xml/XMLFileReader.h.wiget   Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/src/xml/XMLFileReader.h Fri Mar 28 01:37:22 2003
-@@ -8,7 +8,7 @@
- 
- **********************************************************************/
- 
--#include "xmlparse/xmlparse.h"
-+#include <expat.h>
- 
- #include "XMLTagHandler.h"
- 
---- audacity-src-1.1.3/configure.in.wiget      Thu Mar 20 05:38:07 2003
-+++ audacity-src-1.1.3/configure.in    Fri Mar 28 01:37:56 2003
-@@ -87,9 +87,7 @@
+diff -aurN audacity-src-1.2.0-pre2.orig/configure.in audacity-src-1.2.0-pre2/configure.in
+--- audacity-src-1.2.0-pre2.orig/configure.in  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/configure.in       2003-10-16 20:27:11.645349856 +0200
+@@ -88,9 +88,7 @@
  dnl Required sublibraries
  dnl
  
@@ -22,23 +12,36 @@
  
  dnl TODO enable/disable allegro
  BUILDLIBS="$BUILDLIBS allegro/allegro.a"
-@@ -486,7 +484,7 @@
+@@ -656,7 +654,7 @@
+ esac
  
- AC_CONFIG_HEADER(src/configunix.h:src/configtemplate.h)
  AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \
--                                        lib-src/allegro/Makefile lib-src/expat/Makefile
-+                                        lib-src/allegro/Makefile 
-                                           locale/Makefile tests/Makefile])
+-                                        lib-src/allegro/Makefile lib-src/expat/Makefile \
++                                        lib-src/allegro/Makefile \
+                                         lib-src/libnyquist/Makefile \
+                                         locale/Makefile tests/Makefile])
+ 
+diff -aurN audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h audacity-src-1.2.0-pre2/src/commands/CommandManager.h
+--- audacity-src-1.2.0-pre2.orig/src/commands/CommandManager.h 2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/src/commands/CommandManager.h      2003-10-16 20:27:11.650349096 +0200
+@@ -43,6 +43,7 @@
+ #include <wx/hashmap.h>
+ 
+ #include "../xml/XMLTagHandler.h"
++#include <expat.h>
+ 
+ class CommandFunctor
+ {
+diff -aurN audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h
+--- audacity-src-1.2.0-pre2.orig/src/xml/XMLFileReader.h       2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/src/xml/XMLFileReader.h    2003-10-16 20:27:52.144193096 +0200
+@@ -8,7 +8,8 @@
  
- AC_CONFIG_SUBDIRS([$SUBDIRS])
---- audacity-src-1.1.3/src/commands/CommandsReader.h.wigett    Fri Mar 28 16:34:56 2003
-+++ audacity-src-1.1.3/src/commands/CommandsReader.h   Fri Mar 28 16:35:10 2003
-@@ -13,7 +13,7 @@
- #ifndef __AUDACITY_COMMANDS_READER__
- #define __AUDACITY_COMMANDS_READER__
+ **********************************************************************/
  
 -#include "xmlparse/xmlparse.h"
++/*#include "xmlparse/xmlparse.h"*/
 +#include <expat.h>
- #include "CommandsMenu.h"
  
- struct CommandsTranslationItem
+ #include "XMLTagHandler.h"
+