Accept also outfile name on command line, fopen it separately then. Needed

2002-02-07  Tor Lillqvist  <tml@iki.fi>

	* examples/pangoft2topgm.c (main): Accept also outfile name on
	command line, fopen it separately then. Needed on Windows where
	stdout is in text mode.

	* modules/arabic/Makefile.am
 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
	otherwise libtool won't produce DLLs, and there will be no such to
	install

11 files changed, 116 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 53a5ae88..64f3677e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 53a5ae88..64f3677e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+2002-02-07  Tor Lillqvist  <tml@iki.fi>
+
+	* examples/pangoft2topgm.c (main): Accept also outfile name on
+	command line, fopen it separately then. Needed on Windows where
+	stdout is in text mode.
+
+	* modules/arabic/Makefile.am
+ 	* modules/hebrew/Makefile.am: Use -no-undefined on Windows,
+	otherwise libtool won't produce DLLs, and there will be no such to
+	install
+
 Sat Feb  2 18:27:38 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* pango/Makefile.am (pango_querymodules_LDADD): Try removing
diff --git a/examples/pangoft2topgm.c b/examples/pangoft2topgm.c
index db5c0c3c..f00294f6 100644
--- a/examples/pangoft2topgm.c
+++ b/examples/pangoft2topgm.c
@@ -134,6 +134,7 @@ split_paragraphs (char *text)
 
 int main(int argc, char *argv[])
 {
+  FILE *outfile;
   int dpi_x = 100, dpi_y = 100;
   char *init_family = "sans";
   int init_scale = 24;
@@ -190,9 +191,9 @@ int main(int argc, char *argv[])
       exit(1);
     }
 
-  if (argp + 1 != argc)
+  if (argp + 1 != argc && argp + 2 != argc)
     {
-      fprintf (stderr, "Usage: %s [options] FILE\n", prog_name);
+      fprintf (stderr, "Usage: %s [options] FILE [OUTFILE]\n", prog_name);
       exit(1);
     }
 
@@ -202,6 +203,13 @@ int main(int argc, char *argv[])
   if (!text)
     exit(1);
 
+  if (argp < argc)
+    outfile = fopen (argv[argp++], "wb");
+  else
+    outfile = stdout;		/* Problematic if freetype outputs warnings
+				 * to stdout...
+				 */
+
   context = pango_ft2_get_context (dpi_x, dpi_y);
 
   paragraphs = split_paragraphs (text);
@@ -260,10 +268,11 @@ int main(int argc, char *argv[])
 	  }
 
 	  /* Write it as pgm to output */
-	  printf("P5\n"
-		 "%d %d\n"
-		 "255\n", bitmap.width, bitmap.rows);
-	  fwrite(bitmap.buffer, 1, bitmap.width * bitmap.rows, stdout);
+	  fprintf(outfile,
+		  "P5\n"
+		  "%d %d\n"
+		  "255\n", bitmap.width, bitmap.rows);
+	  fwrite(bitmap.buffer, 1, bitmap.width * bitmap.rows, outfile);
 	  g_free (buf);
 	}
     }
diff --git a/examples/renderdemo.c b/examples/renderdemo.c
index db5c0c3c..f00294f6 100644
--- a/examples/renderdemo.c
+++ b/examples/renderdemo.c
@@ -134,6 +134,7 @@ split_paragraphs (char *text)
 
 int main(int argc, char *argv[])
 {
+  FILE *outfile;
   int dpi_x = 100, dpi_y = 100;
   char *init_family = "sans";
   int init_scale = 24;
@@ -190,9 +191,9 @@ int main(int argc, char *argv[])
       exit(1);
     }
 
-  if (argp + 1 != argc)
+  if (argp + 1 != argc && argp + 2 != argc)
     {
-      fprintf (stderr, "Usage: %s [options] FILE\n", prog_name);
+      fprintf (stderr, "Usage: %s [options] FILE [OUTFILE]\n", prog_name);
       exit(1);
     }
 
@@ -202,6 +203,13 @@ int main(int argc, char *argv[])
   if (!text)
     exit(1);
 
+  if (argp < argc)
+    outfile = fopen (argv[argp++], "wb");
+  else
+    outfile = stdout;		/* Problematic if freetype outputs warnings
+				 * to stdout...
+				 */
+
   context = pango_ft2_get_context (dpi_x, dpi_y);
 
   paragraphs = split_paragraphs (text);
@@ -260,10 +268,11 @@ int main(int argc, char *argv[])
 	  }
 
 	  /* Write it as pgm to output */
-	  printf("P5\n"
-		 "%d %d\n"
-		 "255\n", bitmap.width, bitmap.rows);
-	  fwrite(bitmap.buffer, 1, bitmap.width * bitmap.rows, stdout);
+	  fprintf(outfile,
+		  "P5\n"
+		  "%d %d\n"
+		  "255\n", bitmap.width, bitmap.rows);
+	  fwrite(bitmap.buffer, 1, bitmap.width * bitmap.rows, outfile);
 	  g_free (buf);
 	}
     }
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 2c513133..a35a90af 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -77,6 +77,10 @@ FT2_INCLUDED=
 FT2_PREFIX=
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) $(FT2_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES)
 moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX)
@@ -96,7 +100,7 @@ pango_arabic_xft_la_SOURCES = $(xft_sources)
 
 libpango_arabic_xft_la_SOURCES = $(xft_sources)
 
-pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module
+pango_arabic_ft2_la_LDFLAGS = -export-dynamic -avoid-version -module $(no_undefined)
 pango_arabic_ft2_la_LIBADD = $(arabic_ft2_libadd)
 pango_arabic_ft2_la_SOURCES = $(ft2_sources)
 
diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am
index bb84cf29..aab8aace 100644
--- a/modules/hebrew/Makefile.am
+++ b/modules/hebrew/Makefile.am
@@ -61,6 +61,10 @@ FT2_INCLUDED=
 FT2_PREFIX=
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 noinst_LTLIBRARIES = $(X_INCLUDED) $(FT2_INCLUDED) $(XFT_INCLUDED)
 module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES)
 moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX)