diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.in | 20 | ||||
| -rw-r--r-- | pangocairo-uninstalled.pc.in | 7 | ||||
| -rw-r--r-- | pangocairo.pc.in | 11 |
7 files changed, 58 insertions, 10 deletions
@@ -7,11 +7,13 @@ config.log config.status config.sub pango.pc +pangocairo.pc pangox.pc pangoxft.pc pangoft2.pc pangowin32.pc pango-uninstalled.pc +pangocairo-uninstalled.pc pangox-uninstalled.pc pangoxft-uninstalled.pc pangoft2-uninstalled.pc @@ -1,3 +1,9 @@ +Sat Jan 8 19:28:17 2005 Owen Taylor <otaylor@redhat.com> + + * Makefile.am configure.in pangocairo.pc.in + pangocairo-uninstalled.pc.in: Add a .pc file for + pangocairo. + 2005-01-08 Matthias Clasen <mclasen@redhat.com> * pango.pc.in: Require gmodule-no-export-2.0 instead diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d121846d..0aee3a4b 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Sat Jan 8 19:28:17 2005 Owen Taylor <otaylor@redhat.com> + + * Makefile.am configure.in pangocairo.pc.in + pangocairo-uninstalled.pc.in: Add a .pc file for + pangocairo. + 2005-01-08 Matthias Clasen <mclasen@redhat.com> * pango.pc.in: Require gmodule-no-export-2.0 instead diff --git a/Makefile.am b/Makefile.am index 2df2434a..bf2a08df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,13 +4,15 @@ AUTOMAKE_OPTIONS = 1.7 SUBDIRS= pango modules examples docs tools tests -EXTRA_DIST = \ - pango.pc.in \ - pangox.pc.in \ - pangoxft.pc.in \ - pangoft2.pc.in \ +EXTRA_DIST = \ + pango.pc.in \ + pangocairo.pc.in \ + pangox.pc.in \ + pangoxft.pc.in \ + pangoft2.pc.in \ pangowin32.pc.in \ pango-uninstalled.pc.in \ + pangocairo-uninstalled.pc.in \ pangox-uninstalled.pc.in \ pangoxft-uninstalled.pc.in \ pangoft2-uninstalled.pc.in \ @@ -23,6 +25,10 @@ EXTRA_DIST = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pango.pc +if HAVE_CAIRO +pkgconfig_DATA += pangocairo.pc +endif + if HAVE_X pkgconfig_DATA += pangox.pc endif diff --git a/configure.in b/configure.in index 1c194d57..e502fac2 100644 --- a/configure.in +++ b/configure.in @@ -523,21 +523,29 @@ case $enable_explicit_deps in esac AC_MSG_RESULT($enable_explicit_deps) +PKGCONFIG_X_LIBS= +PKGCONFIG_XFT_LIBS= +PKGCONFIG_FREETYPE_LIBS= +PKGCONFIG_MATH_LIBS= +PKGCONFIG_CAIRO_LIBS= + if test $enable_explicit_deps = yes ; then PKGCONFIG_X_LIBS="$X_LIBS $X_EXTRA_LIBS" PKGCONFIG_XFT_LIBS=$XFT_LIBS PKGCONFIG_FREETYPE_LIBS=$FREETYPE_LIBS PKGCONFIG_MATH_LIBS=-lm -else - PKGCONFIG_X_LIBS= - PKGCONFIG_XFT_LIBS= - PKGCONFIG_FREETYPE_LIBS= - PKGCONFIG_MATH_LIBS= + PKGCONFIG_CAIRO_LIBS=$FREETYPE_LIBS + if $have_cairo_freetype ; then + PKGCONFIG_CAIRO_REQUIRES=pangoft2 + fi fi + AC_SUBST(PKGCONFIG_X_LIBS) AC_SUBST(PKGCONFIG_XFT_LIBS) AC_SUBST(PKGCONFIG_FREETYPE_LIBS) AC_SUBST(PKGCONFIG_MATH_LIBS) +AC_SUBST(PKGCONFIG_CAIRO_LIBS) +AC_SUBST(PKGCONFIG_CAIRO_REQUIRES) AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no) AC_CONFIG_COMMANDS([pango/module-defs.h], @@ -687,11 +695,13 @@ pangox.pc pangowin32.pc pangoft2.pc pangoxft.pc +pangocairo.pc pango-uninstalled.pc pangox-uninstalled.pc pangowin32-uninstalled.pc pangoft2-uninstalled.pc pangoxft-uninstalled.pc +pangocairo-uninstalled.pc pango-zip.sh ]) diff --git a/pangocairo-uninstalled.pc.in b/pangocairo-uninstalled.pc.in new file mode 100644 index 00000000..0c5efbce --- /dev/null +++ b/pangocairo-uninstalled.pc.in @@ -0,0 +1,7 @@ +Name: Pango Cairo Uninstalled +Description: Cairo rendering support for Pango, Not Installed +Version: @VERSION@ +Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@ +Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @PKGCONFIG_CAIRO_LIBS@ +Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @CAIRO_CFLAGS@ + diff --git a/pangocairo.pc.in b/pangocairo.pc.in new file mode 100644 index 00000000..affc77dc --- /dev/null +++ b/pangocairo.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Pango Cairo +Description: Cairo rendering support for Pango +Version: @VERSION@ +Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@ +Libs: -L${libdir} -lpangocairo-@PANGO_API_VERSION@ @PKGCONFIG_CAIRO_LIBS@ +Cflags: -I${includedir}/pango-1.0 @CAIRO_CFLAGS@ |