1.1 --- a/configure.ac Tue Jan 22 10:59:14 2008 +0000
1.2 +++ b/configure.ac Wed Jan 23 16:26:41 2008 +0100
1.3 @@ -26,44 +26,17 @@
1.4 AC_DISABLE_SHARED
1.5 AC_PROG_LIBTOOL
1.6
1.7 +AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
1.8 +
1.9 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
1.10 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"
1.11 fi
1.12
1.13 -AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
1.14 -
1.15 dnl Checks for libraries.
1.16 LX_CHECK_GLPK
1.17 LX_CHECK_CPLEX
1.18 LX_CHECK_SOPLEX
1.19
1.20 -dnl Enable/disable installing the documentation
1.21 -AC_ARG_ENABLE([doc],
1.22 -AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@])
1.23 -AS_HELP_STRING([--disable-doc], [do not build the documentation]),
1.24 - [], [enable_doc=yes])
1.25 -
1.26 -AC_MSG_CHECKING([whether to build the documention])
1.27 -case "$enable_doc" in
1.28 - yes)
1.29 - DOXYGEN_INTERNAL_DOCS=NO
1.30 - AC_MSG_RESULT([yes])
1.31 - ;;
1.32 - full)
1.33 - DOXYGEN_INTERNAL_DOCS=YES
1.34 - AC_MSG_RESULT([full])
1.35 - ;;
1.36 - no)
1.37 - DOXYGEN_INTERNAL_DOCS=NO
1.38 - AC_MSG_RESULT([no])
1.39 - ;;
1.40 - *)
1.41 - AC_MSG_ERROR([bad value $enable_doc for option --enable-doc])
1.42 - ;;
1.43 -esac
1.44 -AC_SUBST(DOXYGEN_INTERNAL_DOCS)
1.45 -AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
1.46 -
1.47 dnl Disable/enable building the demo programs
1.48 AC_ARG_ENABLE([demo],
1.49 AS_HELP_STRING([--enable-demo], [build the demo programs])
1.50 @@ -145,10 +118,6 @@
1.51 echo -n ' '
1.52 echo $prefix.
1.53 echo
1.54 -echo The documentation will be installed in
1.55 -echo -n ' '
1.56 -eval echo ${datadir}/doc/$PACKAGE.
1.57 -echo
1.58 echo '*********************************************************************'
1.59
1.60 echo