Generate the top and bottom part of the config.h.in file using the AH_TOP and AH_BOTT...

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 (file)
index 9e6823c..0000000
--- 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 62b33b6b254951e968be2d4fa1241e98d4d80f4a..cb4ce972d3d27689eba8fa01a31ba53296a71055 100644 (file)
--- 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 6e9ff14bedf1c9911f80194f3894b20e5e7366f7..a7efa6d9564d17b2671ce5f3f0ae47290d4c76bc 100755 (executable)
--- 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 e9cb71e4185df19602c2b3b0dfd21ea92c5e020f..b2b1ec7964a9fd8148f593b22ca8c136a92672d2 100644 (file)
--- 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)