Sun, 09 Feb 2014 06:17:09 +0530
Don't require gtkdocize -- make gtk-doc really optional
| autogen.sh | file | annotate | diff | comparison | revisions | |
| configure.ac | file | annotate | diff | comparison | revisions |
--- a/autogen.sh Sat Feb 08 20:34:12 2014 +0530 +++ b/autogen.sh Sun Feb 09 06:17:09 2014 +0530 @@ -100,6 +100,22 @@ fi } +check_gtkdoc() { + printf "checking for gtkdocize... " + GTKDOCIZE=`which gtkdocize 2>/dev/null` + + if [ x"${GTKDOCIZE}" = x"" ] ; then + echo "not found." + echo "EXTRA_DIST =" > gtk-doc.make + echo "You don't have gtk-doc installed, and thus won't be able to +generate the documentation. +" + else + echo "${GTKDOCIZE}" + run_or_die ${GTKDOCIZE} ${GTKDOCIZE_FLAGS} + fi +} + cleanup () { rm -f autogen-?????? echo @@ -137,7 +153,6 @@ ############################################################################### check "$libtoolize"; LIBTOOLIZE=${BIN}; check "glib-gettextize"; GLIB_GETTEXTIZE=${BIN}; -check "gtkdocize"; GTKDOCIZE=${BIN}; check "intltoolize"; INTLTOOLIZE=${BIN}; check "sed"; SED=${BIN}; check "aclocal"; ACLOCAL=${BIN}; @@ -157,8 +172,8 @@ # glib-gettextize doesn't seems to use AM_V_GEN macro ${SED} -i -e "s:\\tfile=\`echo:\\t@echo -e \" GEN\\\\t\$\@\"; file=\`echo:g" po/Makefile.in.in run_or_die ${ACLOCAL} ${ACLOCAL_FLAGS:-"-I m4macros"} -run_or_die ${GTKDOCIZE} ${GTKDOCIZE_FLAGS} run_or_die ${AUTOHEADER} ${AUTOHEADER_FLAGS} +check_gtkdoc run_or_die ${AUTOMAKE} ${AUTOMAKE_FLAGS:-"-a -c --gnu"} run_or_die ${AUTOCONF} ${AUTOCONF_FLAGS}
--- a/configure.ac Sat Feb 08 20:34:12 2014 +0530 +++ b/configure.ac Sun Feb 09 06:17:09 2014 +0530 @@ -2867,6 +2867,10 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false) ]) +if test "x$enable_gtk_doc" = "x" ; then + enable_gtk_doc=no +fi + AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug], [compile with debugging support])], , enable_debug=no)