moving pango to base

Original commit message from CVS:
moving pango to base

diff --git a/ChangeLog b/ChangeLog
index ac63cd544b0f7f877ea480b31db3b74507645340..b9b32fa46072e9425cb874fbf66d28c07271d2c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-01  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+       * configure.ac:
+       * ext/Makefile.am:
+         moved pango to base
+
 2005-12-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 6d79edc240ae6bbc22ab019355087e5cc3d0611d..33259dd46abe653a11b953a5be6beed7a1c4163b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -462,6 +462,15 @@ GST_CHECK_FEATURE(OGG, [ogg de/encoder], oggdemux oggmux, [
   ])
 ])
 
+dnl *** pango ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
+GST_CHECK_FEATURE(PANGO, [pango], pango, [
+  PKG_CHECK_MODULES(PANGO, pango pangoft2,
+      HAVE_PANGO="yes", HAVE_PANGO="no")
+  AC_SUBST(PANGO_CFLAGS)
+  AC_SUBST(PANGO_LIBS)
+])
+
 dnl *** theora ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
 GST_CHECK_FEATURE(THEORA, [ogg theora codec], theoradec theoraenc, [
@@ -597,6 +606,7 @@ ext/cdparanoia/Makefile
 ext/gnomevfs/Makefile
 ext/libvisual/Makefile
 ext/ogg/Makefile
+ext/pango/Makefile
 ext/theora/Makefile
 ext/vorbis/Makefile
 gst-libs/Makefile

diff --git a/ext/Makefile.am b/ext/Makefile.am
index e4c32ad82ea6851def9b9b5988e5a73484040cda..b09a15b3e59d41854f8a1262e9884838ec2e53f1 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -29,6 +29,12 @@ else
 OGG_DIR=
 endif
 
+if USE_PANGO
+PANGO_DIR = pango
+else
+PANGO_DIR =
+endif
+
 if USE_VORBIS
 VORBIS_DIR=vorbis
 else
@@ -56,5 +62,6 @@ DIST_SUBDIRS = \
   gnomevfs \
   libvisual \
   ogg \
+  pango \
   theora \
   vorbis