# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1241020192 -3600
# Node ID 673c9d6bef44feb3a35101e1ced7c6a675e2d00a
# Parent  7f4536948929945a65a37328ea2be71dea0eb283# Parent  32fb28fc9d4298c95033cd2d41e634757d6952b4
Merge bugfix #280

diff -r 7f4536948929 -r 673c9d6bef44 lemon/Makefile.am
--- a/lemon/Makefile.am	Tue Apr 28 13:55:44 2009 +0100
+++ b/lemon/Makefile.am	Wed Apr 29 16:49:52 2009 +0100
@@ -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 -r 7f4536948929 -r 673c9d6bef44 lemon/core.h
--- a/lemon/core.h	Tue Apr 28 13:55:44 2009 +0100
+++ b/lemon/core.h	Wed Apr 29 16:49:52 2009 +0100
@@ -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>