Ups, use DEAL_II_MAJOR/MINOR instead of DEAL_2_MAJOR/MINOR, to keep with DEAL_II_USE_MT.

git-svn-id: https://svn.dealii.org/trunk@3332 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in
index 47238d662250b4d41f222f7df75a0da3866ad579..c16afd41ad85ab1e116e1f9d56427634b34834d5 100644 (file)
--- a/deal.II/common/Make.global_options.in
+++ b/deal.II/common/Make.global_options.in
@@ -28,8 +28,8 @@ PERL                 = @PERL@
 enable-multithreading= @enablemultithreading@
 with-multithreading  = @withmultithreading@
 enable-shared        = @enableshared@
-DEAL_2_MAJOR         = @DEAL_2_MAJOR@
-DEAL_2_MINOR         = @DEAL_2_MINOR@
+DEAL_II_MAJOR        = @DEAL_II_MAJOR@
+DEAL_II_MINOR        = @DEAL_II_MINOR@
 
 
 ######################################################

diff --git a/deal.II/configure b/deal.II/configure
index f976ec7c229d63438923c7256290dea8a55aedc9..9a94116c43ad82b79d2b550f1fe0907a10e07449 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.32 
+# From configure.in Revision: 1.33 
 
 
 
@@ -562,14 +562,14 @@ fi
 DEAL2_DIR=`pwd`
 
 
-DEAL_2_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
-DEAL_2_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
+DEAL_II_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
+DEAL_II_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
 cat >> confdefs.h <<EOF
-#define DEAL_2_MAJOR $DEAL_2_MAJOR
+#define DEAL_II_MAJOR $DEAL_II_MAJOR
 EOF
 
 cat >> confdefs.h <<EOF
-#define DEAL_2_MINOR $DEAL_2_MINOR
+#define DEAL_II_MINOR $DEAL_II_MINOR
 EOF
 
 echo "$ac_t""Configuring deal.II version `cat Version`" 1>&6
@@ -2021,8 +2021,8 @@ s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
 s%@DEAL2_DIR@%$DEAL2_DIR%g
-s%@DEAL_2_MAJOR@%$DEAL_2_MAJOR%g
-s%@DEAL_2_MINOR@%$DEAL_2_MINOR%g
+s%@DEAL_II_MAJOR@%$DEAL_II_MAJOR%g
+s%@DEAL_II_MINOR@%$DEAL_II_MINOR%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g

diff --git a/deal.II/configure.in b/deal.II/configure.in
index 3624f383c1b8895e857ad3b8459c4fcd713ac6fe..d25f986fe021546057c35ce59088d6204a65ad1e 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -24,13 +24,13 @@ AC_SUBST(DEAL2_DIR)
 
 dnl    Set major and minor version numbers of the deal.II library,
 dnl    both as preprocessor variables and in Makefiles
-DEAL_2_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
-DEAL_2_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
-AC_DEFINE_UNQUOTED(DEAL_2_MAJOR, $DEAL_2_MAJOR)
-AC_DEFINE_UNQUOTED(DEAL_2_MINOR, $DEAL_2_MINOR)
+DEAL_II_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
+DEAL_II_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
+AC_DEFINE_UNQUOTED(DEAL_II_MAJOR, $DEAL_II_MAJOR)
+AC_DEFINE_UNQUOTED(DEAL_II_MINOR, $DEAL_II_MINOR)
 AC_MSG_RESULT(Configuring deal.II version `cat Version`)
-AC_SUBST(DEAL_2_MAJOR)
-AC_SUBST(DEAL_2_MINOR)
+AC_SUBST(DEAL_II_MAJOR)
+AC_SUBST(DEAL_II_MINOR)
 
 
 dnl    Check for machine type operating system

diff --git a/deal.II/doc/development/Makefile b/deal.II/doc/development/Makefile
index c17cfc1daa0c95c948a1201fe96d87a77473394d..943b99f7a5686d1f72d4f299c8a1a2dc1fff5b33 100644 (file)
--- a/deal.II/doc/development/Makefile
+++ b/deal.II/doc/development/Makefile
@@ -15,8 +15,8 @@ makefiles.html: Makefile makefiles.1.html $D/common/Make.global_options makefile
        @echo '<li><code>CC=$(CC)</code>' >> $@
        @echo '<li><code>GXX-VERSION=$(GXX-VERSION)</code>' >> $@
        @echo '<li><code>PERL=$(PERL)</code>' >> $@
-       @echo '<li><code>DEAL_2_MAJOR=$(DEAL_2_MAJOR)</code>' >> $@
-       @echo '<li><code>DEAL_2_MINOR=$(DEAL_2_MINOR)</code>' >> $@
+       @echo '<li><code>DEAL_II_MAJOR=$(DEAL_II_MAJOR)</code>' >> $@
+       @echo '<li><code>DEAL_II_MINOR=$(DEAL_II_MINOR)</code>' >> $@
        @echo '<li><code>lib-path-base=$(lib-path-base)</code>' >> $@
        @echo '<li><code>lib-path-lac=$(lib-path-lac)</code>' >> $@
        @echo '<li><code>lib-path-deal2=$(lib-path-deal2)</code>' >> $@

diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html
index 0750423cbf0adfca05be4d6839c09e9a01e4c1aa..e199f69570b7bb7c94c7670356dcbdee868794d6 100644 (file)
--- a/deal.II/doc/development/makefiles.1.html
+++ b/deal.II/doc/development/makefiles.1.html
@@ -72,7 +72,7 @@
       </dd>
 
 
-      <dt> <code>DEAL_2_MAJOR</code> </dt>
+      <dt> <code>DEAL_II_MAJOR</code> </dt>
       <dd> <p>
            Major version number of the <acronym>deal.II</acronym>
            library, i.e. the number before the first dot. Note that
@@ -82,7 +82,7 @@
       </dd>    
 
 
-      <dt> <code>DEAL_2_MINOR</code> </dt>
+      <dt> <code>DEAL_II_MINOR</code> </dt>
       <dd> <p>
            Minor version number of the <acronym>deal.II</acronym>
           library, i.e. the number after the first dot; if there are