From: Wolfgang Bangerth Date: Tue, 30 Apr 2002 08:45:28 +0000 (+0000) Subject: Generate the top and bottom part of the config.h.in file using the AH_TOP and AH_BOTT... X-Git-Tag: v8.0.0~18094 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e726b30eba8cfd913c476deb8626d41b44ae7dc;p=dealii.git Generate the top and bottom part of the config.h.in file using the AH_TOP and AH_BOTTOM macros, as is recommended practice since autoconf2.50. git-svn-id: https://svn.dealii.org/trunk@5761 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/acconfig.h b/deal.II/acconfig.h deleted file mode 100644 index 9e6823c19b..0000000000 --- a/deal.II/acconfig.h +++ /dev/null @@ -1,32 +0,0 @@ -//---------------------------- config.h --------------------------- -// $Id$ -// Version: $Name$ -// -// Copyright (C) 2001, 2002 by the deal.II authors -// -// This file is subject to QPL and may not be distributed -// without copyright and license information. Please refer -// to the file deal.II/doc/license.html for the text and -// further information on this license. -// -//---------------------------- config.h --------------------------- -#ifndef __deal2__config_h -#define __deal2__config_h - -// Note: you should not usually have to change this file, as it is -// automatically generated from the ./configure file in the top level -// directory. If there are problems with the contents of this file, -// rather than changing it, try to modify the mechanisms in -// configure.in that generated this output. The reason is that you -// would have to make these changes each time you compile a new -// version of the library, or on a different computer. Furthermore, it -// is important not to build different parts of the library with -// different versions of this file. -// -// In case of problems in autodetection of features of your build -// environment, contact the authors of the library. - -@TOP@ -@BOTTOM@ - -#endif diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in index 62b33b6b25..cb4ce972d3 100644 --- a/deal.II/base/include/base/config.h.in +++ b/deal.II/base/include/base/config.h.in @@ -1,4 +1,6 @@ /* base/include/base/config.h.in. Generated from configure.in by autoheader. */ + + //---------------------------- config.h --------------------------- // $Id$ // Version: $Name$ @@ -28,6 +30,7 @@ // environment, contact the authors of the library. + /* Backward compatibility support for functions and classes that do not take an explicit mapping variable, but rather use a default Q1 mapping instead */ @@ -155,4 +158,7 @@ */ #undef XLC_WORK_AROUND_STD_BUG + + #endif + diff --git a/deal.II/configure b/deal.II/configure index 6e9ff14bed..a7efa6d956 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -6014,6 +6014,13 @@ echo "${ECHO_T}" >&6 echo "$as_me:$LINENO: result: --------------------- generating output ---------------------" >&5 echo "${ECHO_T}--------------------- generating output ---------------------" >&6 + + + + + + + ac_config_files="$ac_config_files common/Make.global_options common/Makefile.template doc/Makefile doc/auto/Makefile doc/auto/kdoc/Makefile" diff --git a/deal.II/configure.in b/deal.II/configure.in index e9cb71e418..b2b1ec7964 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -344,7 +344,47 @@ dnl ------------------------------------------------------------- AC_MSG_RESULT() AC_MSG_RESULT(--------------------- generating output ---------------------) -dnl Write output to the global options file +dnl First set the templates for config.h +AH_TOP( +[ +//---------------------------- config.h --------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2001, 2002 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------- config.h --------------------------- +#ifndef __deal2__config_h +#define __deal2__config_h + +// Note: you should not usually have to change this file, as it is +// automatically generated from the ./configure file in the top level +// directory. If there are problems with the contents of this file, +// rather than changing it, try to modify the mechanisms in +// configure.in that generated this output. The reason is that you +// would have to make these changes each time you compile a new +// version of the library, or on a different computer. Furthermore, it +// is important not to build different parts of the library with +// different versions of this file. +// +// In case of problems in autodetection of features of your build +// environment, contact the authors of the library. + +]) + + +AH_BOTTOM( +[ + +#endif +]) + +dnl Write output to the global options file AC_OUTPUT(common/Make.global_options common/Makefile.template doc/Makefile doc/auto/Makefile doc/auto/kdoc/Makefile)