Skip to contentSkip to conversation

libgtk2: skip tutorial and faq build

PATCH Superseded justin.swartz at nym.hush.com 3 participants 12 messages Feb 24, 2015 – Feb 26, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Credit to Yann E. MORIN for discovering and describing a fix for the HAVE_DOCBOOK bug in "configure.ac", as well as the "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" additions to LIBGTK2_CONF_OPTS.

---
Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/0002-configure-have_docbook.patch | 15 +++++++++++++++
 package/libgtk2/libgtk2.mk                        |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 package/libgtk2/0002-configure-have_docbook.patch
package/libgtk2/0002-configure-have_docbook.patch new file +15 -0
new file mode 100644
index 0000000..aece8f1
@@ -0,0 +1,15 @@
+Improvement of the HAVE_DOCBOOK test criteria.
+
+Signed-off-by: Justin Swartz <[email protected]>
+
+--- libgtk2-2.24.18/configure.ac.orig	2015-02-24 00:28:18.128745222 +0200
++++ libgtk2-2.24.18/configure.ac	2015-02-24 00:29:10.739087501 +0200
+@@ -1612,7 +1612,7 @@
+ GTK_DOC_CHECK([1.11])
+ 
+ AC_CHECK_PROG(DB2HTML, db2html, true, false)
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])
+ 
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
package/libgtk2/libgtk2.mk +7 -2
index dfc1f5b..d468117 100644
@@ -69,9 +69,14 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	ac_cv_prog_DB2HTML=no
 
-LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html
 
 LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
 
Signature · 1 line
1.7.12.1
#1 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Justin, All,

On 2015-02-25 01:50 +0200, justin.swartz at nym.hush.com spake thusly:

Quoted 8 lines

Credit to Yann E. MORIN for discovering and describing a fix for the HAVE_DOCBOOK bug in "configure.ac", as well as the "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" additions to LIBGTK2_CONF_OPTS.

Quoted 17 lines

---
Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/0002-configure-have_docbook.patch | 15 +++++++++++++++
 package/libgtk2/libgtk2.mk                        |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 package/libgtk2/0002-configure-have_docbook.patch
package/libgtk2/0002-configure-have_docbook.patch new file +0 -0
new file mode 100644
index 0000000..aece8f1

package/libgtk2/0002-configure-have_docbook.patch line 3

Quoted 3 lines
package/libgtk2/0002-configure-have_docbook.patch new file +3 -0
@@ -0,0 +1,15 @@
+Improvement of the HAVE_DOCBOOK test criteria.
+
+Signed-off-by: Justin Swartz <[email protected]>

I guess I can add my own SoB, as I was involved with that patch. ;-)

Regards,
Yann E. MORIN.

Quoted 36 lines
package/libgtk2/0002-configure-have_docbook.patch new file +12 -0
+
+--- libgtk2-2.24.18/configure.ac.orig	2015-02-24 00:28:18.128745222 +0200
++++ libgtk2-2.24.18/configure.ac	2015-02-24 00:29:10.739087501 +0200
+@@ -1612,7 +1612,7 @@
+ GTK_DOC_CHECK([1.11])
+ 
+ AC_CHECK_PROG(DB2HTML, db2html, true, false)
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])
+ 
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
package/libgtk2/libgtk2.mk +7 -2
index dfc1f5b..d468117 100644
@@ -69,9 +69,14 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	ac_cv_prog_DB2HTML=no
 
-LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html
 
 LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
 
Signature · 1 line
1.7.12.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

In reply to justin.swartz at nym.hush.com
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Fixes: http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/65165
Credit to Yann E. MORIN for discovering and describing a fix for the HAVE_DOCBOOK bug in "configure.ac", as well as the "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" additions to LIBGTK2_CONF_OPTS.

---
Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/0002-configure-have_docbook.patch | 15 +++++++++++++++
 package/libgtk2/libgtk2.mk                        |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 package/libgtk2/0002-configure-have_docbook.patch
package/libgtk2/0002-configure-have_docbook.patch new file +2 -0
new file mode 100644
index 0000000..aece8f1
@@ -0,0 +1,15 @@
+Improvement of the HAVE_DOCBOOK test criteria.
+

package/libgtk2/0002-configure-have_docbook.patch line 12

Quoted 10 lines
package/libgtk2/0002-configure-have_docbook.patch new file +10 -0
+Signed-off-by: Justin Swartz <[email protected]>
+
+--- libgtk2-2.24.18/configure.ac.orig	2015-02-24 00:28:18.128745222 +0200
++++ libgtk2-2.24.18/configure.ac	2015-02-24 00:29:10.739087501 +0200
+@@ -1612,7 +1612,7 @@
+ GTK_DOC_CHECK([1.11])
+ 
+ AC_CHECK_PROG(DB2HTML, db2html, true, false)
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

Quoted 11 lines
package/libgtk2/0002-configure-have_docbook.patch new file +3 -0
+ 
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
package/libgtk2/libgtk2.mk +0 -0
index dfc1f5b..d468117 100644
@@ -69,9 +69,14 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \

package/libgtk2/libgtk2.mk LIBGTK2_CONF_ENV = \ · line 79

Quoted 10 lines
package/libgtk2/libgtk2.mk +7 -2
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	ac_cv_prog_DB2HTML=no
 
-LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html

What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is passed (which we don't), so these shouldn't change anything.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

This should have been addressed to "peter at korsgaard.com", but my provider claims that the address is invalid.

Quoted 2 lines · Peter Korsgaard

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

DB2HTML=false works perfectly, thanks for pointing that out!

Quoted 9 lines

package/libgtk2/libgtk2.mk LIBGTK2_CONF_ENV = \ · line 79

Quoted 5 lines
package/libgtk2/libgtk2.mk +5 -0
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html

What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is passed (which we don't), so these shouldn't change anything.

I hadn't noticed that --disable-gtk-doc was implicitly passed in *_CONF_OPTS.

Unfortunately there is still documention installed in to /usr/share/gtk-doc/html/, but it's eventually removed by target-finalize anyway.

Regards
Justin

#4 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Hi,

Quoted 2 lines

This should have been addressed to "peter at korsgaard.com", but my provider claims that the address is invalid.

Really? What error message do you get exactly (perhaps privately to jacmet at sunsite.dk).

Quoted 4 lines · Peter Korsgaard
Quoted 2 lines

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

DB2HTML=false works perfectly, thanks for pointing that out!

Great. I've committed a fix to pass it.

Quoted 10 lines
Quoted 9 lines

package/libgtk2/libgtk2.mk LIBGTK2_CONF_ENV = \ · line 79

Quoted 5 lines
package/libgtk2/libgtk2.mk +5 -0
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html

What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is passed (which we don't), so these shouldn't change anything.

I hadn't noticed that --disable-gtk-doc was implicitly passed in *_CONF_OPTS.

That and the fact that it defaults to disabled:

./configure --help|grep gtk-doc

  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
Quoted 2 lines

Unfortunately there is still documention installed in to /usr/share/gtk-doc/html/, but it's eventually removed by target-finalize anyway.

Yes, but the patch you sent didn't change anything about that, right?

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Peter, All,

On 2015-02-26 22:16 +0100, Peter Korsgaard spake thusly:

Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Quoted 2 lines · Peter Korsgaard

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

DB2HTML=false works perfectly, thanks for pointing that out!

Great. I've committed a fix to pass it.

Hmm... Didn't you see his v2?

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Peter, All,
On 2015-02-26 22:16 +0100, Peter Korsgaard spake thusly:

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines · Peter Korsgaard
Quoted 2 lines

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

DB2HTML=false works perfectly, thanks for pointing that out!

Great. I've committed a fix to pass it.

Hmm... Didn't you see his v2?

V3 you mean? Sorry, I didn't (slow mail).

Signature · 1 line
Peter Korsgaard 
#7 lore raw

PATCH v3 1/1 libgtk2: skip tutorial and faq build

In reply to Peter Korsgaard

Pass "DB2HTML=false" in LIBGTK2_CONF_ENV to disable the building of the Tutorial and the FAQ.

---
Changes v2 -> v3:
- Removed 0002-configure-have_docbook.patch
- Replaced "ac_cv_prog_DB2HTML=no" with "DB2HTML=no" in LIBGTK2_CONF_ENV
- Removed "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" from LIBGTK2_CONF_OPTS

Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/libgtk2.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libgtk2/libgtk2.mk +2 -1
index dfc1f5b..f52dfaf 100644
@@ -69,7 +69,8 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	DB2HTML=false
 
 LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
 
Signature · 1 line
1.7.12.1
#8 lore raw

PATCH v3 1/1 libgtk2: skip tutorial and faq build

Justin, All,

On 2015-02-26 18:55 +0200, justin.swartz at nym.hush.com spake thusly:

Quoted 6 lines

Pass "DB2HTML=false" in LIBGTK2_CONF_ENV to disable the building of the Tutorial and the FAQ.

So, after re-doing my build tests, it seems that I missed something in my previous attempts. So:

Regards,
Yann E. MORIN.

Quoted 33 lines

---
Changes v2 -> v3:
- Removed 0002-configure-have_docbook.patch
- Replaced "ac_cv_prog_DB2HTML=no" with "DB2HTML=no" in LIBGTK2_CONF_ENV
- Removed "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" from LIBGTK2_CONF_OPTS

Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/libgtk2.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libgtk2/libgtk2.mk +2 -1
index dfc1f5b..f52dfaf 100644
@@ -69,7 +69,8 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	DB2HTML=false
 
 LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
 
Signature · 1 line
1.7.12.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#9 lore raw

PATCH v3 1/1 libgtk2: skip tutorial and faq build

In reply to justin.swartz at nym.hush.com
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Fixes: http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/65165
Pass "DB2HTML=false" in LIBGTK2_CONF_ENV to disable the building of the Tutorial and the FAQ.

Sorry, I had some email issues and ended up making a similar commit locally before noticing your patch.

Signature · 1 line
Bye, Peter Korsgaard
#10 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

In reply to Peter Korsgaard

Peter, All,

On 2015-02-26 00:17 +0100, Peter Korsgaard spake thusly:

Quoted 33 lines
Quoted 33 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"justin" == justin swartz <[email protected]> writes:

Fixes: http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/65165
Credit to Yann E. MORIN for discovering and describing a fix for the HAVE_DOCBOOK bug in "configure.ac", as well as the "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" additions to LIBGTK2_CONF_OPTS.

---
Changes v1 -> v2:
- Commit log added to the head of "0002-configure-have_docbook.patch"
- Moved "--disable-gtk-doc-pdf" and "--disable-gtk-doc-html" to the end of LIBGTK2_CONF_OPTS

---
 package/libgtk2/0002-configure-have_docbook.patch | 15 +++++++++++++++
 package/libgtk2/libgtk2.mk                        |  9 +++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 package/libgtk2/0002-configure-have_docbook.patch
package/libgtk2/0002-configure-have_docbook.patch new file +6 -0
new file mode 100644
index 0000000..aece8f1
@@ -0,0 +1,15 @@
+Improvement of the HAVE_DOCBOOK test criteria.
+
+Signed-off-by: Justin Swartz <[email protected]>
+
+--- libgtk2-2.24.18/configure.ac.orig	2015-02-24 00:28:18.128745222 +0200
++++ libgtk2-2.24.18/configure.ac	2015-02-24 00:29:10.739087501 +0200
Quoted 8 lines

package/libgtk2/0002-configure-have_docbook.patch line 12

Quoted 6 lines
package/libgtk2/0002-configure-have_docbook.patch new file +6 -0
+@@ -1612,7 +1612,7 @@
+ GTK_DOC_CHECK([1.11])
+ 
+ AC_CHECK_PROG(DB2HTML, db2html, true, false)
+-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

Weird, I was under the impression I did try that and that it did not work... But Justin is reporting that it does work, so my memory are obviously flawed...

Quoted 14 lines
Quoted 13 lines
package/libgtk2/0002-configure-have_docbook.patch new file +2 -0
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
package/libgtk2/libgtk2.mk +2 -1
index dfc1f5b..d468117 100644
@@ -69,9 +69,14 @@ LIBGTK2_CONF_ENV = \
 	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
 	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
 	ac_cv_prog_F77=no \
-	ac_cv_path_CUPS_CONFIG=no
+	ac_cv_path_CUPS_CONFIG=no \
+	ac_cv_prog_DB2HTML=no
Quoted 9 lines

package/libgtk2/libgtk2.mk LIBGTK2_CONF_ENV = \ · line 79

Quoted 6 lines
package/libgtk2/libgtk2.mk +5 -1
-LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
+LIBGTK2_CONF_OPTS = \
+	--disable-glibtest \
+	--enable-explicit-deps=no \
+	--disable-gtk-doc-pdf \
+	--disable-gtk-doc-html

What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is passed (which we don't), so these shouldn't change anything.

Fact is, documentation is still generated even with --disable-gtk-doc.

I'll do another test-build to double-check all that mess...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#11 lore raw

PATCH v2 1/1 libgtk2: skip tutorial and faq build

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Hi,

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

+ AC_CHECK_PROG(DB2HTML, db2html, true, false) +-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) ++AM_CONDITIONAL([HAVE_DOCBOOK], [test ! "$DB2HTML" = "no"])

Why not just pass DB2HTML=false in LIBGTK2_CONF_ENV?

Weird, I was under the impression I did try that and that it did not work... But Justin is reporting that it does work, so my memory are obviously flawed...

Yes, as far as I can see AC_CHECK_PROG directly uses the shell variable if defined:

https://www.gnu.org/software/autoconf/manual/autoconf-2.68/html_node/Generic-Programs.html

$DB2HTML directly expands to false, so AM_CONDITIONAL isn't true:

https://www.gnu.org/software/automake/manual/html_node/Usage-of-Conditionals.html

Quoted 5 lines
Quoted 2 lines

What does that buy us? gtk-doc is disabled unless --enable-gtk-doc is passed (which we don't), so these shouldn't change anything.

Fact is, documentation is still generated even with --disable-gtk-doc.

Really? That's not what I saw during my tests.

Signature · 2 lines
Venlig hilsen,
Peter Korsgaard