Updating branch refs/heads/master to 089487805ee0892447127df45214c3be01686b67 (commit) from 57a59bbc634132f73356be4a0f84b6805ae428b6 (commit)
commit 089487805ee0892447127df45214c3be01686b67 Author: Mike Massonnet <mmasson...@gmail.com> Date: Tue Dec 1 17:27:01 2009 +0100 Update build-env ChangeLog | 4 ++++ autogen.sh | 2 +- configure.in.in => configure.ac.in | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a99605b..b25c3b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-12-01 Mike Massonnet <mmasson...@xfce.org> + +Update build-env + 2009-11-22 Mike Massonnet <mmasson...@xfce.org> Add X11 link to the panel plugin diff --git a/autogen.sh b/autogen.sh index 2350758..5d74889 100755 --- a/autogen.sh +++ b/autogen.sh @@ -27,7 +27,7 @@ else fi sed -e "s/@LINGUAS@/${linguas}/g" \ -e "s/@REVISION@/${revision}/g" \ - < "configure.in.in" > "configure.in" + < "configure.ac.in" > "configure.ac" exec xdt-autogen $@ diff --git a/configure.in.in b/configure.ac.in similarity index 94% rename from configure.in.in rename to configure.ac.in index 115464e..061fda6 100644 --- a/configure.in.in +++ b/configure.ac.in @@ -8,10 +8,10 @@ dnl m4_define([xfce4_notes_plugin_version_major], [1]) m4_define([xfce4_notes_plugin_version_minor], [7]) -m4_define([xfce4_notes_plugin_version_micro], [1]) +m4_define([xfce4_notes_plugin_version_micro], [2]) m4_define([xfce4_notes_plugin_version_nano], []) m4_define([xfce4_notes_plugin_version_build], [...@revision@]) -m4_define([xfce4_notes_plugin_version_tag], []) # Leave empty for releases +m4_define([xfce4_notes_plugin_version_tag], [git]) # Leave empty for releases m4_define([xfce4_notes_plugin_version], [xfce4_notes_plugin_version_major().xfce4_notes_plugin_version_minor().xfce4_notes_plugin_version_micro()ifelse(xfce4_notes_plugin_version_nano(), [], [], [.xfce4_notes_plugin_version_nano()])ifelse(xfce4_notes_plugin_version_tag(), [git], [xfce4_notes_plugin_version_tag()-xfce4_notes_plugin_version_build()], [xfce4_notes_plugin_version_tag()])]) AC_PREREQ([2.50]) @@ -23,6 +23,7 @@ AC_CANONICAL_TARGET() AM_INIT_AUTOMAKE([1.11 dist-bzip2]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl Avoid g77 and g++ checks m4_undefine([AC_PROG_CXX]) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits