Revert to linking against pangowin32 under win32 platform (Owen Taylor).

2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>

        * configure.in: Revert to linking against pangowin32 under win32
	platform (Owen Taylor).

diff --git a/ChangeLog b/ChangeLog
index 3ea7dd734ed557b6a53b894b2383eebec707c5f8..e62be520a1cdfd8f4f73755b5000ad4529e1a696 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * configure.in: Revert to linking against pangowin32 under win32
+       platform (Owen Taylor).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * 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 3ea7dd734ed557b6a53b894b2383eebec707c5f8..e62be520a1cdfd8f4f73755b5000ad4529e1a696 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * configure.in: Revert to linking against pangowin32 under win32
+       platform (Owen Taylor).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * 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 3ea7dd734ed557b6a53b894b2383eebec707c5f8..e62be520a1cdfd8f4f73755b5000ad4529e1a696 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
+
+       * configure.in: Revert to linking against pangowin32 under win32
+       platform (Owen Taylor).
+
 2005-08-10  J. Ali Harlow  <ali@juiblex.co.uk>
 
        * gdk/win32/gdkfont-win32.c (gdk_font_from_description_for_display): Make

diff --git a/configure.in b/configure.in
index 3d7cbb75043bbe33c2abbaae0a2b62b2dd03a022..7201d40df1f207e64f72d680a1dc0a11eef67614 100644 (file)
--- 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