isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 02:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure.ac: Modernize autoconf/libtool dependencies and macro usage

Browse Source
This commit is contained in:
Rico Tzschichholz 2014-06-05 17:11:36 +02:00
parent 7b449ac56c
commit 7cb30ced23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@ Makefile.in
Makefile.in.in Makefile.in.in
aclocal.m4 aclocal.m4
autom4te.cache autom4te.cache
build-aux
compile compile
config.guess config.guess
config.h config.h

2
autogen.sh
View File

@ -5,7 +5,7 @@ srcdir=`dirname $0`
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
PKG_NAME="mutter" PKG_NAME="mutter"
REQUIRED_AUTOMAKE_VERSION=1.10 REQUIRED_AUTOMAKE_VERSION=1.11
(test -f $srcdir/configure.ac \ (test -f $srcdir/configure.ac \
&& test -d $srcdir/src) || { && test -d $srcdir/src) || {

16
configure.ac
View File

@ -1,5 +1,4 @@
AC_PREREQ(2.50) AC_PREREQ(2.62)
AC_CONFIG_MACRO_DIR([m4])
m4_define([mutter_major_version], [3]) m4_define([mutter_major_version], [3])
m4_define([mutter_minor_version], [13]) m4_define([mutter_minor_version], [13])
@ -14,6 +13,7 @@ AC_INIT([mutter], [mutter_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=mutter]) [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR(src/core/display.c) AC_CONFIG_SRCDIR(src/core/display.c)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)
@ -40,12 +40,14 @@ GETTEXT_PACKAGE=mutter
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
IT_PROG_INTLTOOL([0.34.90]) LT_PREREQ([2.2.6])
LT_INIT([disable-static])
IT_PROG_INTLTOOL([0.41])
AC_PROG_CC AC_PROG_CC
AC_ISC_POSIX AC_PROG_CC_C_O
AC_PROG_INSTALL
AC_HEADER_STDC AC_HEADER_STDC
AC_LIBTOOL_WIN32_DLL PKG_PROG_PKG_CONFIG([0.21])
AM_PROG_LIBTOOL
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0() AM_PATH_GLIB_2_0()
@ -117,8 +119,6 @@ AC_ARG_WITH([xwayland-path],
[XWAYLAND_PATH="$withval"], [XWAYLAND_PATH="$withval"],
[XWAYLAND_PATH="$bindir/Xwayland"]) [XWAYLAND_PATH="$bindir/Xwayland"])
AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use ## here we get the flags we'll actually use
# Unconditionally use this dir to avoid a circular dep with gnomecc # Unconditionally use this dir to avoid a circular dep with gnomecc