better support for LEDA4.x and LEDA5.x

.gitattributes

@@ -452,10 +452,10 @@ Installation/config/support/S60-LEDA -text
 Installation/config/support/S61-LEDAWIN -text
 Installation/config/support/S62-LEDAMS -text
 Installation/config/support/S63-LEDAWINMS -text
-Installation/config/support/S64-LEDAOLD -text
-Installation/config/support/S65-LEDAOLDWIN -text
-Installation/config/support/S66-LEDAOLDMS -text
-Installation/config/support/S67-LEDAOLDWINMS -text
+Installation/config/support/S64-LEDA5X -text
+Installation/config/support/S65-LEDA5XWIN -text
+Installation/config/support/S66-LEDA5XMS -text
+Installation/config/support/S67-LEDA5XWINMS -text
 Installation/config/support/S80-QT3MT -text
 Installation/config/support/S81-QT3ST -text
 Installation/config/support/S82-QT3MSMT -text

Installation/config/support/S60-LEDA

@@ -1,6 +1,6 @@
 # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = Unix
+DESCRIPTION = 4.x for Unix
 PROVIDES = LEDA
 CXXFLAGS = 
 LDFLAGS = 
@@ -8,7 +8,7 @@ LIBS = P G L
 REQUIRES = 
 INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER 
 STDINCLDIRS = 
-INCLTHING = LEDA/system/basic.h
+INCLTHING = LEDA/basic.h
 STDLIBDIRS = 
 LIBTHING = 
 

Installation/config/support/S61-LEDAWIN

@@ -1,6 +1,6 @@
 # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = Unix
+DESCRIPTION = 4.x for Unix
 PROVIDES = LEDAWIN
 CXXFLAGS = 
 LDFLAGS = 

Installation/config/support/S62-LEDAMS

@@ -1,6 +1,6 @@
 # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = MS Windows
+DESCRIPTION = 4.x for MS Windows
 PROVIDES = LEDA
 CXXFLAGS = 
 LDFLAGS = 
@@ -8,7 +8,7 @@ LIBS = P G L
 REQUIRES = DOLLAR_WINDOWS_COMPILER
 INCOMPATIBLE = 
 STDINCLDIRS = 
-INCLTHING = LEDA/system/basic.h
+INCLTHING = LEDA/basic.h
 STDLIBDIRS = 
 LIBTHING = 
 

Installation/config/support/S63-LEDAWINMS

@@ -1,6 +1,6 @@
 # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = MS Windows
+DESCRIPTION = 4.x for MS Windows
 PROVIDES = LEDAWIN
 CXXFLAGS = 
 LDFLAGS = 

Installation/config/support/S64-LEDA5X

@@ -1,15 +1,16 @@
 # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = Unix
-PROVIDES = LEDAOLD
+DESCRIPTION = 5.x for Unix
+PROVIDES = LEDA5X
 CXXFLAGS = 
 LDFLAGS = 
 LIBS = P G L
 REQUIRES = 
-INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER 
+INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER LEDA
 STDINCLDIRS = 
-INCLTHING = LEDA/basic.h
+INCLTHING = LEDA/system/basic.h
 STDLIBDIRS = 
 LIBTHING = 
+COMPILETESTFLAGS = -DHAVE_LEDA5X
 
 # EOF

Installation/config/support/S65-LEDA5XWIN

@@ -1,11 +1,11 @@
 # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = Unix
+DESCRIPTION = 5.x for Unix
 PROVIDES = LEDAWIN
 CXXFLAGS = 
 LDFLAGS = 
 LIBS = W
-REQUIRES = X11 LEDAOLD
+REQUIRES = X11 LEDA5X
 INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER
 STDINCLDIRS = 
 INCLTHING = 

Installation/config/support/S66-LEDA5XMS

@@ -1,7 +1,7 @@
 # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = MS Windows
-PROVIDES = LEDAOLD
+DESCRIPTION = 5.x for MS Windows
+PROVIDES = LEDA5X
 CXXFLAGS = 
 LDFLAGS = 
 LIBS = P G L

Installation/config/support/S67-LEDA5XWINMS

@@ -1,11 +1,11 @@
 # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/)
 
-DESCRIPTION = MS Windows
+DESCRIPTION = 5.x for MS Windows
 PROVIDES = LEDAWIN
 CXXFLAGS = 
 LDFLAGS = 
 LIBS = W
-REQUIRES = X11 LEDAOLD DOLLAR_WINDOWS_COMPILER
+REQUIRES = X11 LEDA5X DOLLAR_WINDOWS_COMPILER
 INCOMPATIBLE = 
 STDINCLDIRS = 
 INCLTHING = 

Installation/config/support/test_LEDA.cpp

@@ -25,8 +25,14 @@
 
 #include <iostream>
 
-#include <LEDA/system/basic.h>
-#include <LEDA/numbers/integer.h>
+#ifdef HAVE_LEDA5X
+  #include <LEDA/system/basic.h>
+  #include <LEDA/numbers/integer.h>
+#else
+  #include <LEDA/basic.h>
+  #include <LEDA/integer.h>
+#endif
+
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #ifndef LEDA_STD_HEADERS
 #  error "LEDA_STD_HEADERS is not defined. Please consult the troubleshooting section of the installation manual."
@@ -37,9 +43,15 @@
 using namespace leda;
 #endif
 
-#include <LEDA/internal/REDEFINE_NAMES.h>
-typedef integer I;
-#include <LEDA/internal/UNDEFINE_NAMES.h>
+#ifdef HAVE_LEDA5X
+ #include <LEDA/internal/REDEFINE_NAMES.h>
+ typedef integer I;
+ #include <LEDA/internal/UNDEFINE_NAMES.h>
+#else
+ #include <LEDA/REDEFINE_NAMES.h>
+ typedef integer I;
+ #include <LEDA/UNDEFINE_NAMES.h>
+#endif
 
 int main()
 {