Index: configure
--- configure.orig	2001-09-06 04:22:17 +0200
+++ configure	2007-09-01 20:09:12 +0200
@@ -6217,7 +6217,7 @@
 
 	# Make sure it's recent enough
 	case "x$xml_version" in
-	    x2.2.[8-9]|x2.2.1[0-2]|x2.3.[0-9]|x2.3.1[0-9])
+	    x2.*)
 		echo "$ac_t""$xml_version ok" 1>&6
 		have_xml=yes
 		;;
Index: info/Makefile.in
--- info/Makefile.in.orig	2001-09-06 06:19:45 +0200
+++ info/Makefile.in	2007-09-01 20:04:59 +0200
@@ -180,7 +180,7 @@
 
 
 # things to install as data
-data_DATA = @ELVIN_DOC_PDF@ @ELVIN_DOC_PS@ @ELVIN_DOC_HTML@
+data_DATA =
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../src/include/elvin/config.h
 CONFIG_CLEAN_FILES = 
@@ -454,7 +454,7 @@
 
 # force build of pdf and html versions
 all-local: info-local
-info-local: @ELVIN_DOC_PDF@ @ELVIN_DOC_PS@ @ELVIN_DOC_HTML@
+info-local:
 
 # rules for building pdf and html versions
 elvin.html:elvin.texinfo
Index: src/include/elvin/packet_segments.h
--- src/include/elvin/packet_segments.h.orig	2001-05-02 06:44:50 +0200
+++ src/include/elvin/packet_segments.h	2007-09-01 20:04:59 +0200
@@ -65,12 +65,6 @@
 
 #define ELVIN_PACKET_SPECS_SIZE (256)
 
-/* For win32 and dll boundaries we hide this */
-#if !defined(ELVIN_WIN32) || defined(ELVIN_LIBVIN4_SOURCE)
-extern struct elvin_packet_spec elvin_packet_specs[];
-extern struct elvin_segment_spec elvin_segment_specs[];
-#endif
-
 /****************************************************************
  * Initialise the elvin_packet_spacs
  *
@@ -139,6 +133,12 @@
 #define elvin_get_segment_spot(ptype,stype) elvin_segment_specs[stype].spot[ptype]
 #endif
 
+/* For win32 and dll boundaries we hide this */
+#if !defined(ELVIN_WIN32) || defined(ELVIN_LIBVIN4_SOURCE)
+extern struct elvin_packet_spec elvin_packet_specs[];
+extern struct elvin_segment_spec elvin_segment_specs[];
+#endif
+
 /***************************************************************/
 #endif /* ELVIN_PACKET_SEGMENTS_H */