1 --- pango-0.24/configure.in~ Tue Feb 5 07:14:16 2002
2 +++ pango-0.24/configure.in Tue Feb 5 07:14:16 2002
8 -#if test "x$with_fribidi" = "xyes" ; then
9 -# AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
10 -# if test x$FRIBIDI_CONFIG = xno ; then
11 -# AC_MSG_ERROR([*** fribidi-config not found])
14 -# if $FRIBIDI_CONFIG --cflags | grep lib/glib/include > /dev/null ; then
15 -# AC_MSG_ERROR([*** fribidi appears to be compiled against GLib-1.2.x.
16 -# *** You must compile fribidi with GLib-1.3.1 or better.])
19 -# FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
20 -# CFLAGS="$CFLAGS $FRIBIDI_CFLAGS"
21 -# FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
22 -# FRIBIDI_PC="fribidi,"
24 -# AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :,
25 -# AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
27 -# AC_DEFINE(HAVE_FRIBIDI)
31 +if test "x$with_fribidi" = "xyes" ; then
32 + AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no)
33 + if test x$FRIBIDI_CONFIG = xno ; then
34 + AC_MSG_ERROR([*** fribidi-config not found])
37 + if $FRIBIDI_CONFIG --cflags | grep lib/glib/include > /dev/null ; then
38 + AC_MSG_ERROR([*** fribidi appears to be compiled against GLib-1.2.x.
39 + *** You must compile fribidi with GLib-1.3.1 or better.])
42 + FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`"
43 + CFLAGS="$CFLAGS $FRIBIDI_CFLAGS"
44 + FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`"
45 + FRIBIDI_PC="fribidi,"
47 + AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :,
48 + AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS)
50 + AC_DEFINE(HAVE_FRIBIDI)
54 AC_SUBST(FRIBIDI_LIBS)
55 AC_SUBST(FRIBIDI_CFLAGS)
56 --- pango-0.24/pango/Makefile.am~ Tue Feb 5 07:16:15 2002
57 +++ pango-0.24/pango/Makefile.am Tue Feb 5 07:16:15 2002
62 +libpango_la_LIBADD = $(FRIBIDI_LIBS)
64 FRIBIDI_SUBDIR = mini-fribidi