summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrés Maldonado <amaldonado@linagora.com>2019-02-14 10:10:13 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2019-02-16 12:37:31 +0100
commit9da32ab7dfbc17ecc9de6d19f64ae2bca9978871 (patch)
treec7956e53b38d95ecdf961663858bf846a8bac6db
parent51efd6f2184405dea29265ea0dd25c71b348404a (diff)
downloadcppunit-9da32ab7dfbc17ecc9de6d19f64ae2bca9978871.tar.gz
Modernize AM_INIT_AUTOMAKE syntax
For more info, see: https://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation Change-Id: If27065b6d9c9245717ca24e0c0e1fa4c29bc3e5c Reviewed-on: https://gerrit.libreoffice.org/67808 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--doc/Money.dox5
-rw-r--r--examples/money/configure.ac5
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/Money.dox b/doc/Money.dox
index 68d5b6d..2cbb88b 100644
--- a/doc/Money.dox
+++ b/doc/Money.dox
@@ -67,8 +67,9 @@ hold the code we're going to build. Create \c configure.in and
<tt>configure.in</tt>
\verbatim
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(money,0.1)
+AC_INIT(money,0.1)
+AC_CONFIG_SRCDIR(Makefile.am)
+AM_INIT_AUTOMAKE
PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.11.6])
AC_PROG_CXX
AC_PROG_CC
diff --git a/examples/money/configure.ac b/examples/money/configure.ac
index a6586e7..954d567 100644
--- a/examples/money/configure.ac
+++ b/examples/money/configure.ac
@@ -1,8 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
dnl Don't forget to run `aclocal -I /usr/local/share/aclocal` before
dnl running autoconf! This is required for PKG_CHECK_MODULES to work.
-AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(cppunit-cookbook,1.6.2)
+AC_INIT(cppunit-cookbook,1.6.2)
+AC_CONFIG_SRCDIR(Makefile.am)
+AM_INIT_AUTOMAKE
PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.11.6])
AC_PROG_CXX
AC_PROG_CC