Modified Files: atk-uninstalled.pc.in atk.pc.in configure.in

 Modified Files:
 	atk-uninstalled.pc.in atk.pc.in configure.in
 	atk/atkeditabletext.h atk/atktext.h atk/makefile.msc
Removed last of pango dependencies in ATK: removed (unused) #includes,
and removed dependencies from makefile.msc and configure.in

diff --git a/atk-uninstalled.pc.in b/atk-uninstalled.pc.in
index 99e2e04..734d7c3 100644 (file)
--- a/atk-uninstalled.pc.in
+++ b/atk-uninstalled.pc.in
@@ -1,6 +1,6 @@
 Name: Atk Uninstalled
 Description: Accessibility Toolkit, Not Installed
 Version: @VERSION@
-Requires: @GLIB_PACKAGES@ @PANGO_PACKAGES@
+Requires: @GLIB_PACKAGES@
 Libs: ${pc_top_builddir}/${pcfiledir}/atk/libatk.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@

diff --git a/atk.pc.in b/atk.pc.in
index 641cce8..e2532e7 100644 (file)
--- a/atk.pc.in
+++ b/atk.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: Atk
 Description: Accessibility Toolkit
 Version: @VERSION@
-Requires: @GLIB_PACKAGES@ @PANGO_PACKAGES@
+Requires: @GLIB_PACKAGES@
 Libs: -L${libdir} -latk
 Cflags: -I${includedir}/atk-1.0

diff --git a/atk/atkeditabletext.h b/atk/atkeditabletext.h
index 3f919f7..5399e0a 100755 (executable)
--- a/atk/atkeditabletext.h
+++ b/atk/atkeditabletext.h
@@ -20,7 +20,6 @@
 #ifndef __ATK_EDITABLE_TEXT_H__
 #define __ATK_EDITABLE_TEXT_H__
 
-#include <pango/pango.h>
 #include <atk/atkobject.h>
 #include <atk/atktext.h>
 

diff --git a/atk/atktext.h b/atk/atktext.h
index 33ef452..83a6aa9 100755 (executable)
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -21,7 +21,6 @@
 #ifndef __ATK_TEXT_H__
 #define __ATK_TEXT_H__
 
-#include <pango/pango.h>
 #include <glib-object.h>
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>

diff --git a/atk/makefile.msc b/atk/makefile.msc
index 1230bca..377a052 100644 (file)
--- a/atk/makefile.msc
+++ b/atk/makefile.msc
@@ -13,9 +13,9 @@ includedir = $(PRJ_TOP)
 LT_RELEASE = $(PKG_VER)
 
 INCLUDES = \
-       -I$(top_srcdir) $(GLIB_CFLAGS) $(PANGO_CFLAGS)
+       -I$(top_srcdir) $(GLIB_CFLAGS)
 
-PKG_LINK = $(GLIB_LIBS) $(PANGO_LIBS)
+PKG_LINK = $(GLIB_LIBS)
 
 MAINTAINERCLEANFILES = \
        atkmarshal.c

diff --git a/configure.in b/configure.in
index ff928d8..c829872 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,29 +56,18 @@ GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
 AC_SUBST(GLIB_PACKAGES)
 GLIB_REQUIRED_VERSION=1.3.2
 
-PANGO_PACKAGES="pango"
-AC_SUBST(PANGO_PACKAGES)
-
 dnl This PATH_GLIB is somewhat redundant, but does a sanity compile and 
 dnl importantly defines the GLIB_GENMARSHAL variable for subst into the
 dnl Makefile
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION)
 
-PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES $PANGO_PACKAGES, , AC_MSG_ERROR([
-        *** GLib or Pango not found. You can find these on ftp://ftp.gtk.org
+PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_MSG_ERROR([
+        *** GLib not found. You can find it on ftp://ftp.gtk.org
         *** Errors follow:
             $DEP_PKG_ERRORS]))
 
 # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs
-DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES $PANGO_PACKAGES gthread-2.0`
-
-if $PKG_CONFIG --uninstalled $GLIB_PACKAGES $PANGO_PACKAGES; then
-        :
-else
-        AC_CHECK_LIB(pango, pango_context_new, :, AC_MSG_ERROR([
-                *** Can't link to Pango. Pango is required to build
-                *** ATK. For more information see http://www.pango.org]), $DEP_LIBS)
-fi
+DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)