Dia compilation on Solaris with Forte C; some portability musings

[Tor Lillqvist <tml iki fi>]

Hi,

It's not very surprising that it might be hard to build CVS HEAD Dia
out-of-the-box using somehing as complex as cross-compilation for
mingw on Linux, when it doesn't build out-of-the-box even on a common
Unix like Solaris... Luckily, not many changes are necessary. Patch
below. Would it be OK to commit to CVS?

Another thing: At home I also tried a bit to build Dia for Win32 using
auto*/libtool/gcc/etc. At first I was surprised how smoothly
everything was going, but some nontrivial problems did creep up. The
one that is now blocking me is that linking the Dia "objects" (as
DLLs) failes because they refer to symbols in libdia (which will be
part of dia.exe).

Unlike ELF shared objects, DLLs can't have undefined symbols. (This
means that similar problems will creep up when people try to build Dia
on non-ELF Unixes, too.) All external symbols must be marked as being
imported from a named DLL (or EXE, even, in which case the DLL in
question of course can be used only by that EXE).

Now, Hans has solved this when building with MSVC by building libdia
as a DLL. But if you want to build with auto*/libtool/gcc, you can't
easily set it up like to do that, unless libdia is set up in the
Makefile.am as producing a shared library also on Unix. (I think.)
Would this be a bad idea?

Sigh, it seems like the old model of thought "all the World is a VAX"
(referring to people who thought if some software builds on BSD on a
VAX, it is OK, which was very irritating for us
SunOS/HP-UX/IRIX/AIX/whatever users) has reincarnated as "all the
World is Linux on the i386" ;-)

Cheers,
--tml

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/dia/ChangeLog,v
retrieving revision 1.1047
diff -u -2 -r1.1047 ChangeLog
--- ChangeLog	1 Sep 2002 21:51:52 -0000	1.1047
+++ ChangeLog	4 Sep 2002 08:43:57 -0000
@@ -1,2 +1,36 @@
+2002-09-04  Tor Lillqvist  <tml@iki.fi>
+
+	* configure.in: Check for both pangoft2 (using PKG_CHECK_MODULES,
+	as before) and -lfreetype (using AC_CHECK_LIB). At least on
+	Solaris with Sun's compiler (Forte C), you need to link also the
+	dia application with -lfreetype, even if it is implicitly linked
+	to by -lpangoft2. Rename FREETYPE_CFLAGS and _LIBS to PANGOFT2_*,
+	which is what they actually mean. Use FREETYPE_LIBS for -lfreetype.
+
+	Fix a couple of bashisms.
+
+	AC_SUBST also Z_LIBS, need to link the dia application to -lz,
+	too, on Solaris with Forte C.
+
+	Don't try to use the gcc flags with other compilers. 
+	DIA_CHECK_CFLAG gives a false indication that Forte C understands
+	the gcc -f switches, but in fact they get interpreted meaning
+	something completely different.
+
+	Define the automake conditional HAVE_CGC.
+	
+	* app/Makefile.am (dia_LDADD): Add Z_LIBS and FREETYPE_LIBS.
+
+	Use -export-dynamic only with gcc.
+
+	* */Makefile.am
+	* */*/Makefile.am: Modify according to the
+	FREETYPE_CFLAGS -> PANGOFT2_CFLAGS rename.
+
+	* lib/dia_xml.c: Define isinf() for Forte C.
+
+	* lib/paper.c: Workaround for gccism: Can't use inline this way with
+	Forte C, either.
+
 2002-09-01  Lars Clausen  <lrclause@cs.uiuc.edu>
 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/dia/configure.in,v
retrieving revision 1.169
diff -u -2 -r1.169 configure.in
--- configure.in	7 Aug 2002 08:17:25 -0000	1.169
+++ configure.in	4 Sep 2002 08:43:57 -0000
@@ -55,9 +55,18 @@
 
 GTK_MODULES="gtk+-2.0 libxml-2.0 gdk-pixbuf-2.0"
-PKG_CHECK_MODULES(FREETYPE,pangoft2,have_freetype=true,have_freetype=false)
-if test "$have_freetype" = "true"; then
-  GTK_MODULES="$GTK_MODULES pangoft2"
-  AC_DEFINE(HAVE_FREETYPE,1,[Define if building with pangoft2])
-else
+PKG_CHECK_MODULES(PANGOFT2,pangoft2,have_pangoft2=true,have_pangoft2=false)
+if test "$have_pangoft2" = "true"; then
+  dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
+  dnl It's not enough that -lpangoft2 implicitly pulls it in.
+  have_freetype=false
+  AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=true)
+  if test "$have_freetype" = "true"; then
+    FREETYPE_LIBS=-lfreetype
+    AC_SUBST(FREETYPE_LIBS)
+    GTK_MODULES="$GTK_MODULES pangoft2"
+    AC_DEFINE(HAVE_FREETYPE,1,[Define if building with pangoft2])
+  fi
+fi
+if test "$have_pangoft2" = "false"; then
   GTK_MODULES="$GTK_MODULES pango"
 fi
@@ -91,5 +100,5 @@
 dnl XSLT
 
-export XSLT_DIR=""
+XSLT_DIR=""
 PKG_CHECK_MODULES(XSLT, libxslt, have_xslt=true, have_xslt=false)
 AM_CONDITIONAL(HAVE_XSLT, $have_xslt)
@@ -171,5 +180,5 @@
 
 found_libxml=false
-if ! $found_libxml; then
+if test $found_libxml = false; then
   AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
   if test "x$XML2_CONFIG" != x ; then
@@ -199,5 +208,5 @@
 fi
 
-if ! $found_libxml; then
+if test $found_libxml = false; then
 AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config)
 if test "x$XML_CONFIG" != x ; then
@@ -217,5 +226,5 @@
 fi
 
-if ! $found_libxml; then
+if test $found_libxml = false; then
     AC_MSG_ERROR(Neither libxml1 or libxml2 found. You must install one (libxml1, preferably))
 fi
@@ -237,4 +246,6 @@
         fi]))
 
+AC_SUBST(Z_LIBS)
+
 CFLAGS="${CFLAGS} ${Z_CFLAGS}"
 LIBS="${LIBS} ${Z_LIBS}"
@@ -281,22 +292,25 @@
 esac
 
-DIA_CHECK_CFLAG(-Wall)
-DIA_CHECK_CFLAG(-Wunused)
-DIA_CHECK_CFLAG(-Winline)
-DIA_CHECK_CFLAG(-Wmissing-prototypes)
-DIA_CHECK_CFLAG(-Wmissing-declarations)
-
-dnl Relieve register pressure on i386. Other architectures may become unable
-dnl to debug, and usually have more registers anyway.
-dnl case "$host" in 
-dnl  i?86-pc-*)
-dnl    DIA_CHECK_CFLAG(-fomit-frame-pointer)
-dnl    ;;
-dnl esac
-dnl (it looks like gdb is very confused by this now even on x86. We might be
-dnl getting poor stack traces with bug-buddy because of this)
+if test "$GCC" = yes; then
+  dnl Relieve register pressure on i386. Other architectures may become unable
+  dnl to debug, and usually have more registers anyway.
+  dnl case "$host" in 
+  dnl  i?86-pc-*)
+  dnl    DIA_CHECK_CFLAG(-fomit-frame-pointer)
+  dnl    ;;
+  dnl esac
+  dnl (it looks like gdb is very confused by this now even on x86. We might be
+  dnl getting poor stack traces with bug-buddy because of this)
+
+  DIA_CHECK_CFLAG(-Wall)
+  DIA_CHECK_CFLAG(-Wunused)
+  DIA_CHECK_CFLAG(-Winline)
+  DIA_CHECK_CFLAG(-Wmissing-prototypes)
+  DIA_CHECK_CFLAG(-Wmissing-declarations)
+  DIA_CHECK_CFLAG(-finline-functions)
+  DIA_CHECK_CFLAG(-fstrict-aliasing)
+fi
 
-DIA_CHECK_CFLAG(-finline-functions)
-DIA_CHECK_CFLAG(-fstrict-aliasing)
+AM_CONDITIONAL(HAVE_GCC, test "$GCC" = yes)
 
 dnl Do we have the db2html script to build the documentation?
Index: app/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/app/Makefile.am,v
retrieving revision 1.93
diff -u -2 -r1.93 Makefile.am
--- app/Makefile.am	16 Jul 2002 21:28:23 -0000	1.93
+++ app/Makefile.am	4 Sep 2002 08:43:57 -0000
@@ -153,5 +153,5 @@
 dia_LDADD = ../lib/libdia.a \
 	$(EFENCE) \
-	$(APP_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
+	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
 
 #diaconv_LDADD = ../lib/libdia.a \
@@ -171,5 +171,7 @@
 #$(BONOBO_LIBS)
 
+if HAVE_GCC
 LDFLAGS = -export-dynamic
+endif
 
 EXTRA_DIST = \
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/lib/Makefile.am,v
retrieving revision 1.52
diff -u -2 -r1.52 Makefile.am
--- lib/Makefile.am	14 Aug 2002 20:57:29 -0000	1.52
+++ lib/Makefile.am	4 Sep 2002 08:43:57 -0000
@@ -118,5 +118,5 @@
 INCLUDES = -I$(top_srcdir)/intl $(DEBUG_FLAGS) $(GDK_PIXBUF_CFLAGS) \
   $(XML_CFLAGS) $(GNOME_CFLAGS) $(GTK_CFLAGS) -DDIA_SHEETDIR=\"$(sheetdir)\" \
-  $(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(UNICODE_CFLAGS)
+  $(PANGOFT2_CFLAGS) $(LIBART_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: lib/dia_xml.c
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_xml.c,v
retrieving revision 1.40
diff -u -2 -r1.40 dia_xml.c
--- lib/dia_xml.c	24 Jun 2002 01:28:36 -0000	1.40
+++ lib/dia_xml.c	4 Sep 2002 08:43:58 -0000
@@ -51,4 +51,9 @@
 #endif
 
+#ifdef __SUNPRO_C
+#include <ieeefp.h>
+#define isinf(a) (!finite(a))
+#endif
+
 
 #define BUFLEN 1024
Index: lib/paper.c
===================================================================
RCS file: /cvs/gnome/dia/lib/paper.c,v
retrieving revision 1.13
diff -u -2 -r1.13 paper.c
--- lib/paper.c	20 Aug 2002 23:37:06 -0000	1.13
+++ lib/paper.c	4 Sep 2002 08:43:58 -0000
@@ -151,5 +151,5 @@
 }
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__SUNPRO_C)
 /* can't export inlined functions. Shouldn't they be declared as such
  * in paper.h ? The following is a hack. Isn't there a proper sollution
Index: objects/EML/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/EML/Makefile.am,v
retrieving revision 1.3
diff -u -2 -r1.3 Makefile.am
--- objects/EML/Makefile.am	18 Jul 2001 04:39:08 -0000	1.3
+++ objects/EML/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -24,5 +24,5 @@
 libeml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS)
 
 EXTRA_DIST = \
@@ -30,3 +30,3 @@
 	pixmaps/instantiation.xpm \
 	pixmaps/interaction.xpm   \
-	pixmaps/interaction-ortho.xpm
\ No newline at end of file
+	pixmaps/interaction-ortho.xpm
Index: objects/ER/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/ER/Makefile.am,v
retrieving revision 1.10
diff -u -2 -r1.10 Makefile.am
--- objects/ER/Makefile.am	15 Mar 2002 17:48:54 -0000	1.10
+++ objects/ER/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -11,5 +11,5 @@
 liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/FS/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/FS/Makefile.am,v
retrieving revision 1.11
diff -u -2 -r1.11 Makefile.am
--- objects/FS/Makefile.am	26 May 2002 09:13:15 -0000	1.11
+++ objects/FS/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -10,5 +10,5 @@
 libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/GRAFCET/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/GRAFCET/Makefile.am,v
retrieving revision 1.7
diff -u -2 -r1.7 Makefile.am
--- objects/GRAFCET/Makefile.am	15 Mar 2002 17:49:02 -0000	1.7
+++ objects/GRAFCET/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -18,5 +18,5 @@
 libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/SADT/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/SADT/Makefile.am,v
retrieving revision 1.4
diff -u -2 -r1.4 Makefile.am
--- objects/SADT/Makefile.am	15 Mar 2002 17:49:04 -0000	1.4
+++ objects/SADT/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -11,5 +11,5 @@
 libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/UML/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/UML/Makefile.am,v
retrieving revision 1.21
diff -u -2 -r1.21 Makefile.am
--- objects/UML/Makefile.am	11 Jul 2002 02:53:25 -0000	1.21
+++ objects/UML/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -35,5 +35,5 @@
 libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/chronogram/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/chronogram/Makefile.am,v
retrieving revision 1.4
diff -u -2 -r1.4 Makefile.am
--- objects/chronogram/Makefile.am	15 Mar 2002 17:49:03 -0000	1.4
+++ objects/chronogram/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -13,5 +13,5 @@
 libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/custom/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/custom/Makefile.am,v
retrieving revision 1.14
diff -u -2 -r1.14 Makefile.am
--- objects/custom/Makefile.am	15 Mar 2002 17:49:00 -0000	1.14
+++ objects/custom/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -16,7 +16,7 @@
 # add -DDEBUG_CUSTOM here to get extra debugging info.
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) \
 	-DDIA_SHAPEDIR=\""$(shapedir)"\"
 
 EXTRA_DIST = \
-	pixmaps/custom.xpm
\ No newline at end of file
+	pixmaps/custom.xpm
Index: objects/flowchart/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/flowchart/Makefile.am,v
retrieving revision 1.15
diff -u -2 -r1.15 Makefile.am
--- objects/flowchart/Makefile.am	15 Mar 2002 17:48:57 -0000	1.15
+++ objects/flowchart/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -12,5 +12,5 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/network/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/network/Makefile.am,v
retrieving revision 1.17
diff -u -2 -r1.17 Makefile.am
--- objects/network/Makefile.am	13 May 2002 22:14:50 -0000	1.17
+++ objects/network/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -10,5 +10,5 @@
 libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/standard/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/standard/Makefile.am,v
retrieving revision 1.17
diff -u -2 -r1.17 Makefile.am
--- objects/standard/Makefile.am	14 Aug 2002 20:57:31 -0000	1.17
+++ objects/standard/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -17,5 +17,5 @@
 libstandard_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
Index: objects/sybase/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/objects/sybase/Makefile.am,v
retrieving revision 1.9
diff -u -2 -r1.9 Makefile.am
--- objects/sybase/Makefile.am	13 May 2002 22:15:01 -0000	1.9
+++ objects/sybase/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -10,5 +10,5 @@
 libsybase_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS)
 
 EXTRA_DIST = \
Index: plug-ins/cgm/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/cgm/Makefile.am,v
retrieving revision 1.5
diff -u -2 -r1.5 Makefile.am
--- plug-ins/cgm/Makefile.am	15 Mar 2002 17:49:07 -0000	1.5
+++ plug-ins/cgm/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -8,3 +8,3 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
Index: plug-ins/dxf/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/dxf/Makefile.am,v
retrieving revision 1.6
diff -u -2 -r1.6 Makefile.am
--- plug-ins/dxf/Makefile.am	13 Aug 2001 07:24:46 -0000	1.6
+++ plug-ins/dxf/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -11,3 +11,3 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) 
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) 
Index: plug-ins/hpgl/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/hpgl/Makefile.am,v
retrieving revision 1.4
diff -u -2 -r1.4 Makefile.am
--- plug-ins/hpgl/Makefile.am	15 Mar 2002 17:49:10 -0000	1.4
+++ plug-ins/hpgl/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -5,3 +5,3 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
-  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
+  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
Index: plug-ins/metapost/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/metapost/Makefile.am,v
retrieving revision 1.2
diff -u -2 -r1.2 Makefile.am
--- plug-ins/metapost/Makefile.am	16 May 2002 22:50:54 -0000	1.2
+++ plug-ins/metapost/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -11,4 +11,4 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
- $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(DEBUG_CFLAGS) \
+ $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(DEBUG_CFLAGS) \
  $(XML_CFLAGS) $(UNICODE_CFLAGS)
Index: plug-ins/pstricks/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/pstricks/Makefile.am,v
retrieving revision 1.6
diff -u -2 -r1.6 Makefile.am
--- plug-ins/pstricks/Makefile.am	16 May 2002 22:50:55 -0000	1.6
+++ plug-ins/pstricks/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -11,3 +11,3 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
Index: plug-ins/python/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/python/Makefile.am,v
retrieving revision 1.10
diff -u -2 -r1.10 Makefile.am
--- plug-ins/python/Makefile.am	20 Dec 2001 11:38:58 -0000	1.10
+++ plug-ins/python/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -3,5 +3,5 @@
 	-I$(top_srcdir)/lib \
 	$(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) \
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) \
 	$(LIBART_CFLAGS) \
 	$(PYTHON_INCLUDES) \
Index: plug-ins/shape/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/shape/Makefile.am,v
retrieving revision 1.4
diff -u -2 -r1.4 Makefile.am
--- plug-ins/shape/Makefile.am	16 May 2002 22:50:58 -0000	1.4
+++ plug-ins/shape/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -10,4 +10,4 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
-	$(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) \
+	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) \
 	$(DEBUG_CFLAGS)
Index: plug-ins/svg/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/svg/Makefile.am,v
retrieving revision 1.6
diff -u -2 -r1.6 Makefile.am
--- plug-ins/svg/Makefile.am	27 Jul 2002 19:12:57 -0000	1.6
+++ plug-ins/svg/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -7,3 +7,3 @@
 libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) $(DEBUG_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) $(DEBUG_CFLAGS)
Index: plug-ins/wpg/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/wpg/Makefile.am,v
retrieving revision 1.5
diff -u -2 -r1.5 Makefile.am
--- plug-ins/wpg/Makefile.am	16 May 2002 22:51:02 -0000	1.5
+++ plug-ins/wpg/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -5,4 +5,4 @@
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
-  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS) \
+  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
   $(DEBUG_CFLAGS)
Index: plug-ins/xfig/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/xfig/Makefile.am,v
retrieving revision 1.5
diff -u -2 -r1.5 Makefile.am
--- plug-ins/xfig/Makefile.am	3 May 2002 02:23:51 -0000	1.5
+++ plug-ins/xfig/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -12,3 +12,3 @@
 libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
Index: plug-ins/xslt/Makefile.am
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/xslt/Makefile.am,v
retrieving revision 1.2
diff -u -2 -r1.2 Makefile.am
--- plug-ins/xslt/Makefile.am	25 Jun 2002 21:08:51 -0000	1.2
+++ plug-ins/xslt/Makefile.am	4 Sep 2002 08:43:58 -0000
@@ -22,3 +22,3 @@
 libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version -ldl -lglib
 
-INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
+INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)