diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-11-18 20:15:22 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-11-18 20:15:22 +0000 |
| commit | f5a7c02f466a26b78441b8fcbc216c9eaafbb774 (patch) | |
| tree | 8483603d7b4171fac773df068bf052ae969bafd5 /configure.in | |
| parent | 588629232270b34680ef453c2c13392c9ccdd3d5 (diff) | |
| download | libsoup-f5a7c02f466a26b78441b8fcbc216c9eaafbb774.tar.gz | |
Replace old gtk-doc test with GTK_DOC_CHECK() (AC_OUTPUT): add
* configure.in: Replace old gtk-doc test with GTK_DOC_CHECK()
(AC_OUTPUT): add docs/Makefile, docs/reference/Makefile
* autogen.sh (REQUIRED_AUTOMAKE_VERSION): 1.6, for gtk-doc.make
* Makefile.am: updates for gtk-doc
(SUBDIRS): add back "docs"
* docs/Makefile.am (EXTRA_DIST): remove, since those old docs
aren't around any more
* docs/reference/*: set up gtk-doc
* libsoup/Makefile.am (INCLUDES): Change G_LOG_DOMAIN to
"libsoup". Remove unused defines.
* libsoup/soup-connection.c: Fix doc comments
* libsoup/soup-message.c: Likewise
* libsoup/soup-misc.c: Likewise
* libsoup/soup-socket.c: Likewise
* libsoup/soup-uri.c: Likewise
* libsoup/soup-address.h: Fixes to please gtk-doc
* libsoup/soup-connection.h: Likewise
* libsoup/soup-message.h: Likewise
* libsoup/soup-message-private.h: Likewise
* libsoup/soup-misc.h: Likewise
* libsoup/soup-server-auth.h: Likewise
* libsoup/soup-socket.h: Likewise
* libsoup/soup-status.h: Likewise
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 56 |
1 files changed, 6 insertions, 50 deletions
diff --git a/configure.in b/configure.in index b9bc653d..b14cf0e7 100644 --- a/configure.in +++ b/configure.in @@ -240,44 +240,10 @@ fi AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_LIBS) -dnl ********************************************* -dnl *** Checks for gtk-doc (lifted from glib) *** -dnl ********************************************* - -AC_ARG_WITH(html-dir, [ --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) - -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) -AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) -AC_SUBST(HAVE_GTK_DOC) - -AC_CHECK_PROG(DB2HTML, db2html, true, false) -AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) - -dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, - [ --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 - -dnl NOTE: We need to use a separate automake conditional for this -dnl to make this work with the tarballs. -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +dnl *************** +dnl *** gtk-doc *** +dnl *************** +GTK_DOC_CHECK([1.0]) dnl ************************************* @@ -306,16 +272,6 @@ AC_OUTPUT([ Makefile libsoup/Makefile tests/Makefile + docs/Makefile + docs/reference/Makefile ]) - -echo " - -Configuration: - - Source code location: ${srcdir} - Compiler: ${CC} - Build flags: ${CFLAGS} ${SOUP_DEBUG_FLAGS} - - SSL support: ${enable_ssl} - -" |