From: Andrea Zagli <azagli@libero.it>
Date: Tue, 13 Jun 2017 19:15:31 +0000 (+0200)
Subject: Merge branch 'array' into gtk-doc
X-Git-Tag: v0.1.0~1^2~11
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=26b954903604e9db2da353293f688baa04a70315;p=zakform%2Flibzakform

Merge branch 'array' into gtk-doc
---

26b954903604e9db2da353293f688baa04a70315
diff --cc .gitignore
index a6032c7,7e7e8db..c5af0fd
--- a/.gitignore
+++ b/.gitignore
@@@ -61,4 -51,5 +61,6 @@@ Rules-quo
  *.exe
  *.csv
  src/*marshal*.[ch]
- test-driver
++test-driver
+ *.gir
 -*.typelib
++*.typelib
diff --cc Makefile.am
index 6e50ffa,02ba245..5be9194
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 -DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
++DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
  
 -SUBDIRS = po src tests
 +SUBDIRS = po src tests docs
  
  ACLOCAL_AMFLAGS = -I m4
  
diff --cc configure.ac
index 12baf73,26b4093..e9e8e77
--- a/configure.ac
+++ b/configure.ac
@@@ -29,7 -29,10 +29,10 @@@ AC_PROG_MAKE_SE
  AC_PROG_LIBTOOL
  AC_PROG_RANLIB
  
 -GTK_DOC_CHECK(1.0)
 +GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ 
+ GOBJECT_INTROSPECTION_CHECK([1.30.0])
+ 
  IT_PROG_INTLTOOL
  
  dnl ******************************