From 4682009053ea7886c6ec128da7e4758cffbc673e Mon Sep 17 00:00:00 2001 From: "J. Ali Harlow" Date: Wed, 10 Aug 2005 13:22:33 +0000 Subject: [PATCH] Revert to linking against pangowin32 under win32 platform (Owen Taylor). 2005-08-10 J. Ali Harlow * configure.in: Revert to linking against pangowin32 under win32 platform (Owen Taylor). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 6 +++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ea7dd734e..e62be520a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * configure.in: Revert to linking against pangowin32 under win32 + platform (Owen Taylor). + 2005-08-10 J. Ali Harlow * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3ea7dd734e..e62be520a1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * configure.in: Revert to linking against pangowin32 under win32 + platform (Owen Taylor). + 2005-08-10 J. Ali Harlow * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3ea7dd734e..e62be520a1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-08-10 J. Ali Harlow + + * configure.in: Revert to linking against pangowin32 under win32 + platform (Owen Taylor). + 2005-08-10 J. Ali Harlow * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make diff --git a/configure.in b/configure.in index 3d7cbb7504..7201d40df1 100644 --- a/configure.in +++ b/configure.in @@ -1344,7 +1344,11 @@ fi # Check for Pango flags -PANGO_PACKAGES="pango pangocairo" +if test "x$gdktarget" = "xwin32"; then + PANGO_PACKAGES="pangowin32 pangocairo" +else + PANGO_PACKAGES="pango pangocairo" +fi AC_MSG_CHECKING(Pango flags) if $PKG_CONFIG --exists $PANGO_PACKAGES ; then