[gnome-calendar] build: update/clean autotools machinery
- From: Erick Pérez Castellanos <erickpc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] build: update/clean autotools machinery
- Date: Thu, 4 Dec 2014 22:33:22 +0000 (UTC)
commit 24ea81583d131bcd47744e420386192ac6917553
Author: Erick Pérez Castellanos <erick red gmail com>
Date: Wed Oct 1 10:12:24 2014 -0400
build: update/clean autotools machinery
.gitignore | 1 +
configure.ac | 34 ++++++++++++++++++++++++----------
src/Makefile.am | 7 +------
3 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1680452..8502176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ src/gcal-enum-types.h
src/gcal-resources.c
src/gcal-resources.h
AUTHORS
+build-aux
diff --git a/configure.ac b/configure.ac
index 4e90c4b..c789e08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,22 +1,22 @@
dnl -*- mode: m4 -*-
-AC_PREREQ([2.68])
-AC_INIT([gnome-calendar],[0.0.3],[],[gnome-calendar])
+AC_PREREQ([2.69])
+AC_INIT([gnome-calendar],[0.0.3],[],[gnome-calendar],[https://wiki.gnome.org/Design/Apps/Calendar])
-AC_CONFIG_HEADERS([config/config.h])
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes])
-# require automake 1.11
-AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip tar-ustar])
+# require automake 1.11.1
+AM_INIT_AUTOMAKE([1.11.1 dist-xz no-dist-gzip tar-ustar])
AM_MAINTAINER_MODE([enable])
dnl ***************************************************************************
dnl Internationalization
dnl ***************************************************************************
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.6])
PKG_PROG_PKG_CONFIG([0.22])
GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
@@ -31,17 +31,33 @@ AC_CACHE_SAVE
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_INSTALL
AC_SEARCH_LIBS([strerror],[cposix])
AC_HEADER_STDC
# no stupid static libraries
AC_DISABLE_STATIC([])
+
# enable libtool
+LT_PREREQ([2.2.6])
LT_INIT
## don't rerun to this point if we abort
AC_CACHE_SAVE
+## checks
+AC_CHECK_HEADERS([langinfo.h])
+AC_CHECK_HEADERS([locale.h])
+AC_CHECK_HEADERS([string.h])
+
+AC_CHECK_FUNCS([floor])
+AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([nl_langinfo])
+AC_CHECK_FUNCS([pow])
+AC_CHECK_FUNCS([setlocale])
+AC_CHECK_FUNCS([strstr])
+
GLIB_GSETTINGS
dnl ================================================================
@@ -49,9 +65,7 @@ dnl Misc
dnl ================================================================
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-GNOME_COMMON_INIT
GNOME_COMPILE_WARNINGS(maximum)
-GNOME_MAINTAINER_MODE_DEFINES
MAINTAINER_COMPILER_FLAGS="$MAINTAINER_COMPILER_FLAGS \
-Wall -Wcast-align -Wuninitialized \
diff --git a/src/Makefile.am b/src/Makefile.am
index 856f6cb..6704330 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,14 +5,9 @@ AM_CPPFLAGS = \
-DUI_DATA_DIR=\""$(pkgdatadir)/style"\" \
-I$(top_srcdir)/libgd \
$(MAINTAINER_COMPILER_FLAGS) \
- -Wall \
- -g -O0 \
+ $(WARN_CFLAGS) \
$(CALENDAR_CFLAGS)
-AM_CFLAGS = \
- -Wall \
- -g -O0
-
bin_PROGRAMS = gnome-calendar
BUILT_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]