[Lemon-commits] [lemon_svn] ladanyi: r2794 - in hugo/trunk: . m4

[Lemon SVN]

Author: ladanyi
Date: Wed Jun 21 10:35:23 2006
New Revision: 2794

Removed:
   hugo/trunk/m4/Makefile.am
Modified:
   hugo/trunk/Makefile.am
   hugo/trunk/bootstrap
   hugo/trunk/configure.ac

Log:
Exclude the gui from the build.

Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am	(original)
+++ hugo/trunk/Makefile.am	Wed Jun 21 10:35:23 2006
@@ -1,10 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
-	build-aux/config.rpath \
-	build-aux/mkinstalldirs \
 	LICENSE \
-	ABOUT-NLS \
 	lemon.spec \
 	autopackage/default.apspec.in \
 	m4/lx_check_cplex.m4 \
@@ -13,9 +10,6 @@
 if WANT_DOC
   MAYBE_DOC = doc
 endif
-if WANT_GUI
-  MAYBE_GUI = gui
-endif
 if WANT_DEMO
   MAYBE_DEMO = demo
 endif
@@ -23,7 +17,7 @@
   MAYBE_BENCHMARK = benchmark
 endif
 
-SUBDIRS = lemon po m4 $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
+SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
 
 MRPROPERFILES = \
 	aclocal.m4 \
@@ -37,57 +31,13 @@
 	build-aux/install-sh \
 	build-aux/ltmain.sh \
 	build-aux/missing \
-	build-aux/mkinstalldirs \
-	build-aux/config.rpath \
 	doc/Makefile.in \
 	doc/doxygen.log \
 	Makefile.in \
 	lemon/Makefile.in \
 	test/Makefile.in \
 	benchmark/Makefile.in \
-	demo/Makefile.in \
-	gui/icons/Makefile.in \
-	gui/Makefile.in \
-	ABOUT-NLS \
-	m4/Makefile.in \
-	m4/lib-link.m4 \
-	m4/printf-posix.m4 \
-	m4/uintmax_t.m4 \
-	m4/signed.m4 \
-	m4/iconv.m4 \
-	m4/inttypes.m4 \
-	m4/longlong.m4 \
-	m4/glibc21.m4 \
-	m4/inttypes_h.m4 \
-	m4/codeset.m4 \
-	m4/longdouble.m4 \
-	m4/nls.m4 \
-	m4/intmax.m4 \
-	m4/lib-prefix.m4 \
-	m4/glibc2.m4 \
-	m4/xsize.m4 \
-	m4/lcmessage.m4 \
-	m4/lib-ld.m4 \
-	m4/ulonglong.m4 \
-	m4/wint_t.m4 \
-	m4/progtest.m4 \
-	m4/inttypes-pri.m4 \
-	m4/stdint_h.m4 \
-	m4/intdiv0.m4 \
-	m4/isc-posix.m4 \
-	m4/po.m4 \
-	m4/size_max.m4 \
-	m4/gettext.m4 \
-	m4/wchar_t.m4 \
-	po/Rules-quot \
-	po/en at quot.header \
-	po/insert-header.sin \
-	po/quot.sed \
-	po/en at boldquot.header \
-	po/boldquot.sed \
-	po/Makevars.template \
-	po/remove-potcdate.sin \
-	po/Makefile.in.in
+	demo/Makefile.in
 
 doc-clean:
 	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html

Modified: hugo/trunk/bootstrap
==============================================================================
--- hugo/trunk/bootstrap	(original)
+++ hugo/trunk/bootstrap	Wed Jun 21 10:35:23 2006
@@ -75,12 +75,9 @@
   autoheader=autoheader-$acver
 fi
 
-quiet || echo "Try using 'autoreconf -vi' instead of this."
-
 set -e
 quiet || set -x
 
-autopoint
 $aclocal -I m4
 (quiet && exec > /dev/null; libtoolize --force --copy)
 $autoconf

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Wed Jun 21 10:35:23 2006
@@ -17,10 +17,6 @@
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 
-dnl i18n
-AM_GNU_GETTEXT_VERSION([0.14.2])
-AM_GNU_GETTEXT([external])
-
 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
   CXXFLAGS="$CXXFLAGS -Wall -W"
 fi
@@ -58,22 +54,6 @@
 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 gtkmm-2.4 >= 2.6])
-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])
@@ -125,9 +105,6 @@
 benchmark/Makefile
 demo/Makefile
 test/Makefile
-gui/Makefile
-po/Makefile.in
-m4/Makefile
 ])
 
 AC_OUTPUT
@@ -145,7 +122,6 @@
 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
 echo -n '  '