From: guido Date: Tue, 26 Jul 2005 09:54:16 +0000 (+0000) Subject: process custom doxygen header X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3e19a23ddb4172111173f4dd6fb1a0318eaed5;p=dealii-svn.git process custom doxygen header git-svn-id: https://svn.dealii.org/trunk@11204 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure b/deal.II/configure index 4b9f2ab1fb..87a2320ba2 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3145,8 +3145,8 @@ echo "${ECHO_T}Unrecognized C++ compiler -- Try to go ahead and get help from de ;; *cygwin* ) - CXXFLAGSPIC= - LDFLAGSPIC= + CXXFLAGSPIC="-Xlinker --allow-multiple-definition" + LDFLAGSPIC="--allow-multiple-definition" ;; *) @@ -7576,7 +7576,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -extern "C" void abort () {} +extern "C" void abort () { for(;;) ; } int main () @@ -10454,7 +10454,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" + 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" test "x$prefix" = xNONE && prefix=$ac_default_prefix @@ -10932,6 +10932,7 @@ do "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" ;; "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;} diff --git a/deal.II/configure.in b/deal.II/configure.in index 5300395f61..090d9cf3f7 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -656,7 +656,8 @@ AC_OUTPUT([common/Make.global_options common/scripts/make_dependencies.pl doc/Makefile doc/doxygen/Makefile - doc/doxygen/options.dox]) + doc/doxygen/options.dox + doc/doxygen/header.html]) echo