[Lemon-commits] Alpar Juttner: Merge bugfix #280

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/673c9d6bef44
changeset: 677:673c9d6bef44
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Apr 29 16:49:52 2009 +0100
description:
	Merge bugfix #280

diffstat:

 lemon/Makefile.am |  3 ++-
 lemon/core.h      |  2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs (32 lines):

diff --git a/lemon/Makefile.am b/lemon/Makefile.am
--- a/lemon/Makefile.am
+++ b/lemon/Makefile.am
@@ -16,6 +16,8 @@
 #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
 #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 
+nodist_lemon_HEADERS = lemon/config.h
+
 lemon_HEADERS += \
         lemon/arg_parser.h \
 	lemon/assert.h \
@@ -23,7 +25,6 @@
         lemon/bin_heap.h \
         lemon/color.h \
 	lemon/concept_check.h \
-	lemon/config.h \
         lemon/counter.h \
 	lemon/core.h \
         lemon/dfs.h \
diff --git a/lemon/core.h b/lemon/core.h
--- a/lemon/core.h
+++ b/lemon/core.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <algorithm>
 
-#include <lemon/core.h>
+#include <lemon/config.h>
 #include <lemon/bits/enable_if.h>
 #include <lemon/bits/traits.h>
 #include <lemon/assert.h>