1.1 --- a/bootstrap	Tue Apr 12 19:03:18 2005 +0000
     1.2 +++ b/bootstrap	Wed Apr 13 06:49:42 2005 +0000
     1.3 @@ -53,6 +53,7 @@
     1.4  automake=automake
     1.5  aclocal=aclocal
     1.6  autoconf=autoconf
     1.7 +autoheader=autoheader
     1.8  
     1.9  if test -n "$amver"
    1.10  then
    1.11 @@ -63,9 +64,12 @@
    1.12  if test -n "$acver"
    1.13  then
    1.14    autoconf=autoconf-$acver
    1.15 +  autoheader=autoheader-$acver
    1.16  fi
    1.17  
    1.18 -$aclocal \
    1.19 +set -x
    1.20 +$aclocal -I config \
    1.21  && libtoolize --force --copy \
    1.22 +&& $autoheader \
    1.23  && $automake --add-missing --copy --gnu \
    1.24  && $autoconf

     2.1 --- a/configure.ac	Tue Apr 12 19:03:18 2005 +0000
     2.2 +++ b/configure.ac	Wed Apr 13 06:49:42 2005 +0000
     2.3 @@ -1,8 +1,9 @@
     2.4  dnl Process this file with autoconf to produce a configure script.
     2.5  AC_INIT([LEMON], [0.4], [etik-ol@cs.elte.hu], [lemon])
     2.6  AC_CONFIG_AUX_DIR([config])
     2.7 -AM_INIT_AUTOMAKE(1.7)
     2.8 +AM_INIT_AUTOMAKE
     2.9  AC_CONFIG_SRCDIR([src/lemon/invalid.h])
    2.10 +AM_CONFIG_HEADER([config.h])
    2.11  AC_PREREQ(2.57)
    2.12  
    2.13  dnl Checks for programs.
    2.14 @@ -11,7 +12,10 @@
    2.15  AC_DISABLE_SHARED
    2.16  AC_PROG_LIBTOOL
    2.17  
    2.18 -CXXFLAGS="$CXXFLAGS -Wall"
    2.19 +dnl I know this is not perfect. A better solution will come soon.
    2.20 +if test $CXX != icc -a $CXX != icpc; then
    2.21 +  CXXFLAGS="$CXXFLAGS -Wall"
    2.22 +fi
    2.23  
    2.24  dnl Checks for libraries.
    2.25