bugfix, possible crash
This commit is contained in:
Marc Wäckerlin
@@ -7,7 +7,7 @@
|
||||
m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
|
||||
|
||||
# define least version number from subversion's revision number:
|
||||
# it is taken modulo 256 due to a bug on Apple's MacOSX
|
||||
# it is taken modulo 256 due to a bug on Apple's SX
|
||||
m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
|
||||
m4_ifdef([x_least_diff],
|
||||
mrw_esyscmd_s([
|
||||
@@ -129,7 +129,7 @@ AC_DEFUN([AX_SUBST], [
|
||||
# m4_define(x_minor, MINOR_NUMBER) # project's minor version
|
||||
# m4_include(ax_init_standard_project.m4)
|
||||
# AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
|
||||
# AM_INIT_AUTOMAKE([1.9 tar-pax])
|
||||
# AM_INIT_AUTOMAKE([1.9 tar-pax parallel-tests color-tests])
|
||||
# AX_INIT_STANDARD_PROJECT
|
||||
#
|
||||
# you change nothing but: YOUR_PACKAGE_NAME, MAJOR_NUMBER, MINOR_NUMBER
|
||||
@@ -170,15 +170,45 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
|
||||
AX_SUBST(NUMBERS)
|
||||
AX_SUBST(HOME)
|
||||
README=$(tail -n +3 README)
|
||||
if test -f README.md; then
|
||||
README=$(tail -n +3 README.md)
|
||||
DESCRIPTION=$(head -1 README.md)
|
||||
else
|
||||
README=$(tail -n +3 README)
|
||||
DESCRIPTION=$(head -1 README)
|
||||
fi
|
||||
README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g')
|
||||
if which pandoc 2>&1 > /dev/null; then
|
||||
README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\<span>\1</span>,g;s/\n/\\n/g;s,",\\",g;s, ,\ \ ,g')
|
||||
else
|
||||
README_HTML="${README}"
|
||||
fi
|
||||
AX_SUBST(README)
|
||||
_AM_SUBST_NOTMAKE([README])
|
||||
DESCRIPTION=$(head -1 README)
|
||||
AX_SUBST(README_ESCAPED)
|
||||
_AM_SUBST_NOTMAKE([README_ESCAPED])
|
||||
AX_SUBST(README_HTML)
|
||||
_AM_SUBST_NOTMAKE([README_HTML])
|
||||
AX_SUBST(DESCRIPTION)
|
||||
_AM_SUBST_NOTMAKE([DESCRIPTION])
|
||||
LICENSE=$(echo $(head -1 COPYING))
|
||||
AX_SUBST(LICENSE)
|
||||
COPYING=$(<COPYING)
|
||||
AX_SUBST(COPYING)
|
||||
_AM_SUBST_NOTMAKE([COPYING])
|
||||
AUTHOR=$(head -1 AUTHORS)
|
||||
AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
|
||||
AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
|
||||
AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
|
||||
AX_SUBST(AUTHOR)
|
||||
_AM_SUBST_NOTMAKE([AUTHOR])
|
||||
AX_SUBST(AUTHOR_NAME)
|
||||
AX_SUBST(AUTHOR_URL)
|
||||
AX_SUBST(AUTHOR_MAIL)
|
||||
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
|
||||
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
|
||||
AX_SUBST(PROJECT_URL)
|
||||
AX_SUBST(SOURCE_DOWNLOAD)
|
||||
DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
|
||||
AX_SUBST(DISTRO)
|
||||
ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
|
||||
@@ -242,6 +272,25 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
else
|
||||
AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(gcov,
|
||||
[AS_HELP_STRING([--with-gcov=FILE],
|
||||
[enable gcov, set gcov file (defaults to gcov)])],
|
||||
[GCOV="$enableval"], [GCOV="no"])
|
||||
AM_CONDITIONAL(COVERAGE, test "$GCOV" != "no")
|
||||
if test "$GCOV" != "no"; then
|
||||
if test "$GCOV" == "yes"; then
|
||||
GCOV=gcov
|
||||
fi
|
||||
AC_CHECK_PROG(has_gcov, [$GCOV], [yes], [no])
|
||||
if test "$has_gcov" != "yes"; then
|
||||
AC_MSG_ERROR([gcov: program $GCOV not found])
|
||||
fi
|
||||
AC_MSG_NOTICE([Coverage tests enabled, using ${GCOV}]);
|
||||
AM_CXXFLAGS="${AM_CXXFLAGS:-} -O0 --coverage -fprofile-arcs -ftest-coverage"
|
||||
AM_LDFLAGS="${AM_LDFLAGS} -O0 --coverage -fprofile-arcs"
|
||||
AX_SUBST(GCOV)
|
||||
fi
|
||||
|
||||
if test -f ${PACKAGE_NAME}.desktop.in; then
|
||||
AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
|
||||
@@ -273,7 +322,7 @@ EOF
|
||||
AC_DEFUN([AX_USE_CXX], [
|
||||
m4_include(ax_cxx_compile_stdcxx_11.m4)
|
||||
AC_LANG(C++)
|
||||
AX_CXX_COMPILE_STDCXX_11(noext, optional)
|
||||
AX_CXX_COMPILE_STDCXX_14(noext, optional)
|
||||
AC_PROG_CXX
|
||||
AC_PROG_CPP
|
||||
|
||||
@@ -383,6 +432,33 @@ maintainer-clean-example-targets:
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support C++ examples
|
||||
AC_DEFUN([AX_USE_NODEJS], [
|
||||
AC_PATH_PROG(ANDROID, [android], [0],
|
||||
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
|
||||
AC_PATH_PROG(CORDOVA, [cordova], [0],
|
||||
[${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin])
|
||||
if test ${CORDOVA} = 0; then
|
||||
AC_MSG_WARN([cordova is missing, on ubuntu install cordova-cli from repository ppa:cordova-ubuntu/ppa])
|
||||
fi
|
||||
if test ${ANDROID} = 0; then
|
||||
AC_MSG_WARN([android sdk is missing, set variable ANDROID_HOME after installation])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
|
||||
AX_SUBST(CORDOVA)
|
||||
AC_CONFIG_FILES([nodejs/package.json])
|
||||
AC_CONFIG_FILES([nodejs/makefile])
|
||||
AC_CONFIG_FILES([cordova/makefile])
|
||||
AC_CONFIG_FILES([cordova/config.xml])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [examples/makefile.in])
|
||||
test -f examples/makefile.in && cat >> examples/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
maintainer-clean-example-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support HTML data for webservers
|
||||
AC_DEFUN([AX_BUILD_HTML], [
|
||||
AC_CONFIG_FILES([html/makefile])
|
||||
@@ -425,7 +501,11 @@ EOF
|
||||
|
||||
# use this in configure.ac to support debian packages
|
||||
AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
|
||||
README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
|
||||
if test -f README.md; then
|
||||
README_DEB=$(tail -n +3 README.md | sed -e 's/^ *$/./g' -e 's/^/ /g')
|
||||
else
|
||||
README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
|
||||
fi
|
||||
AC_SUBST(README_DEB)
|
||||
_AM_SUBST_NOTMAKE([README_DEB])
|
||||
AC_CONFIG_FILES([debian/changelog debian/control])
|
||||
@@ -473,6 +553,7 @@ AC_DEFUN([AX_USE_DOXYGEN], [
|
||||
AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
|
||||
AC_CHECK_PROG(have_dot, dot, yes, no)
|
||||
AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
|
||||
AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v) | sort -V | head -1))
|
||||
PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
|
||||
AC_SUBST(PDF_DOC)
|
||||
if test "$have_doxygen" = "no"; then
|
||||
@@ -487,22 +568,38 @@ AC_DEFUN([AX_USE_DOXYGEN], [
|
||||
AC_MSG_WARN([Missing program mscgen!
|
||||
- when you rebild documentation, there are no message state charts
|
||||
- there are precompiled derived files in the distribution]); fi
|
||||
AC_CONFIG_FILES([doc/makefile doc/doxyfile])
|
||||
AC_CONFIG_FILES([doc/makefile doc/doxyfile doc/header.html doc/footer.html])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-documentation], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-documentation], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-documentation], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-documentation], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-documentation], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
|
||||
test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
doc: doxyfile
|
||||
doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
|
||||
@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
|
||||
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
|
||||
@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
|
||||
@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
|
||||
doxygen doxyfile
|
||||
@PEDANTIC_TRUE@ test \! -s doxygen.errors
|
||||
|
||||
@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
|
||||
@NEED_PLANTUML_TRUE@
|
||||
@NEED_PLANTUML_TRUE@gen-uml-images:
|
||||
@NEED_PLANTUML_TRUE@ test -d gen-uml-images || mkdir gen-uml-images
|
||||
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
|
||||
@NEED_PLANTUML_TRUE@ eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
|
||||
@NEED_PLANTUML_TRUE@ SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
|
||||
@NEED_PLANTUML_TRUE@ for src in \$\$INPUT; do \\
|
||||
@NEED_PLANTUML_TRUE@ java -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
|
||||
@NEED_PLANTUML_TRUE@ done
|
||||
|
||||
clean-documentation:
|
||||
-rm doxygen.errors @PDF_DOC@
|
||||
@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
|
||||
distclean-documentation:
|
||||
-rm -r html
|
||||
-rm @PACKAGE_NAME@.doxytag
|
||||
@@ -519,6 +616,55 @@ uninstall-documentation:
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support Doxygen documentation generation
|
||||
AC_DEFUN([AX_USE_PERLDOC], [
|
||||
PERL_SOURCES="m4_default([$1], [perl])"
|
||||
AX_SUBST(PERL_SOURCES)
|
||||
if test -z "$PERL_SOURCES"; then
|
||||
AC_MSG_ERROR([You must specify the path to per files
|
||||
- use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
|
||||
AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
|
||||
if test "$have_doxygen" = "no"; then
|
||||
AC_MSG_WARN([Missing program pods2html!
|
||||
- you cannot rebuild the documentation
|
||||
- there are precompiled derived files in the distribution
|
||||
- if you need to generate documentation, install libpod-tree-perl]); fi
|
||||
AC_CONFIG_FILES([doc/makefile])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-perldoc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-perldoc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-perldoc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-perldoc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [doc], [doc/makefile.in])
|
||||
test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
doc: perldoc/index.html
|
||||
|
||||
perldoc/index.html: \${PERL_SOURCES:%=perldoc/%}
|
||||
echo "<html><head><title>Perl Documentation</title></head><body><h1>Perl Documentation</h1><ul>" > perldoc/index.html
|
||||
for p in \${PERL_SOURCES:%=perldoc/%}; do \
|
||||
echo '<li><a href="'"\$\${p#perldoc/}"'/index.html">'"\$\${p#perldoc/}"'</a></li>' >> perldoc/index.html; \
|
||||
done
|
||||
echo "</ul></body></html>" >> perldoc/index.html
|
||||
|
||||
perldoc/%:
|
||||
pods2html --notoc --empty --index index @top_srcdir@/\${@:perldoc/%=%} \$[@]
|
||||
|
||||
distclean-perldoc:
|
||||
-rm -r perldoc
|
||||
maintainer-clean-perldoc:
|
||||
-rm makefile.in
|
||||
install-data-perldoc:
|
||||
test -d \$(DESTDIR)\${docdir} || mkdir -p \$(DESTDIR)\${docdir}
|
||||
chmod -R u+w \$(DESTDIR)\${docdir}
|
||||
cp -r perldoc \$(DESTDIR)\${docdir}/
|
||||
uninstall-perldoc:
|
||||
-chmod -R u+w \$(DESTDIR)\${docdir}
|
||||
-rm -rf \$(DESTDIR)\${docdir}/perldoc
|
||||
#### End: $0
|
||||
EOF
|
||||
])
|
||||
|
||||
# require a specific package, with fallback: test for a header
|
||||
# - parameter:
|
||||
# $1 = unique id (no special characters)
|
||||
|
||||
Reference in New Issue
Block a user