[Lemon-commits] [lemon_svn] ladanyi: r1792 - hugo/trunk

[Lemon SVN]

Author: ladanyi
Date: Wed Apr 13 08:49:42 2005
New Revision: 1792

Modified:
   hugo/trunk/bootstrap
   hugo/trunk/configure.ac

Log:
 - added autoheader (just to reduce the compliers argument list)
 - don't add -Wall to CXXFLAGS when using Intel's compiler (because this causes
 a lot of remarks)


Modified: hugo/trunk/bootstrap
==============================================================================
--- hugo/trunk/bootstrap	(original)
+++ hugo/trunk/bootstrap	Wed Apr 13 08:49:42 2005
@@ -53,6 +53,7 @@
 automake=automake
 aclocal=aclocal
 autoconf=autoconf
+autoheader=autoheader
 
 if test -n "$amver"
 then
@@ -63,9 +64,12 @@
 if test -n "$acver"
 then
   autoconf=autoconf-$acver
+  autoheader=autoheader-$acver
 fi
 
-$aclocal \
+set -x
+$aclocal -I config \
 && libtoolize --force --copy \
+&& $autoheader \
 && $automake --add-missing --copy --gnu \
 && $autoconf

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Wed Apr 13 08:49:42 2005
@@ -1,8 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT([LEMON], [0.4], [etik-ol at cs.elte.hu], [lemon])
 AC_CONFIG_AUX_DIR([config])
-AM_INIT_AUTOMAKE(1.7)
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/lemon/invalid.h])
+AM_CONFIG_HEADER([config.h])
 AC_PREREQ(2.57)
 
 dnl Checks for programs.
@@ -11,7 +12,10 @@
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 
-CXXFLAGS="$CXXFLAGS -Wall"
+dnl I know this is not perfect. A better solution will come soon.
+if test $CXX != icc -a $CXX != icpc; then
+  CXXFLAGS="$CXXFLAGS -Wall"
+fi
 
 dnl Checks for libraries.