development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-08-28 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Update autotools configuration

Browse source
This commit is contained in:
Javier Jardón 2011-02-26 14:39:41 +00:00
parent 73e432f1f1
commit 0aabaf6225
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,5 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = libgitg gitg data po tests tools SUBDIRS = libgitg gitg data po tests tools
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

2
autogen.sh
View file

@ -19,4 +19,4 @@ which gnome-autogen.sh || {
exit 1 exit 1
} }
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4" REQUIRED_AUTOMAKE_VERSION=1.8 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh . gnome-autogen.sh

32
configure.ac
View file

@ -1,15 +1,22 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ([2.64])
m4_define(gitg_major_version, 0) m4_define(gitg_major_version, 0)
m4_define(gitg_minor_version, 1) m4_define(gitg_minor_version, 1)
m4_define(gitg_micro_version, 0) m4_define(gitg_micro_version, 0)
m4_define(gitg_version, gitg_major_version.gitg_minor_version.gitg_micro_version) m4_define(gitg_version, gitg_major_version.gitg_minor_version.gitg_micro_version)
AC_INIT(gitg, gitg_version, http://www.icecrew.nl) AC_INIT([gitg],
AC_CONFIG_SRCDIR(gitg/gitg.c) [gitg_version],
[https://bugzilla.gnome.org/enter_bug.cgi?product=gitg],
[gitg],
[http://live.gnome.org/Gitg])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([gitg/gitg.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_DEFINE(GITG_MAJOR_VERSION, gitg_major_version, [GitG major version]) AC_DEFINE(GITG_MAJOR_VERSION, gitg_major_version, [GitG major version])
AC_SUBST(GITG_MAJOR_VERSION, gitg_major_version) AC_SUBST(GITG_MAJOR_VERSION, gitg_major_version)
@ -18,16 +25,12 @@ AC_SUBST(GITG_MINOR_VERSION, gitg_minor_version)
AC_DEFINE(GITG_MICRO_VERSION, gitg_micro_version, [GitG micro version]) AC_DEFINE(GITG_MICRO_VERSION, gitg_micro_version, [GitG micro version])
AC_SUBST(GITG_MICRO_VERSION, gitg_micro_version) AC_SUBST(GITG_MICRO_VERSION, gitg_micro_version)
AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip])
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_PATH_PROG(GCONFTOOL, gconftool-2) # Check for programs
AC_PROG_LIBTOOL
AC_ISC_POSIX
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
@ -35,8 +38,9 @@ AC_PATH_PROG(GZIP, gzip)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work # Initialize libtool
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4") LT_PREREQ([2.2])
LT_INIT
# i18n stuff # i18n stuff
IT_PROG_INTLTOOL([0.40.0]) IT_PROG_INTLTOOL([0.40.0])
@ -97,7 +101,7 @@ PKG_CHECK_MODULES(PACKAGE, [
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
GNOME_COMPILE_WARNINGS(yes) GNOME_COMPILE_WARNINGS([maximum])
if test "x$USE_MAINTAINER_MODE" = "xyes"; then if test "x$USE_MAINTAINER_MODE" = "xyes"; then
PACKAGE_CFLAGS="$PACKAGE_CFLAGS -Wall -Werror -Wuninitialized -Wmissing-declarations" PACKAGE_CFLAGS="$PACKAGE_CFLAGS -Wall -Werror -Wuninitialized -Wmissing-declarations"