[Lemon-commits] [lemon_svn] ladanyi: r2435 - in hugo/trunk: . config

[Lemon SVN]

Author: ladanyi
Date: Sun Dec 18 04:01:53 2005
New Revision: 2435

Removed:
   hugo/trunk/config/lx_enable_doc.m4
   hugo/trunk/config/lx_enable_gui.m4
Modified:
   hugo/trunk/Makefile.am
   hugo/trunk/configure.ac

Log:
Demos and benchmarks are not built by default now. They can be enabled with the --enable-demo and --enable-benchmark configure flags.


Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am	(original)
+++ hugo/trunk/Makefile.am	Sun Dec 18 04:01:53 2005
@@ -5,9 +5,7 @@
 	lemon.spec \
 	autopackage/default.apspec.in \
 	config/lx_check_cplex.m4 \
-	config/lx_check_glpk.m4 \
-	config/lx_enable_doc.m4 \
-	config/lx_enable_gui.m4
+	config/lx_check_glpk.m4
 
 if WANT_DOC
   MAYBE_DOC = doc
@@ -15,8 +13,14 @@
 if WANT_GUI
   MAYBE_GUI = gui
 endif
+if WANT_DEMO
+  MAYBE_DEMO = demo
+endif
+if WANT_BENCHMARK
+  MAYBE_BENCHMARK = benchmark
+endif
 
-SUBDIRS = lemon benchmark demo $(MAYBE_GUI) $(MAYBE_DOC) test
+SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
 
 MRPROPERFILES = \
 	aclocal.m4 \

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Sun Dec 18 04:01:53 2005
@@ -23,8 +23,77 @@
 LX_CHECK_GLPK
 LX_CHECK_CPLEX
 
-LX_ENABLE_DOC
-LX_ENABLE_GUI
+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 GUI
+AC_ARG_ENABLE([gui],
+AS_HELP_STRING([--enable-gui], [build the GUI])
+AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]),
+              [], [enable_gui=no])
+AC_MSG_CHECKING([whether to build the GUI])
+if test x"$enable_gui" != x"no"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+if test x"$enable_gui" != x"no"; then
+  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
+fi
+AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
+
+dnl Disable/enable building the demo programs
+AC_ARG_ENABLE([demo],
+AS_HELP_STRING([--enable-demo], [build the demo programs])
+AS_HELP_STRING([--disable-demo], [do not build the demo programs @<:@default@:>@]),
+              [], [enable_demo=no])
+AC_MSG_CHECKING([whether to build the demo programs])
+if test x"$enable_demo" != x"no"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+AM_CONDITIONAL([WANT_DEMO], [test x"$enable_demo" != x"no"])
+
+dnl Disable/enable building the benchmarks
+AC_ARG_ENABLE([benchmark],
+AS_HELP_STRING([--enable-benchmark], [build the benchmarks])
+AS_HELP_STRING([--disable-benchmark], [do not build the benchmarks @<:@default@:>@]),
+              [], [enable_benchmark=no])
+AC_MSG_CHECKING([whether to build the benchmarks])
+if test x"$enable_benchmark" != x"no"; then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+AM_CONDITIONAL([WANT_BENCHMARK], [test x"$enable_benchmark" != x"no"])
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
 
 dnl Checks for header files.
 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
@@ -52,7 +121,6 @@
 demo/Makefile
 test/Makefile
 gui/Makefile
-gui/icons/Makefile
 ])
 
 AC_OUTPUT
@@ -68,6 +136,8 @@
 echo GLPK support.................. : $lx_glpk_found
 echo CPLEX support................. : $lx_cplex_found
 echo
+echo build benchmarks.............. : $enable_benchmark
+echo build demo programs........... : $enable_demo
 echo build GUI..................... : $enable_gui
 echo
 echo The packace will be installed in