Demos and benchmarks are not built by default now. They can be enabled with the --enable-demo and --enable-benchmark configure flags.
authorladanyi
Sun, 18 Dec 2005 03:01:53 +0000
changeset 186312e0db6b7d0e
parent 1862 d47ebd34e581
child 1864 1788205e36af
Demos and benchmarks are not built by default now. They can be enabled with the --enable-demo and --enable-benchmark configure flags.
Makefile.am
config/lx_enable_doc.m4
config/lx_enable_gui.m4
configure.ac
     1.1 --- a/Makefile.am	Sun Dec 18 01:51:03 2005 +0000
     1.2 +++ b/Makefile.am	Sun Dec 18 03:01:53 2005 +0000
     1.3 @@ -5,9 +5,7 @@
     1.4  	lemon.spec \
     1.5  	autopackage/default.apspec.in \
     1.6  	config/lx_check_cplex.m4 \
     1.7 -	config/lx_check_glpk.m4 \
     1.8 -	config/lx_enable_doc.m4 \
     1.9 -	config/lx_enable_gui.m4
    1.10 +	config/lx_check_glpk.m4
    1.11  
    1.12  if WANT_DOC
    1.13    MAYBE_DOC = doc
    1.14 @@ -15,8 +13,14 @@
    1.15  if WANT_GUI
    1.16    MAYBE_GUI = gui
    1.17  endif
    1.18 +if WANT_DEMO
    1.19 +  MAYBE_DEMO = demo
    1.20 +endif
    1.21 +if WANT_BENCHMARK
    1.22 +  MAYBE_BENCHMARK = benchmark
    1.23 +endif
    1.24  
    1.25 -SUBDIRS = lemon benchmark demo $(MAYBE_GUI) $(MAYBE_DOC) test
    1.26 +SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
    1.27  
    1.28  MRPROPERFILES = \
    1.29  	aclocal.m4 \
     2.1 --- a/config/lx_enable_doc.m4	Sun Dec 18 01:51:03 2005 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,28 +0,0 @@
     2.4 -AC_DEFUN([LX_ENABLE_DOC],
     2.5 -[
     2.6 -  AC_ARG_ENABLE([doc],
     2.7 -AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@])
     2.8 -AS_HELP_STRING([--disable-doc], [do not build the documentation]),
     2.9 -         [], [enable_doc=yes])
    2.10 -
    2.11 -  AC_MSG_CHECKING([whether to build the documention])
    2.12 -  case "$enable_doc" in
    2.13 -    yes)
    2.14 -      DOXYGEN_INTERNAL_DOCS=NO
    2.15 -      AC_MSG_RESULT([yes])
    2.16 -      ;;
    2.17 -    full)
    2.18 -      DOXYGEN_INTERNAL_DOCS=YES
    2.19 -      AC_MSG_RESULT([full])
    2.20 -      ;;
    2.21 -    no)
    2.22 -      DOXYGEN_INTERNAL_DOCS=NO
    2.23 -      AC_MSG_RESULT([no])
    2.24 -      ;;
    2.25 -    *)
    2.26 -      AC_MSG_ERROR([bad value $enable_doc for option --enable-doc])
    2.27 -      ;;
    2.28 -  esac
    2.29 -  AC_SUBST(DOXYGEN_INTERNAL_DOCS)
    2.30 -  AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
    2.31 -])
     3.1 --- a/config/lx_enable_gui.m4	Sun Dec 18 01:51:03 2005 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,18 +0,0 @@
     3.4 -AC_DEFUN([LX_ENABLE_GUI],
     3.5 -[
     3.6 -  AC_ARG_ENABLE([gui],
     3.7 -AS_HELP_STRING([--enable-gui], [build the GUI])
     3.8 -AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]),
     3.9 -         [], [enable_gui=no])
    3.10 -
    3.11 -  AC_MSG_CHECKING([whether to build the GUI])
    3.12 -  if test x"$enable_gui" != x"no"; then
    3.13 -      AC_MSG_RESULT([yes])
    3.14 -  else
    3.15 -      AC_MSG_RESULT([no])
    3.16 -  fi
    3.17 -  if test x"$enable_gui" != x"no"; then
    3.18 -    PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
    3.19 -  fi
    3.20 -  AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
    3.21 -])
     4.1 --- a/configure.ac	Sun Dec 18 01:51:03 2005 +0000
     4.2 +++ b/configure.ac	Sun Dec 18 03:01:53 2005 +0000
     4.3 @@ -23,8 +23,77 @@
     4.4  LX_CHECK_GLPK
     4.5  LX_CHECK_CPLEX
     4.6  
     4.7 -LX_ENABLE_DOC
     4.8 -LX_ENABLE_GUI
     4.9 +dnl Enable/disable installing the documentation
    4.10 +AC_ARG_ENABLE([doc],
    4.11 +AS_HELP_STRING([--enable-doc@<:@=yes|no|full@:>@], [build the documentation (full enables internal documentation too) @<:@default=yes@:>@])
    4.12 +AS_HELP_STRING([--disable-doc], [do not build the documentation]),
    4.13 +              [], [enable_doc=yes])
    4.14 +
    4.15 +AC_MSG_CHECKING([whether to build the documention])
    4.16 +case "$enable_doc" in
    4.17 +  yes)
    4.18 +    DOXYGEN_INTERNAL_DOCS=NO
    4.19 +    AC_MSG_RESULT([yes])
    4.20 +    ;;
    4.21 +  full)
    4.22 +    DOXYGEN_INTERNAL_DOCS=YES
    4.23 +    AC_MSG_RESULT([full])
    4.24 +    ;;
    4.25 +  no)
    4.26 +    DOXYGEN_INTERNAL_DOCS=NO
    4.27 +    AC_MSG_RESULT([no])
    4.28 +    ;;
    4.29 +  *)
    4.30 +    AC_MSG_ERROR([bad value $enable_doc for option --enable-doc])
    4.31 +    ;;
    4.32 +esac
    4.33 +AC_SUBST(DOXYGEN_INTERNAL_DOCS)
    4.34 +AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
    4.35 +
    4.36 +dnl Disable/enable building the GUI
    4.37 +AC_ARG_ENABLE([gui],
    4.38 +AS_HELP_STRING([--enable-gui], [build the GUI])
    4.39 +AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]),
    4.40 +              [], [enable_gui=no])
    4.41 +AC_MSG_CHECKING([whether to build the GUI])
    4.42 +if test x"$enable_gui" != x"no"; then
    4.43 +  AC_MSG_RESULT([yes])
    4.44 +else
    4.45 +  AC_MSG_RESULT([no])
    4.46 +fi
    4.47 +if test x"$enable_gui" != x"no"; then
    4.48 +  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
    4.49 +fi
    4.50 +AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
    4.51 +
    4.52 +dnl Disable/enable building the demo programs
    4.53 +AC_ARG_ENABLE([demo],
    4.54 +AS_HELP_STRING([--enable-demo], [build the demo programs])
    4.55 +AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
    4.56 +              [], [enable_demo=no])
    4.57 +AC_MSG_CHECKING([whether to build the demo programs])
    4.58 +if test x"$enable_demo" != x"no"; then
    4.59 +  AC_MSG_RESULT([yes])
    4.60 +else
    4.61 +  AC_MSG_RESULT([no])
    4.62 +fi
    4.63 +AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
    4.64 +
    4.65 +dnl Disable/enable building the benchmarks
    4.66 +AC_ARG_ENABLE([benchmark],
    4.67 +AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
    4.68 +AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]),
    4.69 +              [], [enable_benchmark=no])
    4.70 +AC_MSG_CHECKING([whether to build the benchmarks])
    4.71 +if test x"$enable_benchmark" != x"no"; then
    4.72 +  AC_MSG_RESULT([yes])
    4.73 +else
    4.74 +  AC_MSG_RESULT([no])
    4.75 +fi
    4.76 +AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"])
    4.77 +
    4.78 +dnl Checks for header files.
    4.79 +AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
    4.80  
    4.81  dnl Checks for header files.
    4.82  AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
    4.83 @@ -52,7 +121,6 @@
    4.84  demo/Makefile
    4.85  test/Makefile
    4.86  gui/Makefile
    4.87 -gui/icons/Makefile
    4.88  ])
    4.89  
    4.90  AC_OUTPUT
    4.91 @@ -68,6 +136,8 @@
    4.92  echo GLPK support.................. : $lx_glpk_found
    4.93  echo CPLEX support................. : $lx_cplex_found
    4.94  echo
    4.95 +echo build benchmarks.............. : $enable_benchmark
    4.96 +echo build demo programs........... : $enable_demo
    4.97  echo build GUI..................... : $enable_gui
    4.98  echo
    4.99  echo The packace will be installed in