From: wolf Date: Mon, 18 Sep 2000 08:09:59 +0000 (+0000) Subject: Ups, use DEAL_II_MAJOR/MINOR instead of DEAL_2_MAJOR/MINOR, to keep with DEAL_II_USE_MT. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08d0f581906b1445dccac347f05edf72304d7ad6;p=dealii-svn.git 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 47238d6622..c16afd41ad 100644 --- 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 f976ec7c22..9a94116c43 100755 --- 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 <> confdefs.h <&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 3624f383c1..d25f986fe0 100644 --- 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 c17cfc1daa..943b99f7a5 100644 --- 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 '
  • CC=$(CC)' >> $@ @echo '
  • GXX-VERSION=$(GXX-VERSION)' >> $@ @echo '
  • PERL=$(PERL)' >> $@ - @echo '
  • DEAL_2_MAJOR=$(DEAL_2_MAJOR)' >> $@ - @echo '
  • DEAL_2_MINOR=$(DEAL_2_MINOR)' >> $@ + @echo '
  • DEAL_II_MAJOR=$(DEAL_II_MAJOR)' >> $@ + @echo '
  • DEAL_II_MINOR=$(DEAL_II_MINOR)' >> $@ @echo '
  • lib-path-base=$(lib-path-base)' >> $@ @echo '
  • lib-path-lac=$(lib-path-lac)' >> $@ @echo '
  • lib-path-deal2=$(lib-path-deal2)' >> $@ diff --git a/deal.II/doc/development/makefiles.1.html b/deal.II/doc/development/makefiles.1.html index 0750423cbf..e199f69570 100644 --- a/deal.II/doc/development/makefiles.1.html +++ b/deal.II/doc/development/makefiles.1.html @@ -72,7 +72,7 @@ -
    DEAL_2_MAJOR
    +
    DEAL_II_MAJOR

    Major version number of the deal.II library, i.e. the number before the first dot. Note that @@ -82,7 +82,7 @@

    -
    DEAL_2_MINOR
    +
    DEAL_II_MINOR

    Minor version number of the deal.II library, i.e. the number after the first dot; if there are