[Lemon-commits] [lemon_svn] ladanyi: r1866 - in hugo/trunk: . config src src/demo src/gui src/gui/src

[Lemon SVN]

Author: ladanyi
Date: Thu May  5 17:34:43 2005
New Revision: 1866

Added:
   hugo/trunk/src/gui/   (props changed)
   hugo/trunk/src/gui/Makefile.am
   hugo/trunk/src/gui/src/   (props changed)
   hugo/trunk/src/gui/src/Makefile.am
   hugo/trunk/src/gui/src/main.cc
Modified:
   hugo/trunk/config/misc.m4
   hugo/trunk/configure.ac
   hugo/trunk/src/Makefile.am
   hugo/trunk/src/demo/   (props changed)

Log:
added directory and check for the GUI

Modified: hugo/trunk/config/misc.m4
==============================================================================
--- hugo/trunk/config/misc.m4	(original)
+++ hugo/trunk/config/misc.m4	Thu May  5 17:34:43 2005
@@ -26,3 +26,22 @@
   AC_SUBST(DOXYGEN_INTERNAL_DOCS)
   AM_CONDITIONAL([WANT_DOCS], [test x"$enable_docs" != x"no"])
 ])
+
+AC_DEFUN([LX_ENABLE_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"])
+])

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Thu May  5 17:34:43 2005
@@ -30,6 +30,7 @@
 LX_CHECK_CPLEX
 
 LX_ENABLE_DOCS
+LX_ENABLE_GUI
 
 dnl Checks for header files.
 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
@@ -56,6 +57,8 @@
 src/benchmark/Makefile
 src/demo/Makefile
 src/test/Makefile
+src/gui/Makefile
+src/gui/src/Makefile
 ])
 
 AC_OUTPUT
@@ -71,6 +74,8 @@
 echo GLPK support.................. : $lx_glpk_found
 echo CPLEX support................. : $lx_cplex_found
 echo
+echo build GUI..................... : $enable_gui
+echo
 echo The packace will be installed in
 echo -n '  '
 echo $prefix.

Modified: hugo/trunk/src/Makefile.am
==============================================================================
--- hugo/trunk/src/Makefile.am	(original)
+++ hugo/trunk/src/Makefile.am	Thu May  5 17:34:43 2005
@@ -1 +1,4 @@
-SUBDIRS = lemon benchmark demo test
+if WANT_GUI
+  MAYBE_GUI = gui
+endif
+SUBDIRS = lemon benchmark demo test $(MAYBE_GUI)

Added: hugo/trunk/src/gui/Makefile.am
==============================================================================
--- (empty file)
+++ hugo/trunk/src/gui/Makefile.am	Thu May  5 17:34:43 2005
@@ -0,0 +1 @@
+SUBDIRS = src

Added: hugo/trunk/src/gui/src/Makefile.am
==============================================================================
--- (empty file)
+++ hugo/trunk/src/gui/src/Makefile.am	Thu May  5 17:34:43 2005
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -I$(top_srcdir)/src
+LDADD = $(top_builddir)/src/lemon/libemon.la
+
+bin_PROGRAMS = gui
+
+gui_SOURCES = main.cc

Added: hugo/trunk/src/gui/src/main.cc
==============================================================================
--- (empty file)
+++ hugo/trunk/src/gui/src/main.cc	Thu May  5 17:34:43 2005
@@ -0,0 +1,10 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <iostream>
+
+int main()
+{
+  std::cout << "Hello World!" << std::endl;
+}