some bugfixes

bootstrap.sh

@@ -17,7 +17,6 @@
 MY_NAME=${0##*/}
 PROJECT_PATH=$(pwd)
 DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/}
-
 configure=0
 build=0
 overwrite=0
@@ -512,78 +511,79 @@ www_DATA =
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
-if testtag AX_USE_DOXYGEN && \
-    ( ! checkfile doc/doxyfile.in || \
-      contains doc/doxyfile.in "${rebuildfiles[@]}" ); then
-    run doxygen -g doc/doxyfile.in
-    if test $exists -eq 0; then
-        run svn add doc/doxyfile.in
-        run svn propset svn:keywords "Id" doc/doxyfile.in
-    fi
-    doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
-    doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
-    doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
-    doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
-    doxyreplace INLINE_INHERITED_MEMB YES
-    doxyreplace MULTILINE_CPP_IS_BRIEF YES
-    doxyreplace TAB_SIZE 2
-    doxyreplace ALIASES '"id=\\par File-ID\\n"'
-    doxyadd ALIASES '"copy=\\par Copyright\\n"'
-    doxyadd ALIASES '"license=\\par License\\n"'
-    doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
-    doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
-    doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
-    doxyreplace ENABLE_PREPROCESSING YES
-    doxyreplace MACRO_EXPANSION YES
-    doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
-    doxyreplace BUILTIN_STL_SUPPORT YES
-    doxyreplace DISTRIBUTE_GROUP_DOC YES
-    doxyreplace EXTRACT_ALL YES
-    doxyreplace EXTRACT_PACKAGE YES
-    doxyreplace EXTRACT_PRIVATE YES
-    doxyreplace EXTRACT_STATIC YES
-    doxyreplace EXTRACT_LOCAL_CLASSES YES
-    doxyreplace EXTRACT_LOCAL_METHODS YES
-    doxyreplace EXTRACT_ANON_NSPACES YES
-    doxyreplace SHOW_GROUPED_MEMB_INC YES
-    doxyreplace SORT_MEMBERS_CTORS_1ST YES
-    doxyreplace WARN_IF_UNDOCUMENTED NO
-    doxyreplace WARN_LOGFILE doxygen.errors
-    doxyreplace INPUT "@top_srcdir@/src"
-    if testtag AX_USE_SCRIPTS; then
-        doxyadd INPUT "@top_srcdir@/scripts"
-    fi
-    if testtag AX_USE_CPPUNIT; then
-        doxyadd INPUT "@top_srcdir@/test"
-    fi
-    doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js'
-    doxyadd FILE_PATTERNS *.wt
-    doxyreplace RECURSIVE YES
-    doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
-    if testtag AX_BUILD_EXAMPLES; then
-        doxyreplace EXAMPLE_PATH @top_srcdir@/examples
+if testtag AX_USE_DOXYGEN; then
+    if ! checkfile doc/doxyfile.in || \
+        contains doc/doxyfile.in "${rebuildfiles[@]}"; then
+        run doxygen -g doc/doxyfile.in
+        if test $exists -eq 0; then
+            run svn add doc/doxyfile.in
+            run svn propset svn:keywords "Id" doc/doxyfile.in
+        fi
+        doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
+        doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
+        doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
+        doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
+        doxyreplace INLINE_INHERITED_MEMB YES
+        doxyreplace MULTILINE_CPP_IS_BRIEF YES
+        doxyreplace TAB_SIZE 2
+        doxyreplace ALIASES '"id=\\par File-ID\\n"'
+        doxyadd ALIASES '"copy=\\par Copyright\\n"'
+        doxyadd ALIASES '"license=\\par License\\n"'
+        doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
+        doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
+        doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
+        doxyreplace ENABLE_PREPROCESSING YES
+        doxyreplace MACRO_EXPANSION YES
+        doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
+        doxyreplace BUILTIN_STL_SUPPORT YES
+        doxyreplace DISTRIBUTE_GROUP_DOC YES
+        doxyreplace EXTRACT_ALL YES
+        doxyreplace EXTRACT_PACKAGE YES
+        doxyreplace EXTRACT_PRIVATE YES
+        doxyreplace EXTRACT_STATIC YES
+        doxyreplace EXTRACT_LOCAL_CLASSES YES
+        doxyreplace EXTRACT_LOCAL_METHODS YES
+        doxyreplace EXTRACT_ANON_NSPACES YES
+        doxyreplace SHOW_GROUPED_MEMB_INC YES
+        doxyreplace SORT_MEMBERS_CTORS_1ST YES
+        doxyreplace WARN_IF_UNDOCUMENTED NO
+        doxyreplace WARN_LOGFILE doxygen.errors
+        doxyreplace INPUT "@top_srcdir@/src"
+        if testtag AX_USE_SCRIPTS; then
+            doxyadd INPUT "@top_srcdir@/scripts"
+        fi
+        if testtag AX_USE_CPPUNIT; then
+            doxyadd INPUT "@top_srcdir@/test"
+        fi
+        doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js'
+        doxyadd FILE_PATTERNS *.wt
+        doxyreplace RECURSIVE YES
+        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
+        if testtag AX_BUILD_EXAMPLES; then
+            doxyreplace EXAMPLE_PATH @top_srcdir@/examples
+        fi
+        doxyreplace EXAMPLE_RECURSIVE YES
+        doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
+        doxyreplace SOURCE_BROWSER YES
+        doxyreplace INLINE_SOURCES YES
+        doxyreplace GENERATE_TESTLIST YES
+        doxyreplace GENERATE_TREEVIEW NO
+        doxyreplace SEARCHENGINE YES
+        doxyreplace GENERATE_HTML YES
+        doxyreplace GENERATE_LATEX NO
+        doxyreplace LATEX_BATCHMODE YES
+        doxyreplace LATEX_HIDE_INDICES YES
+        doxyreplace COMPACT_RTF YES
+        doxyreplace RTF_HYPERLINKS YES
+        doxyreplace GENERATE_TAGFILE "@PACKAGE_NAME@.doxytag"
+        doxyreplace HIDE_UNDOC_RELATIONS NO
+        doxyreplace HAVE_DOT YES
+        doxyreplace CLASS_GRAPH YES
+        doxyreplace TEMPLATE_RELATIONS YES
+        doxyreplace DOT_IMAGE_FORMAT svg
+        doxyreplace INTERACTIVE_SVG YES
+        doxyreplace DOT_TRANSPARENT YES
     fi
-    doxyreplace EXAMPLE_RECURSIVE YES
-    doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
-    doxyreplace SOURCE_BROWSER YES
-    doxyreplace INLINE_SOURCES YES
-    doxyreplace GENERATE_TESTLIST YES
-    doxyreplace GENERATE_TREEVIEW NO
-    doxyreplace SEARCHENGINE YES
-    doxyreplace GENERATE_HTML YES
-    doxyreplace GENERATE_LATEX NO
-    doxyreplace LATEX_BATCHMODE YES
-    doxyreplace LATEX_HIDE_INDICES YES
-    doxyreplace COMPACT_RTF YES
-    doxyreplace RTF_HYPERLINKS YES
-    doxyreplace GENERATE_TAGFILE "@PACKAGE_NAME@.doxytag"
-    doxyreplace HIDE_UNDOC_RELATIONS NO
-    doxyreplace HAVE_DOT YES
-    doxyreplace CLASS_GRAPH YES
-    doxyreplace TEMPLATE_RELATIONS YES
-    doxyreplace DOT_IMAGE_FORMAT svg
-    doxyreplace INTERACTIVE_SVG YES
-    doxyreplace DOT_TRANSPARENT YES
 fi
 if testtag AX_USE_DEBIAN_PACKAGING; then
     checkdir debian