updated build system

2017-03-17 15:54:16 +00:00
parent 0c095ff2b8
commit fa1f9e757f
16 changed files with 661 additions and 101 deletions
@@ -137,6 +137,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_SUBST(PREFIX)
  SYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${sysconfdir}")
  AX_SUBST(SYSCONFDIR)
+  PKGSYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${SYSCONFDIR}/${PACKAGE_NAME}")
+  AX_SUBST(PKGSYSCONFDIR)
  DATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${datadir}")
  AX_SUBST(DATADIR)
  PKGDATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${DATADIR}/${PACKAGE_NAME}")
@@ -194,17 +196,20 @@ 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;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t  ,}' ChangeLog)
-  AX_SUBST(DEB_CHANGELOG)
+  DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t,  ,g;/^  \* /{s,,,;H;g;s,^,  * ,;s,\n\([[^ ]]*\) *, \1\n    ,}' 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, *[[<(]].*$,,')
  AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
  AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
-  PACKAGER=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
-  if -z "${PACKAGER}"; then
+  PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
+  if test -z "${PACKAGER}"; then
    PACKAGER="$AUTHOR"
  fi
  AX_SUBST(AUTHOR)
@@ -217,6 +222,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
  AX_SUBST(PROJECT_URL)
  AX_SUBST(SOURCE_DOWNLOAD)
+  VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
+  AX_SUBST(VENDOR)
  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))
@@ -419,7 +426,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 +447,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 +476,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
@@ -543,6 +564,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
+	rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
 clean-rpm-targets:
 	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
@@ -551,6 +573,11 @@ distclean-rpm-targets:
 EOF
 ])

+# use this in configure.ac to support scripts, e.g. bash scripts
+AC_DEFUN([AX_USE_ETC], [
+  AC_CONFIG_FILES([etc/makefile])
+])
+
 # use this in configure.ac to support scripts, e.g. bash scripts
 AC_DEFUN([AX_USE_SCRIPTS], [
  AC_CONFIG_FILES([scripts/makefile])
@@ -629,7 +656,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
@@ -948,9 +975,40 @@ AC_DEFUN([AX_CHECK_VALID_LD_FLAG], [
 #  - parameter:
 #     $1 = package name
 AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
-  pkg=$1
+  pkg="$1"
  if test -n "$(apt-cache policy -q ${pkg} 2> /dev/null)"; then
-     DEB_DEPEND_IFEXISTS+=", ${pkg}"
+     DEB_DEPEND_IFEXISTS="${DEB_DEPEND_IFEXISTS}, ${pkg}"
  fi
+])
+
+# require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_BUILD_DEPEND], [
+  pkg="$1"
+  DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
+])
+
+# require package in debian/control.in append @DEB_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_DEPEND], [
+  pkg="$1"
+  DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
+])
+
+# require package in debian/control.in append @DEB_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_SECTION], [
+  pkg="$1"
+  DEB_SECTION="${pkg}"
+])
+
+# call after setting debian dependencies
+AC_DEFUN([AX_DEB_RESOLVE], [
+  AC_SUBST(DEB_BUILD_DEPEND)
+  AC_SUBST(DEB_DEPEND)
+  AC_SUBST(DEB_SECTION)
  AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])