Updating branch refs/heads/master
to 3f3cf2ee415308edf9a2cfd21aa485b6a54df92f (commit)
from ff50e3f875d4b89e661a47e0fc309f92189a2d19 (commit)
commit 3f3cf2ee415308edf9a2cfd21aa485b6a54df92f
Author: Vincent Legout <[email protected]>
Date: Sat Jan 23 15:04:47 2010 +0800
Update autotools to Automake 1.11
Drop custom check for Vala
Add support for AM_SILENT_RULES
configure.in.in | 29 ++++++++++++++---------------
src/Makefile.am | 15 +++++++++++----
2 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index cb1109a..00327b4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -28,9 +28,10 @@ AC_REVISION([$Id$])
dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar])
AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE()
+AM_SILENT_RULES([yes])
dnl ********************************
dnl *** Check for basic programs ***
@@ -67,18 +68,17 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],
[4.4.0])
XDT_CHECK_PACKAGE([LIBMPD], [libmpd], [0.15.0])
dnl Check for valac
-valac_minimum_version=0.7.1
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
- AC_CHECK_PROG([has_valac], [valac], [yes], [no])
- AC_PATH_PROG([VALAC], [valac], [valac])
- AC_SUBST(VALAC)
- if test "x$has_valac" != "xyes" ; then
- echo "***"
- echo "*** You need the valac compiler in order to compile parts
of the project"
- echo "***"
- echo
+ AM_PROG_VALAC([0.7.1])
+ if test "x$VALAC" = "x" ; then
+ AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
fi
- XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [0.1])
+
+ XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.6])
+ PKG_CHECK_EXISTS([xfce4-vala >= 4.7],
+ AC_ERROR([
+ *** Build configured for Xfce Panel 4.6 but ***
+ *** Xfce Vala bindings for 4.7 are installed ***]), [])
fi
dnl ***********************************
@@ -97,13 +97,12 @@ dnl *** Print configuration ***
dnl ***************************
echo
echo "Build Configuration:"
-echo
+echo
echo "* Maintainer Mode: $USE_MAINTAINER_MODE"
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-echo " * Vala: $has_valac"
-echo " You need Vala $valac_minimum_version or higher (run $VALAC
--version)"
+echo
+echo " * Vala: $VALAC $am__vala_version"
echo
fi
echo "* Debug Support: $enable_debug"
echo
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 2908406..531bc6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,14 +12,21 @@ xfmpc_VALASOURCES =
\
preferences.vala \
main.vala
+xfmpc_VALAFLAGS = \
+ --vapidir=. \
+ --pkg=libxfcegui4-1.0 \
+ --pkg=config \
+ --pkg=mpdclient \
+ --pkg=xfce-arrow-button
+
vala_built_SOURCES = \
- $(xfmpc_VALASOURCES:.vala=.c)
+ $(xfmpc_VALASOURCES:.vala=.c) xfmpc.h
if MAINTAINER_MODE
BUILT_SOURCES = vala.stamp
vala.stamp: $(xfmpc_VALASOURCES)
- $(VALAC) --vapidir=. --pkg=libxfcegui4-1.0 --pkg=config --pkg=mpdclient
--pkg=xfce-arrow-button $^ -C -H xfmpc.h
+ $(VALAC) $(xfmpc_VALAFLAGS) $^ -C -h xfmpc.h
touch $@
endif
@@ -28,8 +35,7 @@ xfmpc_SOURCES =
\
mpdclient.c \
mpdclient.h \
xfce-arrow-button.c \
- xfce-arrow-button.h \
- xfmpc.h
+ xfce-arrow-button.h
xfmpc_SOURCES += $(vala_built_SOURCES)
xfmpc_CFLAGS = \
@@ -60,3 +66,4 @@ EXTRA_DIST =
\
CLEANFILES = \
$(BUILT_SOURCES)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
