#76 Fixes for automake 1.13

Unstable_(example)
closed
nobody
None
5
2013-05-02
2013-01-08
The Compiler
No

Starting with automake 1.13 I couldn't build Xournal anymore, so I updated the autotool files so it builds again without any deprecation warnings.

The patch attached has been generated by git format-patch --stdout, but it should apply with patch -p1 just fine.

If you use git, alternatively you can pull from:

git://cmpl.cc/xournal.git autotools

-----

Florian Bruhin (11):
Rename configure.in to configure.ac
Change AM_CONFIG_HEADER to AM_CONFIG_HEADERS
Change configure.in to configure.ac in autogen.sh
Change HEADER to HEADERS in autogen.sh
Remove AM_PROG_CC_STDC
Change INCLUDES to AM_CPPFLAGS
Run autoupdate
AC_CONFIG_HEADERS, not AM_*
Rerun autoheader
Modernize AM_INIT_AUTOMAKE
s/configure.in/configure.ac/ in AC_CONFIG_SRCDIR
-----
autogen.sh | 24 ++++++++++++------------
config.h.in | 2 +-
configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
configure.in | 47 -----------------------------------------------
src/Makefile.am | 2 +-
src/ttsubset/Makefile.am | 2 +-
6 files changed, 63 insertions(+), 62 deletions(-)

Discussion

  • The Compiler
    The Compiler
    2013-01-08

    patch for xournal to build with automake 1.13

     
  • Denis Auroux
    Denis Auroux
    2013-01-08

    Thanks for submitting the patch. I can't test it easily with automake 1.13 (I can just confirm it doesn't seem to break compatibility with automake 1.11) but I hope it'll be useful to anyone using automake 1.13.

    I have doubts though about this being the smallest possible patch -- why does configure.in need to be renamed to configure.ac? and some of your successive patches undo each other... if you can boil things down to the really necessary changes I'd be more inclined to incorporate the patch into the main repository.

    Denis

     
  • The Compiler
    The Compiler
    2013-01-08

    Thanks for testing backwards compatibility, that's something I couldn't really test.

    The rename is because of this warning:

    automake: warning: autoconf input should be named 'configure.ac', not 'configure.in'

    Also see the last paragraph on http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Writing-Autoconf-Input.html

    Regarding the undo, I'll rebase the commits and clean up a bit as soon as I get the chance (probably on Thursday or Friday)

    Florian

     
  • The Compiler
    The Compiler
    2013-03-04

    Hi Denis,

    I took a look at it again, and the only changes which get undone are changes which were autogenerated. In my opinion, keeping the history meaningful is more important than having commits which are as small as possible. (even more so because this was generated by a tool, not written by me).

    However I also attached a patch generated with diff - minimal changes, but no meaningful history. Pick what you prefer.

    Florian

     
  • Denis Auroux
    Denis Auroux
    2013-05-02

    A much gentler patch (only 3 lines changed in configure.in = the minimal necessary changes) provided by Andreas Huettel is now incorporated into the cvs and git repositories. I'm closing this thread; reopen if there's still a problem.

    Denis

     
  • Denis Auroux
    Denis Auroux
    2013-05-02

    • status: open --> closed
    • Group: --> Unstable_(example)