1.1 --- a/Makefile.am	Tue Jun 20 15:20:08 2006 +0000
     1.2 +++ b/Makefile.am	Wed Jun 21 08:35:23 2006 +0000
     1.3 @@ -1,10 +1,7 @@
     1.4  ACLOCAL_AMFLAGS = -I m4
     1.5  
     1.6  EXTRA_DIST = \
     1.7 -	build-aux/config.rpath \
     1.8 -	build-aux/mkinstalldirs \
     1.9  	LICENSE \
    1.10 -	ABOUT-NLS \
    1.11  	lemon.spec \
    1.12  	autopackage/default.apspec.in \
    1.13  	m4/lx_check_cplex.m4 \
    1.14 @@ -13,9 +10,6 @@
    1.15  if WANT_DOC
    1.16    MAYBE_DOC = doc
    1.17  endif
    1.18 -if WANT_GUI
    1.19 -  MAYBE_GUI = gui
    1.20 -endif
    1.21  if WANT_DEMO
    1.22    MAYBE_DEMO = demo
    1.23  endif
    1.24 @@ -23,7 +17,7 @@
    1.25    MAYBE_BENCHMARK = benchmark
    1.26  endif
    1.27  
    1.28 -SUBDIRS = lemon po m4 $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
    1.29 +SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
    1.30  
    1.31  MRPROPERFILES = \
    1.32  	aclocal.m4 \
    1.33 @@ -37,57 +31,13 @@
    1.34  	build-aux/install-sh \
    1.35  	build-aux/ltmain.sh \
    1.36  	build-aux/missing \
    1.37 -	build-aux/mkinstalldirs \
    1.38 -	build-aux/config.rpath \
    1.39  	doc/Makefile.in \
    1.40  	doc/doxygen.log \
    1.41  	Makefile.in \
    1.42  	lemon/Makefile.in \
    1.43  	test/Makefile.in \
    1.44  	benchmark/Makefile.in \
    1.45 -	demo/Makefile.in \
    1.46 -	gui/icons/Makefile.in \
    1.47 -	gui/Makefile.in \
    1.48 -	ABOUT-NLS \
    1.49 -	m4/Makefile.in \
    1.50 -	m4/lib-link.m4 \
    1.51 -	m4/printf-posix.m4 \
    1.52 -	m4/uintmax_t.m4 \
    1.53 -	m4/signed.m4 \
    1.54 -	m4/iconv.m4 \
    1.55 -	m4/inttypes.m4 \
    1.56 -	m4/longlong.m4 \
    1.57 -	m4/glibc21.m4 \
    1.58 -	m4/inttypes_h.m4 \
    1.59 -	m4/codeset.m4 \
    1.60 -	m4/longdouble.m4 \
    1.61 -	m4/nls.m4 \
    1.62 -	m4/intmax.m4 \
    1.63 -	m4/lib-prefix.m4 \
    1.64 -	m4/glibc2.m4 \
    1.65 -	m4/xsize.m4 \
    1.66 -	m4/lcmessage.m4 \
    1.67 -	m4/lib-ld.m4 \
    1.68 -	m4/ulonglong.m4 \
    1.69 -	m4/wint_t.m4 \
    1.70 -	m4/progtest.m4 \
    1.71 -	m4/inttypes-pri.m4 \
    1.72 -	m4/stdint_h.m4 \
    1.73 -	m4/intdiv0.m4 \
    1.74 -	m4/isc-posix.m4 \
    1.75 -	m4/po.m4 \
    1.76 -	m4/size_max.m4 \
    1.77 -	m4/gettext.m4 \
    1.78 -	m4/wchar_t.m4 \
    1.79 -	po/Rules-quot \
    1.80 -	po/en@quot.header \
    1.81 -	po/insert-header.sin \
    1.82 -	po/quot.sed \
    1.83 -	po/en@boldquot.header \
    1.84 -	po/boldquot.sed \
    1.85 -	po/Makevars.template \
    1.86 -	po/remove-potcdate.sin \
    1.87 -	po/Makefile.in.in
    1.88 +	demo/Makefile.in
    1.89  
    1.90  doc-clean:
    1.91  	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html

     2.1 --- a/bootstrap	Tue Jun 20 15:20:08 2006 +0000
     2.2 +++ b/bootstrap	Wed Jun 21 08:35:23 2006 +0000
     2.3 @@ -75,12 +75,9 @@
     2.4    autoheader=autoheader-$acver
     2.5  fi
     2.6  
     2.7 -quiet || echo "Try using 'autoreconf -vi' instead of this."
     2.8 -
     2.9  set -e
    2.10  quiet || set -x
    2.11  
    2.12 -autopoint
    2.13  $aclocal -I m4
    2.14  (quiet && exec > /dev/null; libtoolize --force --copy)
    2.15  $autoconf

     3.1 --- a/configure.ac	Tue Jun 20 15:20:08 2006 +0000
     3.2 +++ b/configure.ac	Wed Jun 21 08:35:23 2006 +0000
     3.3 @@ -17,10 +17,6 @@
     3.4  AC_DISABLE_SHARED
     3.5  AC_PROG_LIBTOOL
     3.6  
     3.7 -dnl i18n
     3.8 -AM_GNU_GETTEXT_VERSION([0.14.2])
     3.9 -AM_GNU_GETTEXT([external])
    3.10 -
    3.11  if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
    3.12    CXXFLAGS="$CXXFLAGS -Wall -W"
    3.13  fi
    3.14 @@ -58,22 +54,6 @@
    3.15  AC_SUBST(DOXYGEN_INTERNAL_DOCS)
    3.16  AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
    3.17  
    3.18 -dnl Disable/enable building the GUI
    3.19 -AC_ARG_ENABLE([gui],
    3.20 -AS_HELP_STRING([--enable-gui], [build the GUI])
    3.21 -AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]),
    3.22 -              [], [enable_gui=no])
    3.23 -AC_MSG_CHECKING([whether to build the GUI])
    3.24 -if test x"$enable_gui" != x"no"; then
    3.25 -  AC_MSG_RESULT([yes])
    3.26 -else
    3.27 -  AC_MSG_RESULT([no])
    3.28 -fi
    3.29 -if test x"$enable_gui" != x"no"; then
    3.30 -  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0 gtkmm-2.4 >= 2.6])
    3.31 -fi
    3.32 -AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
    3.33 -
    3.34  dnl Disable/enable building the demo programs
    3.35  AC_ARG_ENABLE([demo],
    3.36  AS_HELP_STRING([--enable-demo], [build the demo programs])
    3.37 @@ -125,9 +105,6 @@
    3.38  benchmark/Makefile
    3.39  demo/Makefile
    3.40  test/Makefile
    3.41 -gui/Makefile
    3.42 -po/Makefile.in
    3.43 -m4/Makefile
    3.44  ])
    3.45  
    3.46  AC_OUTPUT
    3.47 @@ -145,7 +122,6 @@
    3.48  echo
    3.49  echo build benchmarks.............. : $enable_benchmark
    3.50  echo build demo programs........... : $enable_demo
    3.51 -echo build GUI..................... : $enable_gui
    3.52  echo
    3.53  echo The packace will be installed in
    3.54  echo -n '  '

     4.1 --- a/m4/Makefile.am	Tue Jun 20 15:20:08 2006 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,30 +0,0 @@
     4.4 -EXTRA_DIST = \
     4.5 -	codeset.m4 \
     4.6 -	gettext.m4 \
     4.7 -	glibc21.m4 \
     4.8 -	glibc2.m4 \
     4.9 -	iconv.m4 \
    4.10 -	intdiv0.m4 \
    4.11 -	intmax.m4 \
    4.12 -	inttypes_h.m4 \
    4.13 -	inttypes.m4 \
    4.14 -	inttypes-pri.m4 \
    4.15 -	isc-posix.m4 \
    4.16 -	lcmessage.m4 \
    4.17 -	lib-ld.m4 \
    4.18 -	lib-link.m4 \
    4.19 -	lib-prefix.m4 \
    4.20 -	longdouble.m4 \
    4.21 -	longlong.m4 \
    4.22 -	nls.m4 \
    4.23 -	po.m4 \
    4.24 -	printf-posix.m4 \
    4.25 -	progtest.m4 \
    4.26 -	signed.m4 \
    4.27 -	size_max.m4 \
    4.28 -	stdint_h.m4 \
    4.29 -	uintmax_t.m4 \
    4.30 -	ulonglong.m4 \
    4.31 -	wchar_t.m4 \
    4.32 -	wint_t.m4 \
    4.33 -	xsize.m4