|
|
9fae6fa |
diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
|
|
|
9fae6fa |
--- gettext-0.16.1/gettext-tools/configure.ac.4-expat~ 2006-11-27 18:02:01.000000000 +0100
|
|
|
a4b92ea |
+++ gettext-0.16.1/gettext-tools/configure.ac 2007-09-14 15:03:43.000000000 +0200
|
|
|
9fae6fa |
@@ -238,6 +238,22 @@ case "$host_os" in
|
|
|
9fae6fa |
LTLIBEXPAT="-ldl"
|
|
|
9fae6fa |
AC_SUBST(LIBEXPAT)
|
|
|
9fae6fa |
AC_SUBST(LTLIBEXPAT)
|
|
|
9fae6fa |
+ AC_CHECK_HEADER([expat.h],[
|
|
|
9fae6fa |
+ cat > xml_major_version.c << EOF
|
|
|
9fae6fa |
+#include <stdio.h>
|
|
|
9fae6fa |
+#include <expat.h>
|
|
|
9fae6fa |
+int main (void) { printf ("%d\n", XML_MAJOR_VERSION); }
|
|
|
9fae6fa |
+EOF
|
|
|
9fae6fa |
+ AC_MSG_CHECKING([for libexpat XML_MAJOR_VERSION])
|
|
|
9fae6fa |
+ $CC -o xml_major_version xml_major_version.c
|
|
|
9fae6fa |
+ XML_MAJOR_VERSION=$(./xml_major_version)
|
|
|
9fae6fa |
+ rm -f ./xml_major_version ./xml_major_version.c
|
|
|
9fae6fa |
+ AC_MSG_RESULT([$XML_MAJOR_VERSION])
|
|
|
9fae6fa |
+ AC_SUBST(XML_MAJOR_VERSION)
|
|
|
a4b92ea |
+ AC_DEFINE_UNQUOTED([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
|
|
|
9fae6fa |
+ ],[
|
|
|
9fae6fa |
+ AC_ERROR([cannot determine version of expat library, expat.h is missing])
|
|
|
9fae6fa |
+ ])
|
|
|
9fae6fa |
;;
|
|
|
9fae6fa |
*)
|
|
|
9fae6fa |
AC_LIB_HAVE_LINKFLAGS([expat], [],
|
|
|
4a37c3f |
diff -up gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~ gettext-0.16.1/gettext-tools/src/x-glade.c
|
|
|
4a37c3f |
--- gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~ 2006-11-27 18:02:08.000000000 +0100
|
|
|
4a37c3f |
+++ gettext-0.16.1/gettext-tools/src/x-glade.c 2007-09-14 15:46:23.000000000 +0200
|
|
|
4a37c3f |
@@ -114,6 +114,7 @@ init_keywords ()
|
|
|
4a37c3f |
typedef void *XML_Parser;
|
|
|
4a37c3f |
typedef char XML_Char;
|
|
|
4a37c3f |
typedef char XML_LChar;
|
|
|
4a37c3f |
+typedef unsigned long XML_Size;
|
|
|
4a37c3f |
enum XML_Error { XML_ERROR_NONE };
|
|
|
4a37c3f |
typedef void (*XML_StartElementHandler) (void *userData, const XML_Char *name, const XML_Char **atts);
|
|
|
4a37c3f |
typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);
|