1 diff -u fribidi.orig/Makefile.am fribidi/Makefile.am
2 --- fribidi.orig/Makefile.am 2005-08-25 20:35:34.000000000 +0200
3 +++ fribidi/Makefile.am 2008-01-28 14:31:19.000000000 +0100
5 ##############################################################################
7 ## The order of subdirs is important, don't change without a reason.
8 -SUBDIRS = gen.tab charset lib bin doc test
9 +SUBDIRS = gen.tab charset lib #bin doc test
11 EXTRA_DIST = bootstrap ChangeLog.old
13 diff -u fribidi.orig/configure.ac fribidi/configure.ac
14 --- fribidi.orig/configure.ac 2008-01-16 00:15:46.000000000 +0100
15 +++ fribidi/configure.ac 2008-01-28 14:32:38.000000000 +0100
17 AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1)
21 - AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
22 - [use Glib @<:@default=auto@:>@]))
23 -GLIB_PACKAGE=glib-2.0
26 +# AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@],
27 +# [use Glib @<:@default=auto@:>@]))
28 +#GLIB_PACKAGE=glib-2.0
32 -if test x$with_glib = xyes; then
33 - PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
36 -if test x$with_glib = xno; then
37 +#if test x$with_glib = xyes; then
38 +# PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
41 +#if test x$with_glib = xno; then
44 - PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
49 -if test x$FRIBIDI_USE_GLIB = x0; then
51 +# PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
52 +# FRIBIDI_USE_GLIB=1,
53 +# FRIBIDI_USE_GLIB=0)
56 +#if test x$FRIBIDI_USE_GLIB = x0; then
60 AC_SUBST(FRIBIDI_USE_GLIB)
61 AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1)
64 -MISC_CFLAGS="$GLIB_CFLAGS"
65 -MISC_LIBS="$GLIB_LIBS"
66 -MISC_PACKAGES="$GLIB_PACKAGE"
67 -AC_SUBST(MISC_CFLAGS)
69 -AC_SUBST(MISC_PACKAGES)
70 +#MISC_CFLAGS="$GLIB_CFLAGS"
71 +#MISC_LIBS="$GLIB_LIBS"
72 +#MISC_PACKAGES="$GLIB_PACKAGE"
73 +#AC_SUBST(MISC_CFLAGS)
75 +#AC_SUBST(MISC_PACKAGES)
78 AC_CONFIG_FILES([fribidi.pc
79 --- fribidi.orig/fribidi.pc.in 2008-02-02 23:06:05.000000000 +0000
80 +++ fribidi/fribidi.pc.in 2008-02-02 23:06:39.000000000 +0000
84 Description: Unicode Bidirectional Algorithm Library
85 -Requires: @MISC_PACKAGES@
87 Libs: -L${libdir} -lfribidi
88 Cflags: -I${includedir}/@PACKAGE@
89 --- fribidi.orig/lib/fribidi-common.h 2008-02-04 21:30:46.000000000 +0000
90 +++ fribidi/lib/fribidi-common.h 2008-02-04 21:32:25.000000000 +0000
93 /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
95 -# if (defined(WIN32)) || (defined(_WIN32_WCE))
96 -# define FRIBIDI_ENTRY __declspec(dllimport)
98 # define FRIBIDI_ENTRY /* empty */
100 #endif /* !FRIBIDI_ENTRY */
102 #if FRIBIDI_USE_GLIB+0