? build2.log
? build3.log
? src/config/platforms/mingw32.mk-old
? src/wp/main/win/Makefile-old
Index: src/af/util/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- src/af/util/win/Makefile	31 Jan 2004 13:24:29 -0000	1.23
+++ src/af/util/win/Makefile	3 Jun 2006 02:37:29 -0000
@@ -39,7 +39,7 @@
 	CPPSRCS += ut_xml_msxml.cpp
 endif
 
-INCLUDES=		-I$(ABI_XX_ROOT)/../libiconv/include
+INCLUDES=		$(ABI_GLIB_INC)
 
 TARGETS=		$(OBJS)
 
Index: src/af/util/xp/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- src/af/util/xp/Makefile	8 Jul 2005 16:22:10 -0000	1.87
+++ src/af/util/xp/Makefile	4 Jun 2006 00:12:43 -0000
@@ -85,7 +85,7 @@
 TARGETS=		$(OBJS)
 
 ifeq ($(ABI_NATIVE),win)
-INCLUDES = -I$(ABI_XX_ROOT)/../libpng -I$(ABI_ZLIB_INC) -I$(ABI_XX_ROOT)/../libiconv/include
+INCLUDES = -I$(ABI_XX_ROOT)/../libpng -I$(ABI_ZLIB_INC) -I$(ABI_XX_ROOT)/../libiconv/include $(ABI_GLIB_INC)
 endif
 
 ifeq ($(OS_NAME),WIN32)
Index: src/config/platforms/mingw32.mk
===================================================================
RCS file: /cvsroot/abi/src/config/platforms/mingw32.mk,v
retrieving revision 1.24
diff -u -r1.24 mingw32.mk
--- src/config/platforms/mingw32.mk	30 Jul 2004 22:12:55 -0000	1.24
+++ src/config/platforms/mingw32.mk	4 Jun 2006 01:06:27 -0000
@@ -139,10 +139,7 @@
 OS_INCLUDES		+= -I$(ABI_ROOT)/../libiconv/include
 endif
 
-# TODO: This is true on about 1/10 platforms.  Why not use pkgconfig?
-ifeq ($(ABI_OPT_PANGO),1)
-OS_INCLUDES += -I/usr/local/include/pango-1.0 -I/usr/local/include/freetype2 -I/usr/local/include/glib-2.0
-endif
+
 
 # Architecture-specific flags
 ifeq ($(OS_ARCH), i386)
@@ -167,13 +164,36 @@
 UNIX_CAN_BUILD_STATIC=1 
 # I'm still not totally decided really...I'll need to experiment some more.
 
-ABI_REQUIRE_PEER_ICONV = 1
+# No longer hardcoding for peer iconv - 2 Jun 2006
+# ABI_REQUIRE_PEER_ICONV = 1
+ABI_REQUIRE_PEER_ICONV = 0
 
 # Currently hard code expat to default for Win32
 ABI_OPT_PEER_EXPAT?=1
 
-# add wv's mini glib to include list
-ABI_OTH_INCS+=	/../../wv/glib-wv
+## add wv's mini glib to include list
+#ABI_OTH_INCS+=	/../../wv/glib-wv
+
+#ifneq ($(shell which pkg-config), )
+	ABI_GSF_LIB += $(shell pkg-config --libs --silence-errors libgsf-1)
+	ABI_GSF_INC += $(shell pkg-config --cflags --silence-errors libgsf-1)
+	ABI_GLIB_LIB += $(shell pkg-config --libs --silence-errors glib-2.0)
+	ABI_GLIB_INC += $(shell pkg-config --cflags --silence-errors glib-2.0)
+#else
+#	error 
+#endif
+
+# TODO: This is true on about 1/10 platforms.  Why not use pkgconfig?
+ifeq ($(ABI_OPT_PANGO),1)
+OS_INCLUDES += -I/usr/local/include/pango-1.0 -I/usr/local/include/freetype2 $(ABI_GLIB_INC)
+endif
+
+
+# glib
+# ABI_OTH_INCS += $(GLIB_INC)
+OS_LIBS += $(ABI_GLIB_LIB)
+ABI_LIBS += glib-2.0
+OS_INCLUDES += $(ABI_GLIB_INC)
 
 # zlib
 ABI_ZLIB_ROOT = $(ABI_ROOT)/../libs/zlib
@@ -182,14 +202,11 @@
 ABI_ZLIB_LIB = -lzdll
 ABI_LIBS += zdll 
 
-# gsf (for many of the plugins)
-ifneq ($(shell which pkg-config), )
-	ABI_GSF_LIB += $(shell pkg-config --libs --silence-errors libgsf-1)
-	ABI_GSF_INC += $(shell pkg-config --cflags --silence-errors libgsf-1)
-endif
 
 # so <fribidi.h> works
 OS_INCLUDES += -I$(ABI_ROOT)/../fribidi	
+# Do this instead for non-peer fribidi:
+#OS_INCLUDES += $(shell pkg-config --cflags --silence-errors fribidi)
 
 # Try to find where NSIS is installed, if anywhere
 # First check to see if it's in the path.  If not, check default install path.
Index: src/config/platforms/win32.mk
===================================================================
RCS file: /cvsroot/abi/src/config/platforms/win32.mk,v
retrieving revision 1.46
diff -u -r1.46 win32.mk
--- src/config/platforms/win32.mk	9 Aug 2005 06:23:17 -0000	1.46
+++ src/config/platforms/win32.mk	3 Jun 2006 01:22:30 -0000
@@ -246,9 +246,16 @@
 
 DEFINES 	+= -DWIN32 -DSUPPORTS_UT_IDLE
 
-# we always use peer iconv
-ABI_REQUIRE_PEER_ICONV = 1
-ABI_LIBS += Abi_libiconv
+# we used to always use peer iconv, but not any more as of
+# CVS HEAD, 2 Jun 2006.
+# ABI_REQUIRE_PEER_ICONV = 1
+
+
+ifeq(ABI_REQUIRE_PEER_ICONV, 1)
+ ABI_LIBS += Abi_libiconv
+else
+ OS_LIBS += $(ICONV_LIBS) -liconv # ICONV_LIBS is set in the environment equal to "-L/some/path" where there is /some/path/libiconv.so.  It may remain unset if the lib is already in the default search path, as it usually is.
+endif
 
 # if not specified, default to expat for xml parsing
 ABI_OPT_PEER_EXPAT ?= 1
Index: src/config/require/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/config/require/win/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- src/config/require/win/Makefile	2 Sep 2004 19:59:38 -0000	1.43
+++ src/config/require/win/Makefile	3 Jun 2006 01:34:46 -0000
@@ -27,7 +27,7 @@
 
 
 REQUIRE=	_ZLIB_ _LIBPNG_ 
-ifneq ($(ABI_REQUIRE_PEER_ICONV),0)
+ifeq ($(ABI_REQUIRE_PEER_ICONV),1)
 REQUIRE+=	_LIBICONV_
 endif
 REQUIRE+=	_LIBWV_ _POPT_ _FRIBIDI_