Attachment 195641 Details for Bug 285701 – modified patch to correctly determine expat version

[patch] modified patch to correctly determine expat version

gettext-xglade-include-expat-285701.patch (text/plain), 1.83 KB, created by Nils Philippsen on 2007-09-14 09:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nils Philippsen

Created: 2007-09-14 09:37:04 UTC

Size: 1.83 KB

patch

obsolete

>diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
>--- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
>+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 10:26:08.000000000 +0200
>@@ -234,8 +234,11 @@ case "$host_os" in
>   linux*)
>     AC_DEFINE([DYNLOAD_LIBEXPAT], 1,
>       [Define to 1 if libexpat shall be dynamically loaded via dlopen().])
>+    AC_DEFINE([HAVE_LIBEXPAT], 1, [Define if you have the expat library.])
>+    HAVE_LIBEXPAT=yes
>     LIBEXPAT="-ldl"
>     LTLIBEXPAT="-ldl"
>+    AC_SUBST(HAVE_LIBEXPAT)
>     AC_SUBST(LIBEXPAT)
>     AC_SUBST(LTLIBEXPAT)
>     ;;
>diff -up gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~ gettext-0.16.1/gettext-tools/src/x-glade.c
>--- gettext-0.16.1/gettext-tools/src/x-glade.c.4-expat~	2006-11-27 18:02:08.000000000 +0100
>+++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-14 10:57:41.000000000 +0200
>@@ -28,10 +28,9 @@
> #include <string.h>
> #if DYNLOAD_LIBEXPAT
> # include <dlfcn.h>
>-#else
>-# if HAVE_LIBEXPAT
>-#  include <expat.h>
>-# endif
>+#endif
>+#if HAVE_LIBEXPAT
>+# include <expat.h>
> #endif
> 
> #include "message.h"
>@@ -111,6 +110,8 @@ init_keywords ()
> 
> #if DYNLOAD_LIBEXPAT
> 
>+#ifndef XmlParse_INCLUDED
>+#ifndef Expat_INCLUDED
> typedef void *XML_Parser;
> typedef char XML_Char;
> typedef char XML_LChar;
>@@ -119,6 +120,8 @@ typedef void (*XML_StartElementHandler) 
> typedef void (*XML_EndElementHandler) (void *userData, const XML_Char *name);
> typedef void (*XML_CharacterDataHandler) (void *userData, const XML_Char *s, int len);
> typedef void (*XML_CommentHandler) (void *userData, const XML_Char *data);
>+#endif
>+#endif
> 
> static XML_Parser (*p_XML_ParserCreate) (const XML_Char *encoding);
> static void (*p_XML_SetElementHandler) (XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);

Actions: View | Diff

Attachments on bug 285701: 195641 | 195661 | 195801 | 195821