diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 10:40:08 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-23 10:40:08 -0500 |
| commit | 71c86e677d8b6991ad360306ec574fedab737cb8 (patch) | |
| tree | 969d9625644be42097fa3058dc366fdf11edfe27 | |
| parent | 081d682b263decd8d4b60a8351de30c0e563f751 (diff) | |
configure.ac: clean up GTK_DOC_CHECK
The GTK_DOC_CHECK macro includes AC_ARG_ENABLE/AS_HELP_STRING etc
for --enable-gtk-doc and there is no need for a second check.
One caveat should be noted: GTK_DOC_CHECK must begin the line for
gtkdocize to recognize its presense in configure.ac.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 73e82a947b..9da8ba733b 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) -DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc - AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_TOOL(GPERF, gperf) @@ -230,11 +227,15 @@ AC_ARG_ENABLE([keymap], AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = "xyes"]) # ------------------------------------------------------------------------------ -AC_ARG_ENABLE(gtk-doc, AS_HELP_STRING([--disable-gtk-doc], [disable gtk-doc])) -AS_IF( - [test "x$enable_gtk_doc" = "xyes" -a "x$XSLTPROC" = x], - [AC_MSG_ERROR([*** GTK doc requested but xsltproc not found])] -) + +GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) +AM_CONDITIONAL([ENABLE_GTK_DOC],[test "x$enable_gtk_doc" = "xyes"]) + +AS_IF([test "x$enable_gtk_doc" = "xyes" -a "x$XSLTPROC" = x], [ + AC_MSG_ERROR([*** GTK doc requested but xsltproc not found]) +]) + +DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc # ------------------------------------------------------------------------------ have_manpages=no |