bug 178404, --enable-ctl in configure will cause mozilla gtk2 build fail, r=seawood

intl/ctl/src/hindiShaper/Makefile.in

@@ -39,12 +39,20 @@ LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../pangoLite \
 		$(NULL)
 
-CFLAGS		+= $(GLIB_CFLAGS)
-
-EXTRA_DSO_LDOPTS += \
-		-L$(DIST)/lib \
-		$(EXTRA_DSO_LIBS) \
-		$(GLIB_LIBS) \
-		$(GLIB_GMODULE_LIBS) \
-		$(NULL)
-
+ifdef MOZ_ENABLE_GTK2
+  CFLAGS          += $(MOZ_GTK2_CFLAGS)
+  EXTRA_DSO_LDOPTS += \
+                  -L$(DIST)/lib \
+                  $(EXTRA_DSO_LIBS) \
+                  $(GLIB_LIBS) \
+                  $(MOZ_GTK2_LIBS) \
+                  $(NULL)
+else
+  CFLAGS           += $(GLIB_CFLAGS)
+  EXTRA_DSO_LDOPTS += \
+                  -L$(DIST)/lib \
+                  $(EXTRA_DSO_LIBS) \
+                  $(GLIB_LIBS) \
+                  $(GLIB_GMODULE_LIBS) \
+                  $(NULL)
+endif

intl/ctl/src/pangoLite/pango-types.h

@@ -76,8 +76,11 @@ struct _PangoAnalysis
   PangoDirection   aDir;
 };
 
+#ifndef MOZ_WIDGET_GTK2 
+/*glib2 already defined following 2 types*/
 typedef guint32 gunichar;
 typedef guint16 gunichar2;
+#endif
 
 #define G_CONST_RETURN const