diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | configure.in | 50 | ||||
| -rw-r--r-- | pango/mini-fribidi/README | 2 |
10 files changed, 89 insertions, 35 deletions
@@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 92a7b132..c4becbb0 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +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. + 2001-11-24 Manish Singh <yosh@gimp.org> * acconfig.h @@ -12,15 +12,6 @@ You'll need a fairly capable implementation of iconv() - for instance the iconv from the GNU C library version 2.1 -Pango can optionally be compiled to use Dov Grobgeld's FriBidi -library. This is available from: - - http://fribidi.sourceforge.net - -If the --with-fribidi option is not given to configure, then -Pango will use internal copies of the FriBidi routines. -No functionality will be lost by using the internal routines. - Notes ===== 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) diff --git a/pango/mini-fribidi/README b/pango/mini-fribidi/README index 245f7c3a..90f31cdd 100644 --- a/pango/mini-fribidi/README +++ b/pango/mini-fribidi/README @@ -38,7 +38,7 @@ Downloading =========== The latest version of FriBidi may be found at: - http://imagic.weizmann.ac.il/~dov/freesw/FriBidi + http://fribidi.sourceforge.net Notes ===== |