diff --git a/libprelude-4.0.0-fix-gtk-doc.patch b/libprelude-4.0.0-fix-gtk-doc.patch new file mode 100644 index 0000000..68b1c27 --- /dev/null +++ b/libprelude-4.0.0-fix-gtk-doc.patch @@ -0,0 +1,971 @@ +--- ./gtk-doc.make 2017-07-17 12:03:12.058000000 +0200 ++++ ./gtk-doc.make 2017-09-27 00:30:12.919918489 +0200 +@@ -25,6 +25,7 @@ + + SETUP_FILES = \ + $(content_files) \ ++ $(expand_content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt +@@ -33,9 +34,9 @@ + $(HTML_IMAGES) \ + $(SETUP_FILES) + +-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -49,9 +50,13 @@ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) ++gtkdoc-check.test: Makefile ++ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ ++ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ ++ chmod +x $@ ++ ++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test + +-if ENABLE_GTK_DOC + if GTK_DOC_BUILD_HTML + HTML_BUILD_STAMP=html-build.stamp + else +@@ -63,9 +68,11 @@ + PDF_BUILD_STAMP= + endif + +-all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +-else +-all-local: ++all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++.PHONY: all-gtk-doc ++ ++if ENABLE_GTK_DOC ++all-local: all-gtk-doc + endif + + docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +@@ -74,92 +81,70 @@ + + #### setup #### + +-GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +-GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) ++GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) + GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + + setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +- if test "x$$files" != "x" ; then \ +- for file in $$files ; do \ +- test -f $(abs_srcdir)/$$file && \ +- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ +- done; \ +- fi; \ +- test -d $(abs_srcdir)/tmpl && \ +- { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +- chmod -R u+w $(abs_builddir)/tmpl; } \ ++ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ ++ if test "x$$files" != "x" ; then \ ++ for file in $$files ; do \ ++ destdir=`dirname $(abs_builddir)/$$file`; \ ++ test -d "$$destdir" || mkdir -p "$$destdir"; \ ++ test -f $(abs_srcdir)/$$file && \ ++ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ ++ done; \ ++ fi; \ + fi + $(AM_V_at)touch setup-build.stamp + + #### scan #### + +-GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +-GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) ++GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) + GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +-GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +-GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) ++GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) + GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + +-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) ++scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ +- _source_dir="$${_source_dir} --source-dir=$$i" ; \ ++ _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- scanobj_options=""; \ +- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ +- if test "x$(V)" = "x1"; then \ +- scanobj_options="--verbose"; \ +- fi; \ ++ scanobj_options=""; \ ++ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ ++ if test "$$?" = "0"; then \ ++ if test "x$(V)" = "x1"; then \ ++ scanobj_options="--verbose"; \ + fi; \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ +- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ ++ fi; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ ++ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ +- for i in $(SCANOBJ_FILES) ; do \ +- test -f $$i || touch $$i ; \ +- done \ ++ for i in $(SCANOBJ_FILES) ; do \ ++ test -f $$i || touch $$i ; \ ++ done \ + fi + $(AM_V_at)touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-#### templates #### +- +-GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) +-GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +-GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; +- +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- $(AM_V_at)touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- +-$(srcdir)/tmpl/*.sgml: +- @true +- + #### xml #### + +-GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +-GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@) ++GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) + GTK_DOC_V_XML_0=@echo " DOC Building XML"; + +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +- $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ ++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent ++ $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ +- _source_dir="$${_source_dir} --source-dir=$$i" ; \ ++ _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp +@@ -167,53 +152,63 @@ + sgml.stamp: sgml-build.stamp + @true + ++$(DOC_MAIN_SGML_FILE): sgml-build.stamp ++ @true ++ ++xml/gtkdocentities.ent: Makefile ++ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ ) > $@ ++ + #### html #### + +-GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +-GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) ++GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) + GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +-GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +-GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) ++GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) + GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + +-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ +- if test -f $(abs_srcdir)/$$file ; then \ +- cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ +- fi; \ +- if test -f $(abs_builddir)/$$file ; then \ +- cp $(abs_builddir)/$$file $(abs_builddir)/html; \ +- fi; \ ++ test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ ++ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + + #### pdf #### + +-GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +-GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) ++GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) + GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ +@@ -235,13 +230,18 @@ + clean-local: + @rm -f *~ *.bak + @rm -rf .libs ++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ ++ rm -f $(DOC_MODULE).types; \ ++ fi ++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ ++ rm -f $(DOC_MODULE)-sections.txt; \ ++ fi + + distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ +- rm -rf tmpl; \ ++ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ + fi + + maintainer-clean-local: +@@ -280,18 +280,18 @@ + # + # Require gtk-doc when making dist + # +-if ENABLE_GTK_DOC ++if HAVE_GTK_DOC + dist-check-gtkdoc: docs + else + dist-check-gtkdoc: +- @echo "*** gtk-doc must be installed and enabled in order to make dist" ++ @echo "*** gtk-doc is needed to run 'make dist'. ***" ++ @echo "*** gtk-doc was not found when 'configure' ran. ***" ++ @echo "*** please install gtk-doc and rerun 'configure'. ***" + @false + endif + +-dist-hook: dist-check-gtkdoc dist-hook-local +- @mkdir $(distdir)/tmpl ++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html +- @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ +--- ./m4/gtk-doc.m4 2017-07-17 12:03:12.049000000 +0200 ++++ ./m4/gtk-doc.m4 2017-09-27 00:31:01.440837036 +0200 +@@ -1,6 +1,6 @@ + dnl -*- mode: autoconf -*- + +-# serial 1 ++# serial 2 + + dnl Usage: + dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +@@ -10,8 +10,24 @@ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ++ ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) ++ AC_MSG_CHECKING([for gtk-doc]) ++ PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) ++ AC_MSG_RESULT($have_gtk_doc) ++ ++ if test "$have_gtk_doc" = "no"; then ++ AC_MSG_WARN([ ++ You will not be able to create source packages with 'make dist' ++ because $gtk_doc_requires is not found.]) ++ fi ++ + dnl check for tools we added during development +- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) ++ dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that ++ dnl may not be writable by the user. Currently, automake requires that the ++ dnl test name must end in '.test'. ++ dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 ++ AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) ++ AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) + AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) + AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) + +@@ -28,22 +44,22 @@ + [use gtk-doc to build documentation [[default=no]]]),, + [enable_gtk_doc=no]) + +- if test x$enable_gtk_doc = xyes; then +- ifelse([$1],[], +- [PKG_CHECK_EXISTS([gtk-doc],, +- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], +- [PKG_CHECK_EXISTS([gtk-doc >= $1],, +- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) +- dnl don't check for glib if we build glib +- if test "x$PACKAGE_NAME" != "xglib"; then +- dnl don't fail if someone does not have glib +- PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) +- fi +- fi +- + AC_MSG_CHECKING([whether to build gtk-doc documentation]) + AC_MSG_RESULT($enable_gtk_doc) + ++ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then ++ AC_MSG_ERROR([ ++ You must have $gtk_doc_requires installed to build documentation for ++ $PACKAGE_NAME. Please install gtk-doc or disable building the ++ documentation by adding '--disable-gtk-doc' to '[$]0'.]) ++ fi ++ ++ dnl don't check for glib if we build glib ++ if test "x$PACKAGE_NAME" != "xglib"; then ++ dnl don't fail if someone does not have glib ++ PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) ++ fi ++ + dnl enable/disable output formats + AC_ARG_ENABLE([gtk-doc-html], + AS_HELP_STRING([--enable-gtk-doc-html], +@@ -63,6 +79,7 @@ + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + ++ AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) + AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) + AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) +--- ./configure 2017-09-27 00:41:33.778738779 +0200 ++++ ./configure 2017-09-27 00:42:12.709870750 +0200 +@@ -682,11 +682,14 @@ + GTK_DOC_BUILD_HTML_TRUE + ENABLE_GTK_DOC_FALSE + ENABLE_GTK_DOC_TRUE ++HAVE_GTK_DOC_FALSE ++HAVE_GTK_DOC_TRUE + GTKDOC_DEPS_LIBS + GTKDOC_DEPS_CFLAGS + HTML_DIR + GTKDOC_MKPDF + GTKDOC_REBASE ++GTKDOC_CHECK_PATH + GTKDOC_CHECK + LIBTESTS_LIBDEPS + YIELD_LIB +@@ -52904,16 +52905,78 @@ + + + +- # Extract the first word of "gtkdoc-check", so it can be a program name with args. ++ gtk_doc_requires="gtk-doc >= 1.0" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 ++$as_echo_n "checking for gtk-doc... " >&6; } ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ have_gtk_doc=yes ++else ++ have_gtk_doc=no ++fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 ++$as_echo "$have_gtk_doc" >&6; } ++ ++ if test "$have_gtk_doc" = "no"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ++ You will not be able to create source packages with 'make dist' ++ because $gtk_doc_requires is not found." >&5 ++$as_echo "$as_me: WARNING: ++ You will not be able to create source packages with 'make dist' ++ because $gtk_doc_requires is not found." >&2;} ++ fi ++ ++ # Extract the first word of "gtkdoc-check", so it can be a program name with args. + set dummy gtkdoc-check; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_GTKDOC_CHECK+:} false; then : ++if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 + else +- case $GTKDOC_CHECK in ++ if test -n "$GTKDOC_CHECK"; then ++ ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK ++if test -n "$GTKDOC_CHECK"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 ++$as_echo "$GTKDOC_CHECK" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ # Extract the first word of "gtkdoc-check", so it can be a program name with args. ++set dummy gtkdoc-check; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ case $GTKDOC_CHECK_PATH in + [\\/]* | ?:[\\/]*) +- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. ++ ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -52923,7 +52986,7 @@ + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +@@ -52934,10 +52997,10 @@ + ;; + esac + fi +-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK +-if test -n "$GTKDOC_CHECK"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +-$as_echo "$GTKDOC_CHECK" >&6; } ++GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH ++if test -n "$GTKDOC_CHECK_PATH"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 ++$as_echo "$GTKDOC_CHECK_PATH" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -53050,18 +53113,19 @@ + fi + + +- if test x$enable_gtk_doc = xyes; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- : +-else +- as_fn_error $? "You need to have gtk-doc >= 1.0 installed to build $PACKAGE_NAME" "$LINENO" 5 +-fi +- if test "x$PACKAGE_NAME" != "xglib"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 ++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 ++$as_echo "$enable_gtk_doc" >&6; } ++ ++ if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then ++ as_fn_error $? " ++ You must have $gtk_doc_requires installed to build documentation for ++ $PACKAGE_NAME. Please install gtk-doc or disable building the ++ documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 ++ fi ++ ++ if test "x$PACKAGE_NAME" != "xglib"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 +@@ -53133,14 +53197,8 @@ + $as_echo "yes" >&6; } + + fi +- fi + fi + +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +-$as_echo "$enable_gtk_doc" >&6; } +- + # Check whether --enable-gtk-doc-html was given. + if test "${enable_gtk_doc_html+set}" = set; then : + enableval=$enable_gtk_doc_html; +@@ -53165,6 +53223,14 @@ + fi + + ++ if test x$have_gtk_doc = xyes; then ++ HAVE_GTK_DOC_TRUE= ++ HAVE_GTK_DOC_FALSE='#' ++else ++ HAVE_GTK_DOC_TRUE='#' ++ HAVE_GTK_DOC_FALSE= ++fi ++ + if test x$enable_gtk_doc = xyes; then + ENABLE_GTK_DOC_TRUE= + ENABLE_GTK_DOC_FALSE='#' +@@ -54141,6 +54207,10 @@ + gltests_LTLIBOBJS=$gltests_ltlibobjs + + ++if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then ++ as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +--- ./docs/api/Makefile.in 2017-09-27 00:41:51.003354729 +0200 ++++ ./docs/api/Makefile.in 2017-09-27 00:42:18.025752223 +0200 +@@ -1,7 +1,7 @@ +-# Makefile.in generated by automake 1.13.4 from Makefile.am. ++# Makefile.in generated by automake 1.15.1 from Makefile.am. + # @configure_input@ + +-# Copyright (C) 1994-2013 Free Software Foundation, Inc. ++# Copyright (C) 1994-2017 Free Software Foundation, Inc. + + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -20,7 +20,17 @@ + # Everything below here is generic # + #################################### + VPATH = @srcdir@ +-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' ++am__is_gnu_make = { \ ++ if test -z '$(MAKELEVEL)'; then \ ++ false; \ ++ elif test -n '$(MAKE_HOST)'; then \ ++ true; \ ++ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ ++ true; \ ++ else \ ++ false; \ ++ fi; \ ++} + am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ +@@ -83,8 +93,6 @@ + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ +- $(srcdir)/Makefile.am + subdir = docs/api + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/libmissing/m4/00gnulib.m4 \ +@@ -279,6 +287,7 @@ + $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) ++DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +@@ -303,6 +312,7 @@ + *) (install-info --version) >/dev/null 2>&1;; \ + esac + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) ++am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + pkglibexecdir = @pkglibexecdir@ + ACLOCAL = @ACLOCAL@ +@@ -640,6 +650,7 @@ + GNULIB__EXIT = @GNULIB__EXIT@ + GREP = @GREP@ + GTKDOC_CHECK = @GTKDOC_CHECK@ ++GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ + GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ + GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ + GTKDOC_MKPDF = @GTKDOC_MKPDF@ +@@ -1441,6 +1452,7 @@ + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + SETUP_FILES = \ + $(content_files) \ ++ $(expand_content_files) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt +@@ -1451,9 +1463,9 @@ + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in + EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) +-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ ++DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ + html-build.stamp pdf-build.stamp \ +- tmpl.stamp sgml.stamp html.stamp pdf.stamp ++ sgml.stamp html.stamp pdf.stamp + + SCANOBJ_FILES = \ + $(DOC_MODULE).args \ +@@ -1467,46 +1479,41 @@ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +-@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp ++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test ++@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = ++@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp ++@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = ++@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + + #### setup #### +-GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +-GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@) ++GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) + GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + + #### scan #### +-GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +-GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@) ++GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) + GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +-GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +-GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@) ++GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) + GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +-#### templates #### +-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +-GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; +- + #### xml #### +-GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +-GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_XML = $(GTK_DOC_V_XML_@AM_V@) ++GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@) + GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + + #### html #### +-GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +-GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@) ++GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@) + GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +-GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +-GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@) ++GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@) + GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + + #### pdf #### +-GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +-GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) ++GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@) ++GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@) + GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; + + # Files not to distribute +@@ -1535,7 +1542,6 @@ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/api/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu docs/api/Makefile +-.PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ +@@ -1544,7 +1550,7 @@ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +-$(top_srcdir)/gtk-doc.make: ++$(top_srcdir)/gtk-doc.make $(am__empty): + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +@@ -1602,6 +1608,7 @@ + dist-hook + check-am: all-am + check: check-am ++@ENABLE_GTK_DOC_FALSE@all-local: + all-am: Makefile all-local + installdirs: + install: install-am +@@ -1718,9 +1725,18 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local + ++.PRECIOUS: Makefile + +-@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +-@ENABLE_GTK_DOC_FALSE@all-local: ++ ++gtkdoc-check.test: Makefile ++ $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ ++ echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ ++ chmod +x $@ ++ ++all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) ++.PHONY: all-gtk-doc ++ ++@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc + + docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) + +@@ -1728,64 +1744,48 @@ + + setup-build.stamp: + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ +- if test "x$$files" != "x" ; then \ +- for file in $$files ; do \ +- test -f $(abs_srcdir)/$$file && \ +- cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ +- done; \ +- fi; \ +- test -d $(abs_srcdir)/tmpl && \ +- { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ +- chmod -R u+w $(abs_builddir)/tmpl; } \ ++ files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ ++ if test "x$$files" != "x" ; then \ ++ for file in $$files ; do \ ++ destdir=`dirname $(abs_builddir)/$$file`; \ ++ test -d "$$destdir" || mkdir -p "$$destdir"; \ ++ test -f $(abs_srcdir)/$$file && \ ++ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ ++ done; \ ++ fi; \ + fi + $(AM_V_at)touch setup-build.stamp + +-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) ++scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ +- _source_dir="$${_source_dir} --source-dir=$$i" ; \ ++ _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ +- scanobj_options=""; \ +- gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ +- if test "x$(V)" = "x1"; then \ +- scanobj_options="--verbose"; \ +- fi; \ ++ scanobj_options=""; \ ++ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ ++ if test "$$?" = "0"; then \ ++ if test "x$(V)" = "x1"; then \ ++ scanobj_options="--verbose"; \ + fi; \ +- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ +- gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ ++ fi; \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ ++ gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + else \ +- for i in $(SCANOBJ_FILES) ; do \ +- test -f $$i || touch $$i ; \ +- done \ ++ for i in $(SCANOBJ_FILES) ; do \ ++ test -f $$i || touch $$i ; \ ++ done \ + fi + $(AM_V_at)touch scan-build.stamp + + $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt +- $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +- $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- if test -w $(abs_srcdir) ; then \ +- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ +- fi \ +- fi +- $(AM_V_at)touch tmpl-build.stamp +- +-tmpl.stamp: tmpl-build.stamp +- @true +- +-$(srcdir)/tmpl/*.sgml: +- @true +- +-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +- $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ ++sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent ++ $(GTK_DOC_V_XML)_source_dir='' ; \ + for i in $(DOC_SOURCE_DIR) ; do \ +- _source_dir="$${_source_dir} --source-dir=$$i" ; \ ++ _source_dir="$${_source_dir} --source-dir=$$i" ; \ + done ; \ + gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) + $(AM_V_at)touch sgml-build.stamp +@@ -1793,37 +1793,47 @@ + sgml.stamp: sgml-build.stamp + @true + +-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++$(DOC_MAIN_SGML_FILE): sgml-build.stamp ++ @true ++ ++xml/gtkdocentities.ent: Makefile ++ $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ echo ""; \ ++ ) > $@ ++ ++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ + gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ + fi; \ + cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + -@test "x$(HTML_IMAGES)" = "x" || \ + for file in $(HTML_IMAGES) ; do \ +- if test -f $(abs_srcdir)/$$file ; then \ +- cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ +- fi; \ +- if test -f $(abs_builddir)/$$file ; then \ +- cp $(abs_builddir)/$$file $(abs_builddir)/html; \ +- fi; \ ++ test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ ++ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + done; + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp + +-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ + gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ +- if test "$(?)" = "0"; then \ ++ if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + mkpdf_options="$$mkpdf_options --verbose"; \ + fi; \ +@@ -1845,13 +1855,18 @@ + clean-local: + @rm -f *~ *.bak + @rm -rf .libs ++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ ++ rm -f $(DOC_MODULE).types; \ ++ fi ++ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ ++ rm -f $(DOC_MODULE)-sections.txt; \ ++ fi + + distclean-local: + @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +- rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ +- rm -rf tmpl; \ ++ rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ + fi + + maintainer-clean-local: +@@ -1890,15 +1905,15 @@ + # + # Require gtk-doc when making dist + # +-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: +-@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" +-@ENABLE_GTK_DOC_FALSE@ @false ++@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs ++@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: ++@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" ++@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" ++@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" ++@HAVE_GTK_DOC_FALSE@ @false + +-dist-hook: dist-check-gtkdoc dist-hook-local +- @mkdir $(distdir)/tmpl ++dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local + @mkdir $(distdir)/html +- @-cp ./tmpl/*.sgml $(distdir)/tmpl + @cp ./html/* $(distdir)/html + @-cp ./$(DOC_MODULE).pdf $(distdir)/ + @-cp ./$(DOC_MODULE).types $(distdir)/ diff --git a/libprelude.spec b/libprelude.spec index 5fc61a8..d0d1c54 100644 --- a/libprelude.spec +++ b/libprelude.spec @@ -7,7 +7,7 @@ Name: libprelude Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Secure Connections between all Sensors and the Prelude Manager # Prelude is GPL-2.0+ # libmissing is LGPL-2.1+ @@ -29,10 +29,13 @@ Patch4: libprelude-4.0.0-fix_timegm.patch Patch5: libprelude-4.0.0-fix_pthread_atfork.patch # https://www.prelude-siem.org/issues/887 Patch6: libprelude-4.0.0-fix_prelude_tests_timer.patch +# https://www.prelude-siem.org/issues/908 +Patch7: libprelude-4.0.0-fix-gtk-doc.patch BuildRequires: bison BuildRequires: chrpath BuildRequires: flex BuildRequires: gtk-doc +BuildRequires: glib2-devel BuildRequires: swig BuildRequires: libgpg-error-devel BuildRequires: libtool-ltdl-devel @@ -236,6 +239,9 @@ make check %doc AUTHORS ChangeLog README NEWS %changelog +* Wed Sep 27 2017 Thomas Andrejak - 4.0.0-2 +- Fix compatibility with gtk-doc-1.26 + * Sat Sep 16 2017 Thomas Andrejak - 4.0.0-1 - Bump version 4.0.0