[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2892] Check if `makeinfo' is present before build the
From: |
Giuseppe Scrivano |
Subject: |
[myserver-commit] [2892] Check if `makeinfo' is present before build the documentation. |
Date: |
Sun, 19 Oct 2008 16:31:51 +0000 |
Revision: 2892
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2892
Author: gscrivano
Date: 2008-10-19 16:31:51 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Check if `makeinfo' is present before build the documentation. Thanks to
Domenico Chierico <address@hidden>.
Modified Paths:
--------------
trunk/myserver/Makefile.am
trunk/myserver/configure.in
Modified: trunk/myserver/Makefile.am
===================================================================
--- trunk/myserver/Makefile.am 2008-10-19 15:30:12 UTC (rev 2891)
+++ trunk/myserver/Makefile.am 2008-10-19 16:31:51 UTC (rev 2892)
@@ -9,12 +9,16 @@
TESTS = tests
endif
+if BUILD_DOC
+DOCS = documentation
+endif
+
am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-pthread-check.m4 \
$(top_srcdir)/m4/fltk.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/libxml.m4 $(top_srcdir)/m4/cppunit.m4 \
$(top_srcdir)/configure.in
-SUBDIRS = src include $(CONTROL) $(CGI_LIB) binaries documentation $(TESTS)
+SUBDIRS = src include $(CONTROL) $(CGI_LIB) binaries $(DOCS) $(TESTS)
EXTRA_DIST = stdafx.h stdafx.cpp doxygen SConstruct
Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in 2008-10-19 15:30:12 UTC (rev 2891)
+++ trunk/myserver/configure.in 2008-10-19 16:31:51 UTC (rev 2892)
@@ -47,6 +47,14 @@
AM_PROG_LEX
AC_PROG_YACC
+AC_CHECK_PROG(make_info, makeinfo, yes, no)
+if test x$make_info = xno ; then
+ AC_MSG_WARN([ Cannot find makeinfo: info file will not be created])
+ MAKE_DOC=no
+else
+ MAKE_DOC=yes
+fi
+
CFLAGS="$CFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
CXXFLAGS="$CXXFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
LDFLAGS="$LDFLAGS $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)"
@@ -352,6 +360,7 @@
AM_CONDITIONAL(BUILD_MSCGI, test "$MAKE_MSCGI" = "yes")
AM_CONDITIONAL(BUILD_CONTROL, test "$MAKE_CONTROL" = "yes")
+AM_CONDITIONAL(BUILD_DOC, test "$MAKE_DOC" = "yes")
dnl AC_CONFIG_SUBDIRS()
AC_CONFIG_FILES([
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2892] Check if `makeinfo' is present before build the documentation.,
Giuseppe Scrivano <=