]> https://gitweb.dealii.org/ - dealii.git/commitdiff
use PACKAGE_* macros instead of DEAL_II_MAJOR/MINOR
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 15 Sep 2005 14:33:29 +0000 (14:33 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 15 Sep 2005 14:33:29 +0000 (14:33 +0000)
git-svn-id: https://svn.dealii.org/trunk@11454 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/Version [deleted file]
deal.II/Version.in [new file with mode: 0644]
deal.II/base/source/data_out_base.cc
deal.II/common/Make.global_options.in
deal.II/configure
deal.II/configure.in
deal.II/doc/RELEASE/tasks

diff --git a/deal.II/Version b/deal.II/Version
deleted file mode 100644 (file)
index 8de1fce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5.3 pre
diff --git a/deal.II/Version.in b/deal.II/Version.in
new file mode 100644 (file)
index 0000000..a24f987
--- /dev/null
@@ -0,0 +1 @@
+@PACKAGE_VERSION@
index aa2d09181bdd387e0ecd73205f474a8ac0f61209..8c51cfe53dd799740ad22b8792a48eeb11361879 100644 (file)
@@ -4086,8 +4086,7 @@ write_deal_II_intermediate (const std::vector<Patch<dim,spacedim> > &patches,
 
                                    // then write a header
   out << "[deal.II intermediate format graphics data]" << std::endl
-      << "[written by deal.II version "
-      << DEAL_II_MAJOR << '.' << DEAL_II_MINOR << "]" << std::endl;
+      << "[written by " << PACKAGE_STRING << "]" << std::endl;
 
   out << data_names.size() << std::endl;
   for (unsigned int i=0; i<data_names.size(); ++i)
@@ -4644,8 +4643,7 @@ DataOutReader<dim,spacedim>::read (std::istream &in)
     std::ostrstream s;
 #endif
 
-    s << "[written by deal.II version "
-      << DEAL_II_MAJOR << '.' << DEAL_II_MINOR << "]";
+    s << "[written by " << PACKAGE_STRING << "]";
 
 #ifndef HAVE_STD_STRINGSTREAM
     s << std::ends;
index 170521dde92dfc9abe32caf220d0b0310d08d6eb..049a5eec49d96fbca59629d3b242f32dd2b829a7 100644 (file)
@@ -42,6 +42,7 @@ enable-multithreading= @enablemultithreading@
 with-multithreading  = @withmultithreading@
 enable-shared        = @enableshared@
 enable-parser        = @enableparser@
+DEAL_II_VERSION      = @PACKAGE_VERSION@
 DEAL_II_MAJOR        = @DEAL_II_MAJOR@
 DEAL_II_MINOR        = @DEAL_II_MINOR@
 
index d0280abaa7a9dc70db5794ae295d357d61bb52bd..98660414ab39fe3c61124b3d5438ccebc30efe04 100755 (executable)
@@ -1,7 +1,9 @@
 #! /bin/sh
 # From configure.in Revision: 1.208 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.59 for deal.II 5.3.pre.
+#
+# Report bugs to <dealii@dealii.org>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -266,15 +268,14 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='deal.II'
+PACKAGE_TARNAME='deal.II'
+PACKAGE_VERSION='5.3.pre'
+PACKAGE_STRING='deal.II 5.3.pre'
+PACKAGE_BUGREPORT='dealii@dealii.org'
 
-ac_unique_file="deal.II"
 ac_subdirs_all="$ac_subdirs_all contrib tests"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_VERSION DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -747,7 +748,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures deal.II 5.3.pre to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -808,7 +809,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of deal.II 5.3.pre:";;
+   esac
   cat <<\_ACEOF
 
 Optional Features:
@@ -871,6 +874,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <dealii@dealii.org>.
 _ACEOF
 fi
 
@@ -966,6 +970,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
+deal.II configure 5.3.pre
+generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -978,7 +984,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by deal.II $as_me 5.3.pre, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1286,6 +1292,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -1330,10 +1344,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 DEAL_II_PATH=`pwd`
 
-DEAL_II_VERSION="`cat Version`"
-
-DEAL_II_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
-DEAL_II_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
+DEAL_II_MAJOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^(\d+)\..*/$1/;'`
+DEAL_II_MINOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
 
 cat >>confdefs.h <<_ACEOF
 #define DEAL_II_MAJOR $DEAL_II_MAJOR
@@ -1349,9 +1361,8 @@ cat >>confdefs.h <<_ACEOF
 #define DEAL_II_PATH "$DEAL_II_PATH"
 _ACEOF
 
-echo "$as_me:$LINENO: result: Configuring deal.II version $DEAL_II_VERSION" >&5
-echo "${ECHO_T}Configuring deal.II version $DEAL_II_VERSION" >&6
-
+echo "$as_me:$LINENO: result: Configuring deal.II version $PACKAGE_VERSION" >&5
+echo "${ECHO_T}Configuring deal.II version $PACKAGE_VERSION" >&6
 
 
 
@@ -10464,7 +10475,7 @@ echo "${ECHO_T}--------------------- generating output ---------------------" >&
 
 
 
-                                                                      ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl doc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox doc/doxygen/header.html"
+                                                                                ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template common/scripts/make_dependencies.pl Version doc/Makefile doc/doxygen/Makefile doc/doxygen/options.dox doc/doxygen/header.html"
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -10774,7 +10785,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by $as_me, which was
+This file was extended by deal.II $as_me 5.3.pre, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10834,7 +10845,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+deal.II config.status 5.3.pre
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10939,6 +10950,7 @@ do
   "common/Make.global_options" ) CONFIG_FILES="$CONFIG_FILES common/Make.global_options" ;;
   "common/Makefile.template" ) CONFIG_FILES="$CONFIG_FILES common/Makefile.template" ;;
   "common/scripts/make_dependencies.pl" ) CONFIG_FILES="$CONFIG_FILES common/scripts/make_dependencies.pl" ;;
+  "Version" ) CONFIG_FILES="$CONFIG_FILES Version" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "doc/doxygen/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/Makefile" ;;
   "doc/doxygen/options.dox" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/options.dox" ;;
@@ -11028,7 +11040,6 @@ s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
-s,@DEAL_II_VERSION@,$DEAL_II_VERSION,;t t
 s,@DEAL_II_MAJOR@,$DEAL_II_MAJOR,;t t
 s,@DEAL_II_MINOR@,$DEAL_II_MINOR,;t t
 s,@DEAL_II_PATH@,$DEAL_II_PATH,;t t
index 02c420b51d1dc3f51c20e46010b4b507b9d02806..f916d23b4bf22f5ed19860b1753fdc2f26b60a17 100644 (file)
@@ -9,7 +9,7 @@ dnl    is stored.
 dnl
 dnl
 dnl authors: Wolfgang Bangerth, Guido Kanschat, and others 
-dnl          1999, 2000, 2001, 2002, 2003, 2004
+dnl          1999, 2000, 2001, 2002, 2003, 2004, 2005
 dnl
 
 
@@ -23,7 +23,7 @@ dnl clearing the cache
 define([AC_CACHE_LOAD], )dnl
 define([AC_CACHE_SAVE], )dnl
 
-AC_INIT([deal.II], [], [dealii@dealii.org])
+AC_INIT(deal.II, 5.3.pre, dealii@dealii.org, deal.II)
 
 AC_REVISION($Revision$)
 AC_PREREQ(2.50)
@@ -45,21 +45,16 @@ dnl -------------------------------------------------------------
 dnl    Set the path to the deal.II libraries to `pwd`
 DEAL_II_PATH=`pwd`
 
-dnl Version numbers
-DEAL_II_VERSION="`cat Version`"
-
-dnl    Set major and minor version numbers of the deal.II library,
-dnl    both as preprocessor variables and in Makefiles
-DEAL_II_MAJOR=`cat Version | perl -pi -e 's/^(\d+)\..*/$1/;'`
-DEAL_II_MINOR=`cat Version | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
+dnl    Split version number in major and minor
+DEAL_II_MAJOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^(\d+)\..*/$1/;'`
+DEAL_II_MINOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^\d+\.(\d+).*/$1/;'`
 AC_DEFINE_UNQUOTED(DEAL_II_MAJOR, $DEAL_II_MAJOR, 
                    [Major version number of deal.II])
 AC_DEFINE_UNQUOTED(DEAL_II_MINOR, $DEAL_II_MINOR, 
                    [Minor version number of deal.II])
 AC_DEFINE_UNQUOTED(DEAL_II_PATH, "$DEAL_II_PATH",
                    [Path to the deal.II directory])
-AC_MSG_RESULT(Configuring deal.II version $DEAL_II_VERSION)
-AC_SUBST(DEAL_II_VERSION)
+AC_MSG_RESULT(Configuring deal.II version $PACKAGE_VERSION)
 AC_SUBST(DEAL_II_MAJOR)
 AC_SUBST(DEAL_II_MINOR)
 AC_SUBST(DEAL_II_PATH)
@@ -665,6 +660,7 @@ dnl that need some information
 AC_OUTPUT([common/Make.global_options 
            common/Makefile.template 
            common/scripts/make_dependencies.pl
+          Version
            doc/Makefile 
           doc/doxygen/Makefile
            doc/doxygen/options.dox
index 25eff4ceecd844d7d0977f53dc9074a6a930ffa7..86e8416aa1488b1a37dfc18fedc27deb6c934b4a 100644 (file)
@@ -28,7 +28,7 @@ when a new release shall be issued:
     cd checkout
     cvs checkout -r Branch-<x>-<y> tests
 
-6/ change the content of the `Version' file on both HEAD and branch; version
+6/ change the version in configure.in on both HEAD and branch; version
    on branch should have THREE digits.
 
 7/ test the branch thoroughly:

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.