// then write a header
out << "[deal.II intermediate format graphics data]" << '\n'
- << "[written by " << PACKAGE_STRING << "]" << '\n';
+ << "[written by " << DEAL_II_PACKAGE_STRING << "]" << '\n';
out << data_names.size() << '\n';
for (unsigned int i=0; i<data_names.size(); ++i)
getline (in, header);
std::ostringstream s;
- s << "[written by " << PACKAGE_STRING << "]";
+ s << "[written by " << DEAL_II_PACKAGE_STRING << "]";
Assert (header == s.str(), ExcUnexpectedInput(s.str(),header));
}
DEAL_II_PATH=`pwd`
+
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_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 doc/doxygen/header.tex"
+process_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
+ doc/doxygen/header.tex"
+ ac_config_files="$ac_config_files $process_files"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
do
case "$ac_config_target" in
# Handling of arguments.
- "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" ;;
- "doc/doxygen/header.html" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/header.html" ;;
- "doc/doxygen/header.tex" ) CONFIG_FILES="$CONFIG_FILES doc/doxygen/header.tex" ;;
+ "$process_files" ) CONFIG_FILES="$CONFIG_FILES $process_files" ;;
"base/include/base/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS base/include/base/config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
fi
+$PERL -pi -e 's/PACKAGE_NAME/DEAL_II_PACKAGE_NAME/g;
+ s/PACKAGE_TARNAME/DEAL_II_PACKAGE_TARNAME/g;
+ s/PACKAGE_STRING/DEAL_II_PACKAGE_STRING/g;
+ s/PACKAGE_BUGREPORT/DEAL_II_PACKAGE_BUGREPORT/g;
+ s/PACKAGE_VERSION/DEAL_II_PACKAGE_VERSION/g;' \
+ $process_files base/include/base/config.h
echo
echo
AC_PREFIX_DEFAULT(`pwd`)
DEAL_II_PATH=`pwd`
+
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/;'`
dnl Write output to the global options file and modify other files as well
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
- doc/doxygen/header.html
- doc/doxygen/header.tex])
-
+process_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
+ doc/doxygen/header.tex"
+AC_OUTPUT($process_files)
+
+dnl Autoconf has the annoying habit to simply define PACKAGE_NAME in
+dnl AC_INIT and put this name into config.h, irrespective of the fact
+dnl that other packages that we may use or that users may use with
+dnl deal.II might have their own config.h and conflicting #defines for
+dnl this variable. What we do is to simply rename these variables.
+dnl However, there appears to be no way to do this in some sort of
+dnl proper fashion, so all we can do is to run perl on the output files.
+$PERL -pi -e 's/PACKAGE_NAME/DEAL_II_PACKAGE_NAME/g;
+ s/PACKAGE_TARNAME/DEAL_II_PACKAGE_TARNAME/g;
+ s/PACKAGE_STRING/DEAL_II_PACKAGE_STRING/g;
+ s/PACKAGE_BUGREPORT/DEAL_II_PACKAGE_BUGREPORT/g;
+ s/PACKAGE_VERSION/DEAL_II_PACKAGE_VERSION/g;' \
+ $process_files base/include/base/config.h
echo
echo
<h3>base</h3>
<ol>
- <li> <p> Extended: The <code class="class">QGaussLobatto</code> quadrature rule computes
- Legendre-Gauss-Lobatto nodes and quadrature weights.
- <br>
- (F. Prill 2006/11/02)
+ <li> <p> Changed: We used to set preprocessor variables
+ <code>PACKAGE_NAME</code>, <code>PACKAGE_TARNAME</code>,
+ <code>PACKAGE_VERSION</code>, <code>PACKAGE_STRING</code>,
+ <code>PACKAGE_BUGREPORT</code> in the file
+ <code><base/config.h></code>. These variables were automatically
+ set by the autoconf package, with which we generate the
+ <code>./configure</code> script. However, these variables would conflict
+ if someone were to use a different package that also uses autoconf,
+ since that package would have the same variables, just set to different
+ values. The preprocessor warns about these cases.
+ <br>
+ We now avoid this conflict by not using these names any more. Instead,
+ we use the preprocessor names as above, prefixed with
+ <code>DEAL_II_</code>.
+ <br>
+ (WB 2006/11/10)
</p>
+
+ <li> <p> Extended: The <code class="class">QGaussLobatto</code> quadrature
+ rule computes Legendre-Gauss-Lobatto nodes and quadrature weights.
+ <br>
+ (F. Prill 2006/11/02)
+ </p>
+
<li> <p> Extended: The <code>contract</code> function family contracts two
- tensors. There is now a new version of this function, that contracts a
- tensor of rank three with a second one of rank two over given indices
- <tt>index1</tt> and <tt>index2</tt> of the first and second tensor,
- respectively, resulting in a tensor of rank three.
- <br>
- (Tobias Leicht 2006/09/27)
+ tensors. There is now a new version of this function, that contracts a
+ tensor of rank three with a second one of rank two over given indices
+ <tt>index1</tt> and <tt>index2</tt> of the first and second tensor,
+ respectively, resulting in a tensor of rank three.
+ <br>
+ (Tobias Leicht 2006/09/27)
</p>
<li> <p> Fixed: The