Changeset 60:6ec5dbed8f18 in lemon-1.2 for configure.ac

Timestamp:

01/23/08 16:26:41 (17 years ago)

Author:

Akos Ladanyi <ladanyi@…>

Branch:

default

Children:

61:d718974f1290, 62:4790635473ef, 96:b55e501a90ee

Phase:

public

Message:

Reworked documentation generation and installation.
Details:

• Remove configure flag used to disable the automatic generation of the documentation when istalling.
• Now 'make html' generates the documentation.
• Now 'make install' does not install the documentation, 'make install-html' does that. The latter two changes follow newer automake conventions.
• This also fixes the bug that caused the documentation missing from the tarball.

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -27 +27 @@
 AC_PROG_LIBTOOL
 
+AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
+
 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
   CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
 fi
-
-AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
 
 dnl Checks for libraries.
@@ -37 +37 @@
 LX_CHECK_CPLEX
 LX_CHECK_SOPLEX
-
-dnl Enable/disable installing the documentation
-AC_ARG_ENABLE([doc],
-AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@])
-AS_HELP_STRING([--disable-doc], [do not build the documentation]),
-              [], [enable_doc=yes])
-
-AC_MSG_CHECKING([whether to build the documention])
-case "$enable_doc" in
-  yes)
-    DOXYGEN_INTERNAL_DOCS=NO
-    AC_MSG_RESULT([yes])
-    ;;
-  full)
-    DOXYGEN_INTERNAL_DOCS=YES
-    AC_MSG_RESULT([full])
-    ;;
-  no)
-    DOXYGEN_INTERNAL_DOCS=NO
-    AC_MSG_RESULT([no])
-    ;;
-  *)
-    AC_MSG_ERROR([bad value $enable_doc for option --enable-doc])
-    ;;
-esac
-AC_SUBST(DOXYGEN_INTERNAL_DOCS)
-AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
 
 dnl Disable/enable building the demo programs
@@ -146 +119 @@
 echo $prefix.
 echo
-echo The documentation will be installed in
-echo -n '  '
-eval echo ${datadir}/doc/$PACKAGE.
-echo
 echo '*********************************************************************'