Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (73c91e99736dcaf1a4437038a44187a96a17f494)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (73c91e99736dcaf1a4437038a44187a96a17f494)
  • Date: Mon, 17 Oct 2011 18:55:49 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnome2-libs/pango/DEPENDS | 5 +----
gnome2-libs/pango/HISTORY | 6 ++++++
gnome2-libs/pango/PRE_BUILD | 4 ++++
gnome2-libs/pango/fake-gtk-doc-check.m4 | 13 +++++++++++++
4 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 8ab979cac05c0feee043e5891a42605aa570327a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pango: fix configure without gtk-doc

diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 80ccad1..fe31993 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -20,10 +20,7 @@ if is_depends_enabled $SPELL libx11; then
fi
fi &&

-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Build documentation with gtk-doc" &&
+optional_depends gtk-doc "" "" "to build documentation with gtk-doc" &&

optional_depends gobject-introspection \
"--enable-introspection=yes" \
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index e79085d..5ad0a85 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,9 @@
+2011-10-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: removed outdated/broken flags
+ * PRE_BUILD: define GTK_DOC_CHECK m4 function from the file
+ * fake-gtk-doc-check.m4: added, to fix configure without gtk-doc
+ (taken from OpenWrt project)
+
2011-09-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.29.4

diff --git a/gnome2-libs/pango/PRE_BUILD b/gnome2-libs/pango/PRE_BUILD
index 714e916..2196f02 100755
--- a/gnome2-libs/pango/PRE_BUILD
+++ b/gnome2-libs/pango/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+if ! is_depends_enabled $SPELL gtk-doc; then
+ cat "$SPELL_DIRECTORY/fake-gtk-doc-check.m4" >> acinclude.m4
+fi &&
+
if ! spell_ok g++; then
aclocal &&
autoconf
diff --git a/gnome2-libs/pango/fake-gtk-doc-check.m4
b/gnome2-libs/pango/fake-gtk-doc-check.m4
new file mode 100644
index 0000000..26fa723
--- /dev/null
+++ b/gnome2-libs/pango/fake-gtk-doc-check.m4
@@ -0,0 +1,13 @@
+dnl fake-gtk-doc-check.m4 serial 1 (OpenWrt)
+dnl Provide a fake GTK_DOC_CHECK macros which
+dnl always defines false.
+
+AC_DEFUN([GTK_DOC_CHECK],
+[
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [false])
+ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [false])
+ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [false])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [false])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [false])
+ AC_PATH_PROGS([GTKDOC_REBASE],[true],[true])
+])



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (73c91e99736dcaf1a4437038a44187a96a17f494), Vlad Glagolev, 10/17/2011

Archive powered by MHonArc 2.6.24.

Top of Page