configure.in Fix a few typos that prevented build on Win32.

2005-07-25  Tor Lillqvist  <tml@novell.com>

	* configure.in
	* pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Fix
	a few typos that prevented build on Win32.

	* pango/pango.def: Add pango_is_zero_width.

6 files changed, 26 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index d0e16f06..1d7fb359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,21 @@
+2005-07-25  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in
+	* pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Fix
+	a few typos that prevented build on Win32.
+
+	* pango/pango.def: Add pango_is_zero_width.
+
 2005-07-23  Behdad Esfahbod  <pango@behdad.org>
 
-	* pango/pango-utils.c, pango/pango-utils.h (pango_is_zerowidth): New
+	* pango/pango-utils.c, pango/pango-utils.h (pango_is_zero_width): New
 	function added.
 
 	* modules/basic/basic-common.h, modules/basic/basic-fc.c,
 	modules/basic/basic-win32.c, modules/basic/basic-x.c,
 	modules/hangul/hangul-fc.c, modules/arabic/arabic-fc.c,
 	modules/indic/indic-fc.c, modules/indic/indic-ot.h,
-	modules/syriac/syriac-fc.c:  Use the new pango_is_zerowidth function.
+	modules/syriac/syriac-fc.c:  Use the new pango_is_zero_width function.
 	(#306639, Behnam Esfahbod)
 
 2005-07-22  Owen Taylor  <otaylor@redhat.com>
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index d0e16f06..1d7fb359 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,13 +1,21 @@
+2005-07-25  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in
+	* pango/pangocairo-win32font.c (_pango_cairo_win32_font_new): Fix
+	a few typos that prevented build on Win32.
+
+	* pango/pango.def: Add pango_is_zero_width.
+
 2005-07-23  Behdad Esfahbod  <pango@behdad.org>
 
-	* pango/pango-utils.c, pango/pango-utils.h (pango_is_zerowidth): New
+	* pango/pango-utils.c, pango/pango-utils.h (pango_is_zero_width): New
 	function added.
 
 	* modules/basic/basic-common.h, modules/basic/basic-fc.c,
 	modules/basic/basic-win32.c, modules/basic/basic-x.c,
 	modules/hangul/hangul-fc.c, modules/arabic/arabic-fc.c,
 	modules/indic/indic-fc.c, modules/indic/indic-ot.h,
-	modules/syriac/syriac-fc.c:  Use the new pango_is_zerowidth function.
+	modules/syriac/syriac-fc.c:  Use the new pango_is_zero_width function.
 	(#306639, Behnam Esfahbod)
 
 2005-07-22  Owen Taylor  <otaylor@redhat.com>
diff --git a/configure.in b/configure.in
index ab8ae4e5..520b8f9d 100644
--- a/configure.in
+++ b/configure.in
@@ -509,13 +509,13 @@ dnl ********************************************************
 # Note that -module isn't included here since automake needs to see it to know
 # that something like pango-arabic-fc.la is a valid libtool archive
 #
-if test "$os_win32" != yes; then
+if test "$pango_os_win32" != yes; then
     # libtool option to control which symbols are exported
     # right now, symbols starting with _ are not exported
     LIBRARY_LIBTOOL_OPTIONS="-version-info $LT_VERSION_INFO "'-export-symbols-regex "^pango_.*"'
     MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version "'-export-symbols-regex "^script_engine_.*"'
 else
-    # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
+    # We currently use .def files on Windows
     LIBRARY_LIBTOOL_OPTIONS="-version-info $LT_VERSION_INFO -no-undefined"
     MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version -no-undefined"
 fi
diff --git a/pango/pango.def b/pango/pango.def
index d1e3c08a..6b30d60c 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -175,6 +175,7 @@ EXPORTS
 	pango_glyph_string_new
 	pango_glyph_string_set_size
 	pango_glyph_string_x_to_index
+	pango_is_zero_width
 	pango_item_copy
 	pango_item_free
 	pango_item_new
diff --git a/pango/pangocairo-win32.h b/pango/pangocairo-win32.h
index cc458314..5efceb3f 100644
--- a/pango/pangocairo-win32.h
+++ b/pango/pangocairo-win32.h
@@ -1,5 +1,5 @@
 /* Pango
- * pangocairo-win32.h: Private header file for Cairo/fontconfig combination
+ * pangocairo-win32.h: Private header file for Cairo/Win32 combination
  *
  * Copyright (C) 2005 Red Hat, Inc.
  *
diff --git a/pango/pangocairo-win32font.c b/pango/pangocairo-win32font.c
index 8493d8f8..c548b933 100644
--- a/pango/pangocairo-win32font.c
+++ b/pango/pangocairo-win32font.c
@@ -1,5 +1,5 @@
 /* Pango
- * pangocairowin32-font.c: Cairo font handling, fontconfig backend
+ * pangocairowin32-font.c: Cairo font handling, Win32 backend
  *
  * Copyright (C) 2000-2005 Red Hat Software
  *
@@ -350,7 +350,7 @@ _pango_cairo_win32_font_new (PangoCairoWin32FontMap     *cwfontmap,
 				     win32font->size,
 				     &win32font->logfont);
 
-  cffont->options = cairo_font_options_copy (_pango_cairo_context_get_merged_font_options (context));
+  cwfont->options = cairo_font_options_copy (_pango_cairo_context_get_merged_font_options (context));
   
   return PANGO_FONT (cwfont);
 }