diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-26 03:39:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-26 03:39:43 +0000 |
| commit | 03fdd403f8b401f59bcca1c162ab953cfc63d27d (patch) | |
| tree | dc795c4c510535c4c1a923a32eadcd98a78af414 /configure.in | |
| parent | 05ab07e19ac7ee4caedf9a4d4db762921ccf5f35 (diff) | |
| download | pango-03fdd403f8b401f59bcca1c162ab953cfc63d27d.tar.gz | |
Disable --with-fribidi; it offers no advantages and until either fribidi
Sun Nov 25 22:35:46 2001 Owen Taylor <otaylor@redhat.com>
* configure.in (have_fribidi) README: Disable --with-fribidi; it offers
no advantages and until either fribidi is updated to use Glib-2.0
always, or the Glib dependecy is removed from fribidi entirely, there
will be problems with this option.
* pango/mini-fribidi/README: Update fribidi URL.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/configure.in b/configure.in index f01a82bf..2c2e828b 100644 --- a/configure.in +++ b/configure.in @@ -193,35 +193,35 @@ AC_SUBST(GLIB_CFLAGS) # # Checks for fribidi # -AC_ARG_WITH(fribidi, [ --with-fribidi Use external fribidi library ],,with_fribidi=no) - +#AC_ARG_WITH(fribidi, [ --with-fribidi Use external fribidi library ],,with_fribidi=no) +# FRIBIDI_LIBS="" FRIBIDI_CFLAGS="" FRIBIDI_PC="" have_fribidi=no - -if test "x$with_fribidi" = "xyes" ; then - AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no) - if test x$FRIBIDI_CONFIG = xno ; then - AC_MSG_ERROR([*** fribidi-config not found]) - fi - - if $FRIBIDI_CONFIG --cflags | grep lib/glib/include > /dev/null ; then - AC_MSG_ERROR([*** fribidi appears to be compiled against GLib-1.2.x. - *** You must compile fribidi with GLib-1.3.1 or better.]) - fi - - FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`" - CFLAGS="$CFLAGS $FRIBIDI_CFLAGS" - FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`" - FRIBIDI_PC="fribidi," - - AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :, - AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS) - - AC_DEFINE(HAVE_FRIBIDI) - have_fribidi=yes -fi +# +#if test "x$with_fribidi" = "xyes" ; then +# AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no) +# if test x$FRIBIDI_CONFIG = xno ; then +# AC_MSG_ERROR([*** fribidi-config not found]) +# fi +# +# if $FRIBIDI_CONFIG --cflags | grep lib/glib/include > /dev/null ; then +# AC_MSG_ERROR([*** fribidi appears to be compiled against GLib-1.2.x. +# *** You must compile fribidi with GLib-1.3.1 or better.]) +# fi +# +# FRIBIDI_CFLAGS="`$FRIBIDI_CONFIG --cflags`" +# CFLAGS="$CFLAGS $FRIBIDI_CFLAGS" +# FRIBIDI_LIBS="`$FRIBIDI_CONFIG --libs`" +# FRIBIDI_PC="fribidi," +# +# AC_CHECK_LIB(fribidi, fribidi_get_mirror_char, :, +# AC_MSG_ERROR([*** libfribidi not found.]), $FRIBIDI_LIBS) +# +# AC_DEFINE(HAVE_FRIBIDI) +# have_fribidi=yes +#fi AC_SUBST(FRIBIDI_LIBS) AC_SUBST(FRIBIDI_CFLAGS) |