This file is part of MXE. See LICENSE.md for licensing information. From 525d3bc5b5f7e7d2c705c2b53cc8bf91d56e4641 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 29 Sep 2010 00:50:08 +0200 Subject: [PATCH 2/4] add missing lib to pango.pc for static linking diff --git a/pango.pc.in b/pango.pc.in index 17a8b7a..16c5981 100644 --- a/pango.pc.in +++ b/pango.pc.in @@ -10,4 +10,4 @@ Description: Internationalized text handling Version: @VERSION@ Requires: glib-2.0 gobject-2.0 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ +Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ Libs.private: -lm -- 1.7.10.4 From 93cb665f6fcfa4d3cbe1edb06a09850c47807b0d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 18 Jun 2012 21:36:53 +0200 Subject: [PATCH 4/4] kill gtk-doc (MXE specific) diff --git a/Makefile.am b/Makefile.am index 1ac018a..1999723 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in. -SUBDIRS= pango pango-view examples docs tools tests build +SUBDIRS= pango pango-view examples tools tests build EXTRA_DIST = \ autogen.sh \ diff --git a/autogen.sh b/autogen.sh index bc7c59c..4e1918c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,14 +7,6 @@ test -n "$srcdir" || srcdir=. olddir=`pwd` cd "$srcdir" -GTKDOCIZE=`which gtkdocize` -if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 -else - gtkdocize || exit $? -fi - AUTORECONF=`which autoreconf` if test -z $AUTORECONF; then echo "*** No autoreconf found, please install it ***" diff --git a/configure.ac b/configure.ac index ac62a89..96837d6 100644 --- a/configure.ac +++ b/configure.ac @@ -563,14 +563,7 @@ dnl ************************** dnl *** Checks for gtk-doc *** dnl ************************** -if $have_cairo ; then : ; else - if test x$enable_gtk_doc = xyes ; then - AC_MSG_WARN([Cairo not present, disabling doc building]) - enable_gtk_doc=no - fi -fi - -GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) +enable_gtk_doc=no AC_ARG_ENABLE(man, AC_HELP_STRING([--enable-man], -- 1.7.10.4