Author: yoann
Date: 2008-11-12 14:59:37 +0100 (Wed, 12 Nov 2008)
New Revision: 11089
Modified:
libprelude/trunk/Makefile.am
libprelude/trunk/m4/gtk-doc.m4
Log:
Update GtkDoc detection code.
Modified: libprelude/trunk/Makefile.am
===================================================================
--- libprelude/trunk/Makefile.am 2008-11-12 13:59:34 UTC (rev 11088)
+++ libprelude/trunk/Makefile.am 2008-11-12 13:59:37 UTC (rev 11089)
@@ -1,12 +1,7 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --without-system-ltdl --enable-easy-bindings
ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
-if HAVE_SYSTEM_LIBLTDL
-SUBDIRS = libmissing m4 src prelude-admin bindings docs tests
-else
SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs tests
-endif
-
DIST_SUBDIRS=$(SUBDIRS)
EXTRA_DIST = HACKING.README LICENSE.README tls.conf
Modified: libprelude/trunk/m4/gtk-doc.m4
===================================================================
--- libprelude/trunk/m4/gtk-doc.m4 2008-11-12 13:59:34 UTC (rev 11088)
+++ libprelude/trunk/m4/gtk-doc.m4 2008-11-12 13:59:37 UTC (rev 11089)
@@ -9,45 +9,31 @@
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
dnl for overriding the documentation installation directory
- AC_ARG_WITH(html-dir,
- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+ AC_ARG_WITH([html-dir],
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
[with_html_dir='${datadir}/gtk-doc/html'])
HTML_DIR="$with_html_dir"
- AC_SUBST(HTML_DIR)
+ AC_SUBST([HTML_DIR])
dnl enable/disable documentation building
- AC_ARG_ENABLE(gtk-doc,
- AC_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [default=no]]),,
- enable_gtk_doc=no)
+ AC_ARG_ENABLE([gtk-doc],
+ AS_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [[default=no]]]),,
+ [enable_gtk_doc=no])
- have_gtk_doc=no
if test x$enable_gtk_doc = xyes; then
- if test -z "$PKG_CONFIG"; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- fi
- if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
- have_gtk_doc=yes
- fi
-
- dnl do we want to do a version check?
-ifelse([$1],[],,
- [gtk_doc_min_version=$1
- if test "$have_gtk_doc" = yes; then
- 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)
- else
- AC_MSG_RESULT(no)
- have_gtk_doc=no
- fi
- fi
-])
- if test "$have_gtk_doc" != yes; then
- enable_gtk_doc=no
- fi
+ 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 gtk-doc]))])
fi
- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
+ AC_MSG_RESULT($enable_gtk_doc)
+
+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
])
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.