From e321d42f2927b8c693b69283d36379d1771745c1 Mon Sep 17 00:00:00 2001 From: Stuart Longland Date: Sat, 6 Feb 2016 18:13:01 +1000 Subject: [PATCH] configure.ac: Re-work macro initialisation Seems the current automake/autoconf aren't happy with the macros in this file, or I'm just not that adept at setting up autoconf/automake properly. (In fact, the latter is a distinct possibility.) The following is based on what I've seen from the following links (monkey see, monkey do): - http://stackoverflow.com/questions/16188335/automake-error-no-proper-invocation-of-am-init-automake-was-found - http://www.gnu.org/software/automake/manual/automake.html#Hello-World - http://www.gnu.org/software/autoconf/manual/autoconf.html#AC_005fINIT This also adds a bug report email address and link to the homepage to the generated ./configure script. These changes work with autoconf 2.69, automake 1.15. To generate the configure scripts, run: $ autoreconf --install --- configure.ac | 21 +++++++++++++++++++++ configure.in | 20 -------------------- 2 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..d18ff00 --- /dev/null +++ b/configure.ac @@ -0,0 +1,21 @@ +AC_INIT([libtz], [0.1], [ilya.novoselov@gmail.com], + [libtz], [https://github.com/nullie/libtz]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) + +AC_PROG_CC +AC_LANG_C + +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +AM_PROG_LIBTOOL + +AC_HEADER_STDC + +AM_PROG_CC_C_O + +gl_VISIBILITY + +PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) + +AC_OUTPUT(Makefile src/Makefile tests/Makefile) diff --git a/configure.in b/configure.in deleted file mode 100644 index 9338007..0000000 --- a/configure.in +++ /dev/null @@ -1,20 +0,0 @@ -AC_INIT(src/libtz.c) -AM_INIT_AUTOMAKE(libtz,0.1) - -AC_PROG_CC -AC_LANG_C - -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -AM_PROG_LIBTOOL - -AC_HEADER_STDC - -AM_PROG_CC_C_O - -gl_VISIBILITY - -PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) - -AC_OUTPUT(Makefile src/Makefile tests/Makefile) \ No newline at end of file