--- /dev/null
+--- src/Makefile.in.orig 2005-10-11 19:50:29.000000000 +1000
++++ src/Makefile.in 2005-10-11 19:54:00.000000000 +1000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(libtwinkle_a_SOURCES) $(twinkle_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,7 +65,7 @@
+ am_twinkle_OBJECTS = main.$(OBJEXT)
+ twinkle_OBJECTS = $(am_twinkle_OBJECTS)
+ am__DEPENDENCIES_1 =
+-twinkle_DEPENDENCIES = $(top_builddir)/src/libtwinkle.a \
++twinkle_DEPENDENCIES = libtwinkle.a \
+ $(top_builddir)/src/parser/libsipparser.a \
+ $(top_builddir)/src/sdp/libsdpparser.a \
+ $(top_builddir)/src/sockets/libsocket.a \
+@@ -166,6 +164,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -201,7 +200,7 @@
+ AM_CPPFLAGS = -DDATADIR=\"$(pkgdatadir)\"
+ noinst_LIBRARIES = libtwinkle.a
+ twinkle_SOURCES = main.cpp
+-twinkle_LDADD = $(top_builddir)/src/libtwinkle.a\
++twinkle_LDADD = libtwinkle.a\
+ $(top_builddir)/src/parser/libsipparser.a\
+ $(top_builddir)/src/sdp/libsdpparser.a\
+ $(top_builddir)/src/sockets/libsocket.a\
+--- src/Makefile.am.orig 2005-10-11 19:50:19.000000000 +1000
++++ src/Makefile.am 2005-10-11 19:51:00.000000000 +1000
+@@ -10,7 +10,7 @@
+
+ twinkle_SOURCES = main.cpp
+
+-twinkle_LDADD = $(top_builddir)/src/libtwinkle.a\
++twinkle_LDADD = libtwinkle.a\
+ $(top_builddir)/src/parser/libsipparser.a\
+ $(top_builddir)/src/sdp/libsdpparser.a\
+ $(top_builddir)/src/sockets/libsocket.a\
+--- src/parser/Makefile.am.orig 2005-10-11 19:53:10.000000000 +1000
++++ src/parser/Makefile.am 2005-10-11 19:53:24.000000000 +1000
+@@ -7,7 +7,7 @@
+ # With the -O2 flag g++ crashes. The -O2 flag is stripped from
+ # CXXFLAGS by configure.
+
+-CXXFLAGS = @PARSER_CXXFLAGS@
++# CXXFLAGS = @PARSER_CXXFLAGS@
+
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+--- src/parser/Makefile.in.orig 2005-10-11 20:01:34.000000000 +1000
++++ src/parser/Makefile.in 2005-10-11 20:01:54.000000000 +1000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libsipparser_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -120,11 +118,7 @@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-
+-# The output of bison cannot be compiled with the -O2 flag.
+-# With the -O2 flag g++ crashes. The -O2 flag is stripped from
+-# CXXFLAGS by configure.
+-CXXFLAGS = @PARSER_CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -171,6 +165,7 @@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+@@ -205,6 +200,12 @@
+ AM_YFLAGS = -d
+ AM_LFLAGS = -is
+
++# The output of bison cannot be compiled with the -O2 flag.
++# With the -O2 flag g++ crashes. The -O2 flag is stripped from
++# CXXFLAGS by configure.
++
++# CXXFLAGS = @PARSER_CXXFLAGS@
++
+ # This target is only for testing the parser in isolation
+ # noinst_PROGRAMS = sipparse
+