Attachment #55408 for bug #46657

Lines 144-150 Link Here

(-)gtkspell3/docs/Makefile.am (-1 / +4 lines)
144		144
145	install-data-local:	145	install-data-local:
146	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)	146	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
147	(installfiles=`echo $(srcdir)/html/*.html`; \	147	(installfiles=`echo $(srcdir)/html/.html $(srcdir)/html/.png`; \
148	if test "$$installfiles" = '$(srcdir)/html/*.html'; \	148	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
149	then echo '-- Nothing to install' ; \	149	then echo '-- Nothing to install' ; \
150	else \	150	else \
Lines 152-157 Link Here
152	echo '-- Installing '$$i ; \	152	echo '-- Installing '$$i ; \
153	$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \	153	$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
154	done; \	154	done; \
		155	echo '-- Installing $(srcdir)/html/$(DOC_MODULE).devhelp' ; \
		156	$(INSTALL_DATA) $(srcdir)/html/$(DOC_MODULE).devhelp \
		157	$(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-3.0.devhelp; \
155	echo '-- Installing $(srcdir)/html/index.sgml' ; \	158	echo '-- Installing $(srcdir)/html/index.sgml' ; \
156	$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \	159	$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
157	fi)	160	fi)




PKG_CHECK_MODULES(PANGO, [pango >= 1.3.5],
   [AC_DEFINE(HAVE_PANGO_UNDERLINE_ERROR, 1, [Define to 1 if PANGO_UNDERLINE_ERROR is available.])],
   [AC_MSG_WARN([Disabling new error underlining since pango < 1.3.5])])                                                                                                                                               
# gtk-doc check:
# from http://cvs.gnome.org/lxr/source/gtk-doc/examples/configure.in
AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=PATH],[path to installed docs]))

if test "x$with_html_dir" = "x" ; then
  HTML_DIR='${datadir}/gtk-doc/html'
else
  HTML_DIR=$with_html_dir
fi

AC_SUBST(HTML_DIR)

gtk_doc_min_version=1.0
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
  AC_MSG_RESULT(yes)
  GTKDOC=true
else
  AC_MSG_RESULT(no)
  GTKDOC=false
fi

dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, AC_HELP_STRING([--enable-gtk-doc],[Use gtk-doc to build documentation [[default=auto]]]), enable_gtk_doc="$enableval", enable_gtk_doc=auto)

if test x$enable_gtk_doc = xauto ; then
  if test x$GTKDOC = xtrue ; then
    enable_gtk_doc=yes
  else
    enable_gtk_doc=no 
  fi
fi

GTK_DOC_CHECK(1.0)

# end gtk-doc check.

AC_PROG_CC
AC_PROG_LIBTOOL

Return to bug 46657

Lines 17-58 Link Here

(-)gtkspell3/configure.ac (-35 / +1 lines)
17	PKG_CHECK_MODULES(PANGO, [pango >= 1.3.5],	14	PKG_CHECK_MODULES(PANGO, [pango >= 1.3.5],
18	[AC_DEFINE(HAVE_PANGO_UNDERLINE_ERROR, 1, [Define to 1 if PANGO_UNDERLINE_ERROR is available.])],	15	[AC_DEFINE(HAVE_PANGO_UNDERLINE_ERROR, 1, [Define to 1 if PANGO_UNDERLINE_ERROR is available.])],
19	[AC_MSG_WARN([Disabling new error underlining since pango < 1.3.5])])	16	[AC_MSG_WARN([Disabling new error underlining since pango < 1.3.5])])
20	# gtk-doc check:
21	# from http://cvs.gnome.org/lxr/source/gtk-doc/examples/configure.in
22	AC_ARG_WITH(html-dir, AC_HELP_STRING([--with-html-dir=PATH],[path to installed docs]))
23
24	if test "x$with_html_dir" = "x" ; then
25	HTML_DIR='${datadir}/gtk-doc/html'
26	else
27	HTML_DIR=$with_html_dir
28	fi
29
30	AC_SUBST(HTML_DIR)
31
32	gtk_doc_min_version=1.0
33	AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
34	if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then
35	AC_MSG_RESULT(yes)
36	GTKDOC=true
37	else
38	AC_MSG_RESULT(no)
39	GTKDOC=false
40	fi
41
42	dnl Let people disable the gtk-doc stuff.
43	AC_ARG_ENABLE(gtk-doc, AC_HELP_STRING([--enable-gtk-doc],[Use gtk-doc to build documentation [[default=auto]]]), enable_gtk_doc="$enableval", enable_gtk_doc=auto)
44
45	if test x$enable_gtk_doc = xauto ; then
46	if test x$GTKDOC = xtrue ; then
47	enable_gtk_doc=yes
48	else
49	enable_gtk_doc=no
50	fi
51	fi
52		17
53	AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)	18	GTK_DOC_CHECK(1.0)
54
55	# end gtk-doc check.
56		19
57	AC_PROG_CC	20	AC_PROG_CC
58	AC_PROG_LIBTOOL	21	AC_PROG_LIBTOOL