successfully built rpm on fedora 25
This commit is contained in:
@@ -194,10 +194,13 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
AX_SUBST(COPYING)
|
||||
_AM_SUBST_NOTMAKE([COPYING])
|
||||
CHANGELOG=$(<ChangeLog)
|
||||
AX_SUBST(CHANGELOG)
|
||||
AC_SUBST(CHANGELOG)
|
||||
_AM_SUBST_NOTMAKE([CHANGELOG])
|
||||
DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t ,}' ChangeLog)
|
||||
AX_SUBST(DEB_CHANGELOG)
|
||||
if test -z "$DEB_CHANGELOG"; then
|
||||
DEB_CHANGELOG=" * see file ChangeLog and project management web site"
|
||||
fi
|
||||
AC_SUBST(DEB_CHANGELOG)
|
||||
_AM_SUBST_NOTMAKE([DEB_CHANGELOG])
|
||||
AUTHOR=$(head -1 AUTHORS)
|
||||
AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
|
||||
@@ -419,7 +422,7 @@ EOF
|
||||
|
||||
# use this in configure.ac to support CppUnit for C++ unit tests
|
||||
AC_DEFUN([AX_USE_CPPUNIT], [
|
||||
AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
|
||||
PKG_CHECK_MODULES(CPPUNIT, cppunit, [have_cppunit="yes"], [have_cppunit="no"])
|
||||
# infos and warnings
|
||||
if test "$have_cppunit" = "no"; then
|
||||
AC_MSG_WARN([Missing cppunit development library!
|
||||
@@ -440,8 +443,23 @@ maintainer-clean-example-targets:
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support C++ examples
|
||||
# use this in configure.ac to support NodeJS
|
||||
AC_DEFUN([AX_USE_NODEJS], [
|
||||
AC_PATH_PROG(ANDROID, [android], [0],
|
||||
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
|
||||
AC_CONFIG_FILES([nodejs/package.json])
|
||||
AC_CONFIG_FILES([nodejs/makefile])
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
|
||||
test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
maintainer-clean-nodejs-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
EOF
|
||||
])
|
||||
|
||||
# use this in configure.ac to support Cordova
|
||||
AC_DEFUN([AX_USE_CORDOVA], [
|
||||
AC_PATH_PROG(ANDROID, [android], [0],
|
||||
[${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
|
||||
AC_PATH_PROG(CORDOVA, [cordova], [0],
|
||||
@@ -454,14 +472,13 @@ AC_DEFUN([AX_USE_NODEJS], [
|
||||
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
|
||||
EOF
|
||||
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cordova-targets], [cordova/makefile.in])
|
||||
test -f cordova/makefile.in && cat >> cordova/makefile.in <<EOF
|
||||
#### Begin: Appended by $0
|
||||
maintainer-clean-example-targets:
|
||||
maintainer-clean-cordova-targets:
|
||||
-rm makefile.in
|
||||
#### End: $0
|
||||
EOF
|
||||
@@ -629,7 +646,7 @@ 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
|
||||
AC_MSG_ERROR([You must specify the path to perl files
|
||||
- use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
|
||||
AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
|
||||
if test "$have_doxygen" = "no"; then
|
||||
|
Reference in New Issue
Block a user