| [c5c522c] | 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 |
|---|
| 4 | @@ -9,7 +9,7 @@ |
|---|
| 5 | ############################################################################## |
|---|
| 6 | |
|---|
| 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 |
|---|
| 10 | |
|---|
| 11 | EXTRA_DIST = bootstrap ChangeLog.old |
|---|
| 12 | |
|---|
| 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 |
|---|
| 16 | @@ -165,38 +165,38 @@ |
|---|
| 17 | AM_CONDITIONAL(FRIBIDI_CHARSETS, test x$FRIBIDI_CHARSETS = x1) |
|---|
| 18 | |
|---|
| 19 | # --with[out]-glib |
|---|
| 20 | -AC_ARG_WITH(glib, |
|---|
| 21 | - AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], |
|---|
| 22 | - [use Glib @<:@default=auto@:>@])) |
|---|
| 23 | -GLIB_PACKAGE=glib-2.0 |
|---|
| 24 | -GLIB_MINVERSION=2.4 |
|---|
| 25 | +#AC_ARG_WITH(glib, |
|---|
| 26 | +# AC_HELP_STRING([--with-glib=@<:@no/auto/yes@:>@], |
|---|
| 27 | +# [use Glib @<:@default=auto@:>@])) |
|---|
| 28 | +#GLIB_PACKAGE=glib-2.0 |
|---|
| 29 | +#GLIB_MINVERSION=2.4 |
|---|
| 30 | GLIB_LIBS= |
|---|
| 31 | GLIB_CFLAGS= |
|---|
| 32 | -if test x$with_glib = xyes; then |
|---|
| 33 | - PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION) |
|---|
| 34 | - FRIBIDI_USE_GLIB=1 |
|---|
| 35 | -else |
|---|
| 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) |
|---|
| 39 | +# FRIBIDI_USE_GLIB=1 |
|---|
| 40 | +#else |
|---|
| 41 | +#if test x$with_glib = xno; then |
|---|
| 42 | FRIBIDI_USE_GLIB=0 |
|---|
| 43 | -else |
|---|
| 44 | - PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION, |
|---|
| 45 | - FRIBIDI_USE_GLIB=1, |
|---|
| 46 | - FRIBIDI_USE_GLIB=0) |
|---|
| 47 | -fi |
|---|
| 48 | -fi |
|---|
| 49 | -if test x$FRIBIDI_USE_GLIB = x0; then |
|---|
| 50 | +#else |
|---|
| 51 | +# PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION, |
|---|
| 52 | +# FRIBIDI_USE_GLIB=1, |
|---|
| 53 | +# FRIBIDI_USE_GLIB=0) |
|---|
| 54 | +#fi |
|---|
| 55 | +#fi |
|---|
| 56 | +#if test x$FRIBIDI_USE_GLIB = x0; then |
|---|
| 57 | GLIB_PACKAGE= |
|---|
| 58 | -fi |
|---|
| 59 | +#fi |
|---|
| 60 | AC_SUBST(FRIBIDI_USE_GLIB) |
|---|
| 61 | AM_CONDITIONAL(FRIBIDI_USE_GLIB, test x$FRIBIDI_USE_GLIB = x1) |
|---|
| 62 | |
|---|
| 63 | |
|---|
| 64 | -MISC_CFLAGS="$GLIB_CFLAGS" |
|---|
| 65 | -MISC_LIBS="$GLIB_LIBS" |
|---|
| 66 | -MISC_PACKAGES="$GLIB_PACKAGE" |
|---|
| 67 | -AC_SUBST(MISC_CFLAGS) |
|---|
| 68 | -AC_SUBST(MISC_LIBS) |
|---|
| 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) |
|---|
| 74 | +#AC_SUBST(MISC_LIBS) |
|---|
| 75 | +#AC_SUBST(MISC_PACKAGES) |
|---|
| 76 | |
|---|
| 77 | # Generate output |
|---|
| 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 |
|---|
| 81 | @@ -7,7 +7,6 @@ |
|---|
| 82 | |
|---|
| 83 | Name: @PACKAGE_NAME@ |
|---|
| 84 | Description: Unicode Bidirectional Algorithm Library |
|---|
| 85 | -Requires: @MISC_PACKAGES@ |
|---|
| 86 | Version: @VERSION@ |
|---|
| 87 | Libs: -L${libdir} -lfribidi |
|---|
| 88 | Cflags: -I${includedir}/@PACKAGE@ |
|---|
