Re: [PATCH v2 1/2] Allow building without gtk-doc installed

[Petr Vorel]

Hi Lubomir,

 This doesn't look good to me.

 autogen.sh is a maintainer tool and we pretty much always want to
 create tarballs with GTK-doc.

 Why don't you just use autoreconf (with -f and -i) instead of
 autogen.sh when doing builds off Git?
Thanks for the tip, but it actually does not work as there is a dependency (as 
I reported
it before):
$ autoreconf -f -i
snip
docs/api/Makefile.am:28: error: ENABLE_GTK_DOC does not appear in AM_CONDITIONAL
automake: error: cannot open  gtk-doc.make: No such file or directory
autoreconf: automake failed with exit status: 1

I know this is minor / unimportant issue as not many people will build without 
GTK-doc.
But still I'd prefer either to require it (to explain user what's wrong - first 
version of
my patch) or better allow build without it and just warn user (second version 
of the
patch; there might be better way of doing it than my quirks).

Kind regards,
Petr
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list

Re: [PATCH v2 1/2] Allow building without gtk-doc installed

[Colin Walters]

On Thu, Jun 25, 2015, at 04:57 AM, Lubomir Rintel wrote:
 This doesn't look good to me.
 
 autogen.sh is a maintainer tool and we pretty much always want to
 create tarballs with GTK-doc.

FWIW glib supports this:
https://git.gnome.org/browse/glib/tree/autogen.sh

___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list

Re: [PATCH v2 1/2] Allow building without gtk-doc installed

[Lubomir Rintel]

This doesn't look good to me.

autogen.sh is a maintainer tool and we pretty much always want to
create tarballs with GTK-doc.

Why don't you just use autoreconf (with -f and -i) instead of
autogen.sh when doing builds off Git?

On Fri, 2015-06-19 at 01:25 +0200, Petr Vorel wrote:
 This requires creating minimal gtk-doc.make and check for 
 GTK_DOC_CHECK
 availability in configure.ac.
 
 Signed-off-by: Petr Vorel petr.vo...@gmail.com
 ---
  autogen.sh   | 14 +-
  configure.ac |  7 ++-
  2 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/autogen.sh b/autogen.sh
 index 5ec9a5a..a7e1c17 100755
 --- a/autogen.sh
 +++ b/autogen.sh
 @@ -22,7 +22,19 @@ PKG_NAME=NetworkManager
  
  cd $srcdir
  
 -gtkdocize
 +GTKDOCIZE=`which gtkdocize` || true
 +if test -z $GTKDOCIZE; then
 +echo **Warning**: No GTK-Doc found, documentation won't be 
 generated 2
 +echo  and 'make dist' and 'make distcheck' will not work. 2
 +
 +# create minimal gtk-doc.make if missing as we depend on it
 +if test -f gtk-doc.make; then :; else
 +   printf EXTRA_DIST = \nCLEANFILES = \n  gtk-doc.make
 +fi
 +else
 +gtkdocize || exit $?
 +fi
 +
  autopoint --force
  AUTOPOINT='intltoolize --automake --copy' autoreconf --force -
 -install --verbose
  
 diff --git a/configure.ac b/configure.ac
 index e1a1917..c776d3d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -898,7 +898,12 @@ AS_IF([test $with_valgrind != no],
   AC_SUBST(VALGRIND_RULES, []))
  AM_CONDITIONAL(WITH_VALGRIND, test ${with_valgrind} != no)
  
 -GTK_DOC_CHECK(1.0)
 +# Check for GTK_DOC_CHECK availability. The GTK_DOC_CHECK invocation
 +# must be on its own line, gtkdocize relies on it
 +m4_ifdef([GTK_DOC_CHECK], [
 +GTK_DOC_CHECK([1.0])
 +])
 +AM_CONDITIONAL(ENABLE_GTK_DOC, test $enable_gtk_doc = yes)
  
  # check for pregenerated manpages to be installed
  install_pregen_manpages=no
___
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list