diff options
author | infirit <[email protected]> | 2014-12-20 18:06:00 +0100 |
---|---|---|
committer | infirit <[email protected]> | 2015-08-25 10:43:49 +0200 |
commit | 0514bcef4eb5f15346bd212f68463764ea8e5ee7 (patch) | |
tree | af2f1d548953a526a9543be43e7a552a0f803d4c /configure.ac | |
parent | 7dfc585faa08cf5a1d4c2149c694e6403602fdff (diff) | |
download | libmateweather-0514bcef4eb5f15346bd212f68463764ea8e5ee7.tar.bz2 libmateweather-0514bcef4eb5f15346bd212f68463764ea8e5ee7.tar.xz |
build: Modernize build system a bit
Use the tar-ustar option for AM_INIT_AUTOMAKE for better tarballs.
Do not use AM_MAINTAINER_MODE as it is not recommended by automake
developers.
Use LT_PREREQ & LT_INIT for libtool checks.
Require intltool 0.40.6 to avoid various bugs.
Do not use AC_ISC_POSIX, AC_HEADER_STDC, AM_PROG_CC_C_O as they
shouldn't be needed on modern systems.
Drop manual check for additional compiler flags and pass maximum to
MATE_COMPILE_WARNINGS instead.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index 2eccd10..5876aa0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([libmateweather], [1.10.0], [http://www.mate-desktop.org]) AC_PREREQ(2.59) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz check-news]) +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) @@ -55,17 +55,14 @@ LIBSOUP_REQUIRED=2.34.0 GIO_REQUIRED=2.25.0 LIBXML_REQUIRED=2.6.0 -AM_MAINTAINER_MODE -MATE_MAINTAINER_MODE_DEFINES +LT_PREREQ([2.2.6]) +LT_INIT([dlopen win32-dll disable-static]) + +IT_PROG_INTLTOOL([0.40.6]) -IT_PROG_INTLTOOL([0.40.3]) PKG_PROG_PKG_CONFIG([0.19]) AC_PROG_CC -AM_PROG_CC_C_O -AC_ISC_POSIX -AC_STDC_HEADERS -AM_PROG_LIBTOOL GLIB_GSETTINGS @@ -88,45 +85,7 @@ else fi AC_SUBST(COMPRESS_EXT) -MATE_COMPILE_WARNINGS - -dnl *************************************************************************** -dnl *** --enable-more-warnings turns on more compiler warnings *** -dnl *************************************************************************** -AC_ARG_ENABLE(more-warnings, -[ --enable-more-warnings Maximum compiler warnings], -set_more_warnings="$enableval",[ - set_more_warnings=no -]) -AC_MSG_CHECKING(for more warnings, including -Werror) -if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then - AC_MSG_RESULT(yes) - CFLAGS="\ - -Wall \ - -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith \ - -Wcast-align -Wsign-compare \ - -std=gnu89 \ - $CFLAGS" - - for option in -Wno-strict-aliasing -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - if test $has_option = no; then - CFLAGS="$SAVE_CFLAGS" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -else - AC_MSG_RESULT(no) -fi +MATE_COMPILE_WARNINGS([maximum]) if test "x$enable_maintainer_mode" = "xyes"; then CFLAGS="$CFLAGS $DISABLE_DEPRECATED" |