diff --git a/ChangeLog b/ChangeLog index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c6c07abd5..d369b3d956 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Aug 8 21:53:16 2002 Owen Taylor + + * configure.in: Consistently order pangoxft / pangox + in pkg-config calls in hopes of reducing problems + (Eric Mader.) + 2002-08-07 Matthias Clasen * gtk/gtkmain.c (gtk_init): Fix doc comment. diff --git a/configure.in b/configure.in index b3a80e3200..bf2b7f8e3f 100644 --- a/configure.in +++ b/configure.in @@ -943,7 +943,7 @@ if test "x$gdktarget" = "xx11"; then ## be sure we also have Pango built with xft support if $PKG_CONFIG --exists pangoxft ; then - PANGO_PACKAGES="pangox pangoxft" + PANGO_PACKAGES="pangoxft pangox" have_xft=true AC_DEFINE(HAVE_XFT) if $have_freetype ; then